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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.414 by sf-exg, Tue Jan 24 17:05:05 2012 UTC

1	/*---------------------------------------------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <inttypes.h>	31	#include <inttypes.h>
32		32
33	#include "salloc.C" // HACK, should be a 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 ();
444	}	457	}
445		458
446	void	459	void
447	rxvt_term::scr_soft_reset ()	460	rxvt_term::scr_soft_reset () NOTHROW
448	{	461	{
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
454	rvideo_mode = false;
455
456	if (current_screen != PRIMARY)
457	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		466
465	if (current_screen != PRIMARY)	467	if (current_screen != PRIMARY)
466	scr_swap_screen ();	468	scr_swap_screen ();
467		469
468	scr_scroll_region (0, MAX_ROWS - 1);	470	scr_scroll_region (0, MAX_ROWS - 1);
…		…
513	}	515	}
514		516
515	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
516	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
517	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
518	#ifdef DEBUG_STRICT
519	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
520	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
521	#endif
522	}	522	}
523		523
524	void	524	void
525	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen () NOTHROW
526	{	526	{
527	if (!option (Opt_secondaryScreen))	527	if (!option (Opt_secondaryScreen))
528	return;	528	return;
529		529
530	for (int i = prev_nrow; i--; )	530	for (int i = prev_nrow; i--; )
…		…
549	return;	549	return;
550		550
551	want_refresh = 1;	551	want_refresh = 1;
552	view_start = 0;	552	view_start = 0;
553		553
554	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 ();
555		560
556	int i = current_screen; current_screen = scrn; scrn = i;	561	current_screen = scrn;
557		562
558	#if NSCREENS	563	#if NSCREENS
559	if (option (Opt_secondaryScreen))	564	if (option (Opt_secondaryScreen))
560	{	565	{
561	num_scr = 0;	566	num_scr = 0;
…		…
638		643
639	if (count > 0	644	if (count > 0
640	&& row1 == 0	645	&& row1 == 0
641	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	646	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642	{	647	{
		648	min_it (count, total_rows - (nrow - (row2 + 1)));
		649
643	top_row = max (top_row - count, -saveLines);	650	top_row = max (top_row - count, -saveLines);
644
645	// scroll everything up 'count' lines
646	term_start = (term_start + count) % total_rows;
647		651
648	// sever bottommost line	652	// sever bottommost line
649	{	653	{
650	line_t &l = ROW(row2 - count);	654	line_t &l = ROW(row2);
651	l.is_longer (0);	655	l.is_longer (0);
652	l.touch ();	656	l.touch ();
653	}	657	}
654		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
655	// erase newly scrolled-in lines	674	// erase newly scrolled-in lines
656	for (int i = count; i--; )	675	for (int i = count; i--; )
657	{	676	{
658	line_t &l = ROW(nrow - 1 - i);	677	line_t &l = ROW(row2 - i);
659		678
660	// optimize if already cleared, can be significant on slow machines	679	// optimise if already cleared, can be significant on slow machines
661	// could be rolled into scr_blank_screen_mem	680	// could be rolled into scr_blank_screen_mem
662	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)))
663	{	682	{
664	scr_blank_line (l, 0, l.l, rstyle);	683	scr_blank_line (l, 0, l.l, rstyle);
665	l.l = 0;	684	l.l = 0;
…		…
667	}	686	}
668	else	687	else
669	scr_blank_screen_mem (l, rstyle);	688	scr_blank_screen_mem (l, rstyle);
670	}	689	}
671		690
672	// now copy lines below the scroll region bottom to the
673	// bottom of the screen again, so they look as if they
674	// hadn't moved.
675	for (int i = nrow; --i > row2; )
676	{
677	line_t &l1 = ROW(i - count);
678	line_t &l2 = ROW(i);
679
680	::swap (l1, l2);
681	l2.touch ();
682	}
683
684	// move and/or clear selection, if any	691	// move and/or clear selection, if any
685	if (selection.op && current_screen == selection.screen)	692	if (selection.op && current_screen == selection.screen
		693	&& selection.beg.row <= row2)
686	{	694	{
687	selection.beg.row -= count;	695	selection.beg.row -= count;
688	selection.end.row -= count;	696	selection.end.row -= count;
689	selection.mark.row -= count;	697	selection.mark.row -= count;
690		698
691	if (selection.beg.row < top_row	699	selection_check (0);
692	|| selection.end.row < top_row
693	|| selection.mark.row < top_row)
694	{
695	CLEAR_ALL_SELECTION ();
696	selection.op = SELECTION_CLEAR;
697	}
698	}	700	}
699		701
700	// finally move the view window, if desired	702	// finally move the view window, if desired
701	if (option (Opt_scrollWithBuffer)	703	if (option (Opt_scrollWithBuffer)
702	&& view_start != 0	704	&& view_start != 0
…		…
732	}	734	}
733		735
734	// use a simple and robust scrolling algorithm, this	736	// use a simple and robust scrolling algorithm, this
735	// part of scr_scroll_text is not time-critical.	737	// part of scr_scroll_text is not time-critical.
736		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
737	int rows = row2 - row1 + 1;	747	int rows = row2 - row1 + 1;
738		748
739	min_it (count, rows);	749	min_it (count, rows);
740		750
741	line_t *temp_buf = row_buf + total_rows;	751	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742		752
743	for (int row = 0; row < rows; row++)	753	for (int row = 0; row < rows; row++)
744	{	754	{
745	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	755	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746		756
…		…
748	scr_blank_screen_mem (temp_buf [row], rstyle);	758	scr_blank_screen_mem (temp_buf [row], rstyle);
749	}	759	}
750		760
751	for (int row = 0; row < rows; row++)	761	for (int row = 0; row < rows; row++)
752	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	}
753	}	770	}
754		771
755	return count;	772	return count;
756	}	773	}
757		774
…		…
763	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
764	{	781	{
765	if (len <= 0) /* sanity */	782	if (len <= 0) /* sanity */
766	return;	783	return;
767		784
768	unsigned char checksel;	785	bool checksel;
769	unicode_t c;	786	unicode_t c;
770	int ncol = this->ncol;	787	int ncol = this->ncol;
771	const wchar_t *strend = str + len;	788	const wchar_t *strend = str + len;
772		789
773	want_refresh = 1;	790	want_refresh = 1;
…		…
786	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	803	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787	screen.cur.row -= minlines;	804	screen.cur.row -= minlines;
788	}	805	}
789	}	806	}
790		807
791	#ifdef DEBUG_STRICT
792	assert (screen.cur.col < ncol);	808	assert (screen.cur.col < ncol);
793	assert (screen.cur.row < nrow	809	assert (screen.cur.row < nrow
794	&& screen.cur.row >= top_row);	810	&& screen.cur.row >= top_row);
795	#endif
796	int row = screen.cur.row;	811	int row = screen.cur.row;
797		812
798	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	813	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799		814
800	line_t *line = &ROW(row);	815	line_t *line = &ROW(row);
801		816
802	while (str < strend)	817	while (str < strend)
803	{	818	{
804	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	819	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805		820
806	if (expect_false (c < 0x20))	821	if (ecb_unlikely (c < 0x20))
807	if (c == C0_LF)	822	if (c == C0_LF)
808	{	823	{
809	max_it (line->l, screen.cur.col);	824	max_it (line->l, screen.cur.col);
810		825
811	screen.flags &= ~Screen_WrapNext;	826	screen.flags &= ~Screen_WrapNext;
…		…
830	{	845	{
831	scr_tab (1, true);	846	scr_tab (1, true);
832	continue;	847	continue;
833	}	848	}
834		849
835	if (expect_false (	850	if (ecb_unlikely (
836	checksel /* see if we're writing within selection */	851	checksel /* see if we're writing within selection */
837	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	852	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	853	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
839	))	854	))
840	{	855	{
…		…
845	* should be a similar check.	860	* should be a similar check.
846	*/	861	*/
847	CLEAR_SELECTION ();	862	CLEAR_SELECTION ();
848	}	863	}
849		864
850	if (expect_false (screen.flags & Screen_WrapNext))	865	if (ecb_unlikely (screen.flags & Screen_WrapNext))
851	{	866	{
852	scr_do_wrap ();	867	scr_do_wrap ();
853		868
854	line->l = ncol;	869	line->l = ncol;
855	line->is_longer (1);	870	line->is_longer (1);
…		…
857	row = screen.cur.row;	872	row = screen.cur.row;
858	line = &ROW(row); /* _must_ refresh */	873	line = &ROW(row); /* _must_ refresh */
859	}	874	}
860		875
861	// some utf-8 decoders "decode" surrogate characters: let's fix this.	876	// some utf-8 decoders "decode" surrogate characters: let's fix this.
862	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	877	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863	c = 0xfffd;	878	c = 0xfffd;
864		879
865	// 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
866	// further replacements, as wcwidth might return -1 for the line	881	// further replacements, as wcwidth might return -1 for the line
867	// drawing characters below as they might be invalid in the current	882	// drawing characters below as they might be invalid in the current
868	// locale.	883	// locale.
869	int width = WCWIDTH (c);	884	int width = WCWIDTH (c);
870		885
871	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	886	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872	{	887	{
873	// vt100 special graphics and line drawing	888	// vt100 special graphics and line drawing
874	// 5f-7e standard vt100	889	// 5f-7e standard vt100
875	// 40-5e rxvt extension for extra curses acs chars	890	// 40-5e rxvt extension for extra curses acs chars
876	static uint16_t vt100_0[62] = { // 41 .. 7e	891	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
889	c = vt100_0[c - 0x41];	904	c = vt100_0[c - 0x41];
890	width = 1; // vt100 line drawing characters are always single-width	905	width = 1; // vt100 line drawing characters are always single-width
891	}	906	}
892	}	907	}
893		908
894	if (expect_false (screen.flags & Screen_Insert))	909	if (ecb_unlikely (screen.flags & Screen_Insert))
895	scr_insdel_chars (width, INSERT);	910	scr_insdel_chars (width, INSERT);
896		911
897	if (width != 0)	912	if (width != 0)
898	{	913	{
899	#if !UNICODE_3	914	#if !UNICODE_3
…		…
904	# else	919	# else
905	c = 0xfffd;	920	c = 0xfffd;
906	# endif	921	# endif
907	#endif	922	#endif
908		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
909	// nuke the character at this position, if required	940	// nuke the character at this position, if required
910	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.
911	line->t[screen.cur.col] == NOCHAR	944	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
912	|| (screen.cur.col < ncol - 1
913	&& line->t[screen.cur.col + 1] == NOCHAR)
914	))
915	scr_kill_char (*line, screen.cur.col);	945	scr_kill_char (*line, screen.cur.col);
916
917	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919	// if the character doesn't fit into the remaining columns...
920	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921	{
922	// ... artificially enlargen the previous one
923	c = NOCHAR;
924	// and try the same character next loop iteration
925	--str;
926	}
927		946
928	line->touch ();	947	line->touch ();
929		948
930	do	949	do
931	{	950	{
932	line->t[screen.cur.col] = c;	951	line->t[screen.cur.col] = c;
933	line->r[screen.cur.col] = rend;	952	line->r[screen.cur.col] = rend;
934		953
935	if (expect_true (screen.cur.col < ncol - 1))	954	if (ecb_likely (screen.cur.col < ncol - 1))
936	screen.cur.col++;	955	screen.cur.col++;
937	else	956	else
938	{	957	{
939	line->l = ncol;	958	line->l = ncol;
940	if (screen.flags & Screen_Autowrap)	959	if (screen.flags & Screen_Autowrap)
941	screen.flags |= Screen_WrapNext;	960	screen.flags |= Screen_WrapNext;
942	break;	961
		962	goto end_of_line;
943	}	963	}
944		964
945	c = NOCHAR;	965	c = NOCHAR;
946	}	966	}
947	while (expect_false (--width > 0));	967	while (ecb_unlikely (--width > 0));
948		968
949	// pad with spaces when overwriting wide character with smaller one	969	// pad with spaces when overwriting wide character with smaller one
950	if (expect_false (!width))	970	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951	{	971	{
952	line->touch ();
953
954	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955	{
956	line->t[c] = ' ';	972	line->t[c] = ' ';
957	line->r[c] = rend;	973	line->r[c] = rend;
958	}
959	}	974	}
		975
		976	end_of_line:
		977	;
960	}	978	}
961	#if ENABLE_COMBINING	979	#if ENABLE_COMBINING
962	else // width == 0	980	else // width == 0
963	{	981	{
964	if (c != 0xfeff) // ignore BOM	982	if (c != 0xfeff) // ignore BOM
…		…
1004	#endif	1022	#endif
1005	}	1023	}
1006		1024
1007	max_it (line->l, screen.cur.col);	1025	max_it (line->l, screen.cur.col);
1008		1026
1009	#ifdef DEBUG_STRICT
1010	assert (screen.cur.row >= 0);	1027	assert (screen.cur.row >= 0);
1011	#endif
1012	}	1028	}
1013		1029
1014	/* ------------------------------------------------------------------------- */	1030	/* ------------------------------------------------------------------------- */
1015	/*	1031	/*
1016	* 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
…		…
1029		1045
1030	want_refresh = 1;	1046	want_refresh = 1;
1031	#endif	1047	#endif
1032	}	1048	}
1033	}	1049	}
		1050	else if (screen.flags & Screen_WrapNext)
		1051	screen.flags &= ~Screen_WrapNext;
1034	else	1052	else
1035	scr_gotorc (0, -1, RELATIVE);	1053	scr_gotorc (0, -1, RELATIVE);
1036	}	1054	}
1037		1055
1038	/* ------------------------------------------------------------------------- */	1056	/* ------------------------------------------------------------------------- */
…		…
1294	scr_blank_line (line, col, num, rstyle);	1312	scr_blank_line (line, col, num, rstyle);
1295	}	1313	}
1296		1314
1297	/* ------------------------------------------------------------------------- */	1315	/* ------------------------------------------------------------------------- */
1298	/*	1316	/*
1299	* Erase part of whole of the screen	1317	* Erase part or whole of the screen
1300	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1318	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1319	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1320	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303	*/	1321	*/
1304	void	1322	void
…		…
1313	ZERO_SCROLLBACK ();	1331	ZERO_SCROLLBACK ();
1314		1332
1315	switch (mode)	1333	switch (mode)
1316	{	1334	{
1317	case 0: /* erase to end of screen */	1335	case 0: /* erase to end of screen */
1318	selection_check (1);
1319	scr_erase_line (0);	1336	scr_erase_line (0);
1320	row = screen.cur.row + 1; /* possible OOB */	1337	row = screen.cur.row + 1; /* possible OOB */
1321	num = nrow - row;	1338	num = nrow - row;
1322	break;	1339	break;
1323	case 1: /* erase to beginning of screen */	1340	case 1: /* erase to beginning of screen */
1324	selection_check (3);
1325	scr_erase_line (1);	1341	scr_erase_line (1);
1326	row = 0;	1342	row = 0;
1327	num = screen.cur.row;	1343	num = screen.cur.row;
1328	break;	1344	break;
1329	case 2: /* erase whole screen */	1345	case 2: /* erase whole screen */
1330	selection_check (3);
1331	row = 0;	1346	row = 0;
1332	num = nrow;	1347	num = nrow;
1333	break;	1348	break;
1334	default:	1349	default:
1335	return;	1350	return;
…		…
1344	if (row >= nrow) /* Out Of Bounds */	1359	if (row >= nrow) /* Out Of Bounds */
1345	return;	1360	return;
1346		1361
1347	min_it (num, nrow - row);	1362	min_it (num, nrow - row);
1348		1363
1349	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350	if (rstyle & (RS_RVid | RS_Uline))	1364	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351	ren = (rend_t) ~RS_None;	1365	ren = (rend_t) ~RS_None;
1352	else if (GET_BASEBG (rstyle) == Color_bg)	1366	else if (GET_BASEBG (rstyle) == Color_bg)
1353	{	1367	{
1354	ren = DEFAULT_RSTYLE;	1368	ren = DEFAULT_RSTYLE;
1355		1369
1356	if (mapped)	1370	if (mapped)
1357	XClearArea (dpy, vt, 0,	1371	XClearArea (dpy, vt, 0,
1358	Row2Pixel (row), (unsigned int)width,	1372	Row2Pixel (row - view_start), (unsigned int)vt_width,
1359	(unsigned int)Height2Pixel (num), False);	1373	(unsigned int)Height2Pixel (num), False);
1360	}	1374	}
1361	else	1375	else
1362	{	1376	{
1363	ren = rstyle & (RS_fgMask | RS_bgMask);	1377	ren = rstyle & (RS_fgMask | RS_bgMask);
1364		1378
		1379	if (mapped)
		1380	{
1365	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1381	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1382	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367	XFillRectangle (dpy, vt, gc,	1383	XFillRectangle (dpy, vt, gc,
1368	0, Row2Pixel (row),	1384	0, Row2Pixel (row - view_start),
1369	(unsigned int)width,	1385	(unsigned int)vt_width,
1370	(unsigned int)Height2Pixel (num));	1386	(unsigned int)Height2Pixel (num));
1371	gcvalue.foreground = pix_colors[Color_fg];	1387	gcvalue.foreground = pix_colors[Color_fg];
1372	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1388	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1389	}
1373	}	1390	}
1374		1391
1375	for (; num--; row++)	1392	for (; num--; row++)
1376	{	1393	{
1377	scr_blank_screen_mem (ROW(row), rstyle);	1394	scr_blank_screen_mem (ROW(row), rstyle);
		1395
		1396	if (row - view_start < nrow)
1378	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1397	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379	}	1398	}
1380	}	1399	}
1381		1400
1382	#if !ENABLE_MINIMAL	1401	#if !ENABLE_MINIMAL
1383	void	1402	void
…		…
1402		1421
1403	want_refresh = 1;	1422	want_refresh = 1;
1404	ZERO_SCROLLBACK ();	1423	ZERO_SCROLLBACK ();
1405		1424
1406	num_scr_allow = 0;	1425	num_scr_allow = 0;
1407	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 ();
1408		1431
1409	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1432	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1410	for (int row = nrow; row--; )	1433	for (int row = nrow; row--; )
1411	{	1434	{
1412	line_t &line = ROW(row);	1435	line_t &line = ROW(row);
…		…
1536	{	1559	{
1537	line->t[col] = line->t[col + count];	1560	line->t[col] = line->t[col + count];
1538	line->r[col] = line->r[col + count];	1561	line->r[col] = line->r[col + count];
1539	}	1562	}
1540		1563
1541	scr_blank_line (*line, ncol - count, count,	1564	scr_blank_line (*line, ncol - count, count, rstyle);
1542	line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543		1565
1544	if (selection.op && current_screen == selection.screen	1566	if (selection.op && current_screen == selection.screen
1545	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1567	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546	{	1568	{
1547	if (selection.end.row != screen.cur.row	1569	if (selection.end.row != screen.cur.row
…		…
1683	{	1705	{
1684	rvideo_state = on;	1706	rvideo_state = on;
1685		1707
1686	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1708	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687	#ifdef HAVE_BG_PIXMAP	1709	#ifdef HAVE_BG_PIXMAP
1688	if (bgPixmap.pixmap == None)	1710	if (bg_pixmap == None)
1689	#endif	1711	#endif
1690	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1712	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691		1713
1692	XGCValues gcvalue;	1714	XGCValues gcvalue;
1693	gcvalue.foreground = pix_colors[Color_fg];	1715	gcvalue.foreground = pix_colors[Color_fg];
…		…
1837	for (i = PART_BEG; i < RC_COUNT; i++)	1859	for (i = PART_BEG; i < RC_COUNT; i++)
1838	{	1860	{
1839	min_it (rc[i].col, ncol - 1);	1861	min_it (rc[i].col, ncol - 1);
1840	min_it (rc[i].row, nrow - 1);	1862	min_it (rc[i].row, nrow - 1);
1841	}	1863	}
1842	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1864
1843	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++)
1844	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);
1845		1867
1846	num_scr_allow = 0;	1868	num_scr_allow = 0;
1847		1869
…		…
1854	* Refresh the entire screen	1876	* Refresh the entire screen
1855	*/	1877	*/
1856	void	1878	void
1857	rxvt_term::scr_touch (bool refresh) NOTHROW	1879	rxvt_term::scr_touch (bool refresh) NOTHROW
1858	{	1880	{
1859	scr_expose (0, 0, width, height, refresh);	1881	scr_expose (0, 0, vt_width, vt_height, refresh);
1860	}	1882	}
1861		1883
1862	/* ------------------------------------------------------------------------- */	1884	/* ------------------------------------------------------------------------- */
1863	/*	1885	/*
1864	* Move the display so that the line represented by scrollbar value Y is at	1886	* Move the display so that the line represented by scrollbar value Y is at
…		…
1920		1942
1921	# ifndef NO_MAPALERT	1943	# ifndef NO_MAPALERT
1922	# ifdef MAPALERT_OPTION	1944	# ifdef MAPALERT_OPTION
1923	if (option (Opt_mapAlert))	1945	if (option (Opt_mapAlert))
1924	# endif	1946	# endif
1925	XMapWindow (dpy, parent[0]);	1947	XMapWindow (dpy, parent);
1926	# endif	1948	# endif
1927		1949
1928	# if ENABLE_FRILLS	1950	# if ENABLE_FRILLS
1929	if (option (Opt_urgentOnBell))	1951	if (option (Opt_urgentOnBell))
1930	set_urgency (1);	1952	set_urgency (1);
…		…
1938		1960
1939	bell_ev.start (VISUAL_BELL_DURATION);	1961	bell_ev.start (VISUAL_BELL_DURATION);
1940	}	1962	}
1941	else	1963	else
1942	XBell (dpy, 0);	1964	XBell (dpy, 0);
		1965	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943	#endif	1966	#endif
1944	}	1967	}
1945		1968
1946	/* ------------------------------------------------------------------------- */	1969	/* ------------------------------------------------------------------------- */
1947	/* ARGSUSED */
1948	void	1970	void
1949	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1971	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950	{	1972	{
1951	#ifdef PRINTPIPE	1973	#ifdef PRINTPIPE
1952	int nrows, row_start;	1974	int nrows, row_start;
…		…
1966	row_start = view_start;	1988	row_start = view_start;
1967	}	1989	}
1968		1990
1969	wctomb (0, 0);	1991	wctomb (0, 0);
1970		1992
1971	for (int r1 = 0; r1 < nrows; r1++)	1993	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972	{	1994	{
1973	text_t *tp = ROW(r1).t;	1995	text_t *tp = ROW(r1).t;
1974	int len = ROW(r1).l;	1996	int len = ROW(r1).l;
1975		1997
1976	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
…		…
2005	* screen.text/screen.rend contain what the screen will change to.	2027	* screen.text/screen.rend contain what the screen will change to.
2006	*/	2028	*/
2007	void	2029	void
2008	rxvt_term::scr_refresh () NOTHROW	2030	rxvt_term::scr_refresh () NOTHROW
2009	{	2031	{
2010	unsigned char have_bg,
2011	showcursor; /* show the cursor */
2012	int16_t col, row, /* column/row we're processing */	2032	int16_t col, row, /* column/row we're processing */
2013	ocrow; /* old cursor row */	2033	ocrow; /* old cursor row */
2014	int i; /* tmp */	2034	int i; /* tmp */
2015	#ifndef NO_CURSORCOLOR	2035	#ifndef NO_CURSORCOLOR
2016	rend_t cc1; /* store colours at cursor position (s) */	2036	rend_t cc1; /* store colours at cursor position (s) */
…		…
2027	/*	2047	/*
2028	* A: set up vars	2048	* A: set up vars
2029	*/	2049	*/
2030	refresh_count = 0;	2050	refresh_count = 0;
2031		2051
		2052	unsigned int old_screen_flags = screen.flags;
2032	have_bg = 0;	2053	bool have_bg = 0;
2033	#ifdef HAVE_BG_PIXMAP	2054	#ifdef HAVE_BG_PIXMAP
2034	have_bg = bgPixmap.pixmap != None;	2055	have_bg = bg_pixmap != None;
2035	#endif	2056	#endif
2036	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2057	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037		2058
2038	/*	2059	/*
2039	* B: reverse any characters which are selected	2060	* B: reverse any characters which are selected
2040	*/	2061	*/
2041	scr_reverse_selection ();	2062	scr_reverse_selection ();
2042		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
2043	/*	2071	/*
2044	* C: set the cursor character (s)	2072	* C: set the cursor character (s)
2045	*/	2073	*/
2046	{	2074	{
2047	unsigned char setoldcursor;	2075	bool setoldcursor;
2048		2076
2049	showcursor = (screen.flags & Screen_VisibleCursor);
2050	#ifdef CURSOR_BLINK	2077	#ifdef CURSOR_BLINK
2051	if (hidden_cursor)	2078	if (hidden_cursor)
2052	showcursor = 0;	2079	showcursor = 0;
2053	#endif	2080	#endif
2054		2081
…		…
2082	ccol2 = bgcolor_of (rstyle);	2109	ccol2 = bgcolor_of (rstyle);
2083	#else	2110	#else
2084	ccol2 = Color_bg;	2111	ccol2 = Color_bg;
2085	#endif	2112	#endif
2086		2113
2087	if (showcursor && focus)	2114	if (focus)
2088	{	2115	{
2089	if (option (Opt_cursorUnderline))	2116	if (option (Opt_cursorUnderline))
2090	*crp ^= RS_Uline;	2117	*crp ^= RS_Uline;
2091	else	2118	else
2092	{	2119	{
…		…
2127	oldcursor.col = screen.cur.col;	2154	oldcursor.col = screen.cur.col;
2128	}	2155	}
2129	}	2156	}
2130	}	2157	}
2131		2158
2132	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133	#if ENABLE_OVERLAY
2134	scr_swap_overlay ();
2135	#endif
2136
2137	#ifndef NO_SLOW_LINK_SUPPORT	2159	#ifndef NO_SLOW_LINK_SUPPORT
2138	/*	2160	/*
2139	* D: CopyArea pass - very useful for slower links	2161	* D: CopyArea pass - very useful for slower links
2140	* This has been deliberately kept simple.	2162	* This has been deliberately kept simple.
2141	*/	2163	*/
…		…
2145	{	2167	{
2146	int16_t nits;	2168	int16_t nits;
2147	int i = num_scr;	2169	int i = num_scr;
2148	int j;	2170	int j;
2149	int len, wlen;	2171	int len, wlen;
2150	dLocal (int, num_scr);
2151		2172
2152	j = nrow;	2173	j = nrow;
2153	wlen = len = -1;	2174	wlen = len = -1;
2154	row = i > 0 ? 0 : j - 1;	2175	row = i > 0 ? 0 : j - 1;
2155		2176
…		…
2230	continue;	2251	continue;
2231		2252
2232	// redraw one or more characters	2253	// redraw one or more characters
2233		2254
2234	// seek to the beginning of wide characters	2255	// seek to the beginning of wide characters
2235	while (expect_false (stp[col] == NOCHAR && col > 0))	2256	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236	--col;	2257	--col;
2237		2258
2238	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2259	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239	text_t *text = stp + col;	2260	text_t *text = stp + col;
2240	int count = 1;	2261	int count = 1;
2241		2262
2242	dtp[col] = stp[col];	2263	dtp[col] = stp[col];
2243	drp[col] = rend;	2264	drp[col] = rend;
…		…
2247	for (i = 0; ++col < ncol; )	2268	for (i = 0; ++col < ncol; )
2248	{	2269	{
2249	if (stp[col] == NOCHAR)	2270	if (stp[col] == NOCHAR)
2250	{	2271	{
2251	dtp[col] = stp[col];	2272	dtp[col] = stp[col];
2252	drp[col] = rend;	2273	drp[col] = srp[col];
		2274
2253	count++;	2275	count++;
2254	i++;	2276	i++;
2255		2277
2256	continue;	2278	continue;
2257	}	2279	}
…		…
2277		2299
2278	col--; /* went one too far. move back */	2300	col--; /* went one too far. move back */
2279	count -= i; /* dump any matching trailing chars */	2301	count -= i; /* dump any matching trailing chars */
2280		2302
2281	// sometimes we optimize away the trailing NOCHAR's, add them back	2303	// sometimes we optimize away the trailing NOCHAR's, add them back
2282	while (expect_false (i && text[count] == NOCHAR))	2304	while (ecb_unlikely (i && text[count] == NOCHAR))
2283	count++, i--;	2305	count++, i--;
2284		2306
2285	/*	2307	/*
2286	* Determine the attributes for the string	2308	* Determine the attributes for the string
2287	*/	2309	*/
2288	int fore = fgcolor_of (rend); // desired foreground	2310	int fore = fgcolor_of (rend); // desired foreground
2289	int back = bgcolor_of (rend); // desired background	2311	int back = bgcolor_of (rend); // desired background
2290		2312
2291	// only do special processing if any attributes are set, which is unlikely	2313	// only do special processing if any attributes are set, which is unlikely
2292	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2314	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293	{	2315	{
2294	bool invert = rend & RS_RVid;	2316	bool invert = rend & RS_RVid;
2295		2317
2296	#ifndef NO_BOLD_UNDERLINE_REVERSE	2318	#ifndef NO_BOLD_UNDERLINE_REVERSE
2297	if (rend & RS_Bold && fore == Color_fg)	2319	if (rend & RS_Bold && fore == Color_fg)
…		…
2316		2338
2317	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2339	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318	fore = Color_UL;	2340	fore = Color_UL;
2319	#endif	2341	#endif
2320		2342
		2343	#ifdef OPTION_HC
		2344	if (rend & RS_Sel)
		2345	{
		2346	/* invert the column if no highlightColor is set or it is the
		2347	* current cursor column */
		2348	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2349	&& ISSET_PIXCOLOR (Color_HC))
		2350	{
		2351	if (ISSET_PIXCOLOR (Color_HTC))
		2352	fore = Color_HTC;
		2353	// if invert is 0 reverse video is set so we use bg color as fg color
		2354	else if (!invert)
		2355	fore = back;
		2356
		2357	back = Color_HC;
		2358	invert = 0;
		2359	}
		2360	}
		2361	#endif
		2362
2321	if (invert)	2363	if (invert)
2322	{	2364	{
2323	#ifdef OPTION_HC
2324	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325	|| !ISSET_PIXCOLOR (Color_HC))
2326	#endif
2327	/* invert the column if no highlightColor is set or it is the
2328	* current cursor column */
2329	::swap (fore, back);	2365	::swap (fore, back);
2330	#ifdef OPTION_HC
2331	else if (ISSET_PIXCOLOR (Color_HC))
2332	back = Color_HC;
2333	#endif
2334		2366
2335	#ifndef NO_BOLD_UNDERLINE_REVERSE	2367	#ifndef NO_BOLD_UNDERLINE_REVERSE
2336	# ifndef OPTION_HC
2337	if (ISSET_PIXCOLOR (Color_RV))
2338	back = Color_RV;
2339	# endif
2340	if (fore == back)	2368	if (fore == back)
2341	{	2369	{
2342	fore = Color_bg;	2370	fore = Color_bg;
2343	back = Color_fg;	2371	back = Color_fg;
2344	}	2372	}
…		…
2380	/*	2408	/*
2381	* Actually do the drawing of the string here	2409	* Actually do the drawing of the string here
2382	*/	2410	*/
2383	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2411	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384		2412
2385	if (expect_true (have_bg && back == Color_bg))	2413	if (ecb_likely (have_bg && back == Color_bg))
2386	{	2414	{
2387	// this is very ugly, maybe push it into ->draw?	2415	// this is very ugly, maybe push it into ->draw?
2388		2416
2389	for (i = 0; i < count; i++) /* don't draw empty strings */	2417	for (i = 0; i < count; i++) /* don't draw empty strings */
2390	if (text[i] != ' ')	2418	if (text[i] != ' ')
…		…
2397	did_clear: ;	2425	did_clear: ;
2398	}	2426	}
2399	else	2427	else
2400	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2428	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401		2429
2402	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2430	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403	{	2431	{
2404	#if ENABLE_FRILLS	2432	#if ENABLE_FRILLS
2405	if (ISSET_PIXCOLOR (Color_underline))	2433	if (ISSET_PIXCOLOR (Color_underline))
2406	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2434	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407	else	2435	else
…		…
2412	xpixel, ypixel + font->ascent + 1,	2440	xpixel, ypixel + font->ascent + 1,
2413	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2441	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414	}	2442	}
2415	} /* for (col....) */	2443	} /* for (col....) */
2416	} /* for (row....) */	2444	} /* for (row....) */
2417
2418	#if ENABLE_OVERLAY
2419	scr_swap_overlay ();
2420	#endif
2421	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422		2445
2423	/*	2446	/*
2424	* G: cleanup cursor and display outline cursor if necessary	2447	* G: cleanup cursor and display outline cursor if necessary
2425	*/	2448	*/
2426	if (showcursor)	2449	if (showcursor)
…		…
2458		2481
2459	XDrawRectangle (dpy, vt, gc,	2482	XDrawRectangle (dpy, vt, gc,
2460	Col2Pixel (col),	2483	Col2Pixel (col),
2461	Row2Pixel (oldcursor.row),	2484	Row2Pixel (oldcursor.row),
2462	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2485	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2463	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2486	(unsigned int) (Height2Pixel (1) - 1));
2464	}	2487	}
2465	}	2488	}
2466		2489
2467	/*	2490	/*
2468	* H: cleanup selection	2491	* H: cleanup selection
2469	*/	2492	*/
		2493	#if ENABLE_OVERLAY
		2494	scr_swap_overlay ();
		2495	#endif
		2496	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2497
2470	scr_reverse_selection ();	2498	scr_reverse_selection ();
2471		2499
		2500	screen.flags = old_screen_flags;
2472	num_scr = 0;	2501	num_scr = 0;
2473	num_scr_allow = 1;	2502	num_scr_allow = 1;
2474	}	2503	}
2475		2504
2476	void	2505	void
…		…
2497	scr_remap_chars (swap_buf [i]);	2526	scr_remap_chars (swap_buf [i]);
2498	}	2527	}
2499	}	2528	}
2500		2529
2501	void	2530	void
2502	rxvt_term::scr_recolour () NOTHROW	2531	rxvt_term::scr_recolour (bool refresh) NOTHROW
2503	{	2532	{
		2533	bool transparent = false;
		2534
2504	#ifdef HAVE_BG_PIXMAP	2535	#ifdef HAVE_BG_PIXMAP
2505	bgPixmap.apply ();	2536	if (bg_pixmap != None)
2506	#else	2537	{
		2538	# ifdef ENABLE_TRANSPARENCY
		2539	if (bg_flags & BG_IS_TRANSPARENT)
		2540	{
		2541	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2542	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507		2543
		2544	transparent = true;
		2545	}
		2546	else
		2547	# endif
		2548	{
		2549	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2550	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2551	}
		2552	}
		2553	else
		2554	#endif
		2555	{
2508	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2556	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509	XClearWindow (dpy, parent[0]);
2510	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2557	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2558	}
		2559
		2560	XClearWindow (dpy, parent);
2511		2561
2512	if (scrollBar.win)	2562	if (scrollBar.win)
2513	{	2563	{
		2564	if (transparent)
		2565	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2566	else
2514	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2567	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515	scrollBar.state = STATE_IDLE;	2568	scrollBar.state = SB_STATE_IDLE;
2516	scrollBar.show (0);	2569	scrollBar.show (0);
2517	}	2570	}
2518		2571
2519	#endif	2572	if (refresh)
2520		2573	{
2521	/* bgPixmap.apply () does not do the following : */
2522	scr_clear ();	2574	scr_clear ();
2523	scr_touch (true);	2575	scr_touch (true);
		2576	}
2524	want_refresh = 1;	2577	want_refresh = 1;
2525	}	2578	}
2526		2579
2527	/* ------------------------------------------------------------------------- */	2580	/* ------------------------------------------------------------------------- */
2528	void	2581	void
…		…
2596	{	2649	{
2597	#if !ENABLE_MINIMAL	2650	#if !ENABLE_MINIMAL
2598	if (selection.rect)	2651	if (selection.rect)
2599	scr_xor_rect (selection.beg.row, selection.beg.col,	2652	scr_xor_rect (selection.beg.row, selection.beg.col,
2600	selection.end.row, selection.end.col,	2653	selection.end.row, selection.end.col,
2601	RS_RVid, RS_RVid | RS_Uline);	2654	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602	else	2655	else
2603	#endif	2656	#endif
2604	scr_xor_span (selection.beg.row, selection.beg.col,	2657	scr_xor_span (selection.beg.row, selection.beg.col,
2605	selection.end.row, selection.end.col,	2658	selection.end.row, selection.end.col,
2606	RS_RVid);	2659	RS_Sel | RS_RVid);
2607	}	2660	}
2608	}	2661	}
2609		2662
2610	/* ------------------------------------------------------------------------- */	2663	/* ------------------------------------------------------------------------- */
2611	/*	2664	/*
…		…
2614	*/	2667	*/
2615	#if 0	2668	#if 0
2616	void	2669	void
2617	rxvt_term::scr_dump (int fd) NOTHROW	2670	rxvt_term::scr_dump (int fd) NOTHROW
2618	{	2671	{
2619	int row, wrote;	2672	// if this method is needed, it can be implemented by factoring the
2620	unsigned int width, towrite;	2673	// relevant code in scr_printscreen
2621	char r1[] = "\n";
2622
2623	for (row = saveLines + top_row;
2624	row < saveLines + nrow - 1; row++)
2625	{
2626	width = row_buf[row].l >= 0 ? row_buf[row].l
2627	: ncol;
2628	for (towrite = width; towrite; towrite -= wrote)
2629	{
2630	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631	towrite);
2632	if (wrote < 0)
2633	return; /* XXX: death, no report */
2634	}
2635	if (row_buf[row].l >= 0)
2636	if (write (fd, r1, 1) <= 0)
2637	return; /* XXX: death, no report */
2638	}
2639	}	2674	}
2640	#endif	2675	#endif
2641		2676
2642	/* ------------------------------------------------------------------------- *	2677	/* ------------------------------------------------------------------------- *
2643	* CHARACTER SELECTION *	2678	* CHARACTER SELECTION *
2644	* ------------------------------------------------------------------------- */	2679	* ------------------------------------------------------------------------- */
2645	void	2680	void
2646	rxvt_term::selection_check (int check_more) NOTHROW	2681	rxvt_term::selection_check (int check_more) NOTHROW
2647	{	2682	{
2648	row_col_t pos;
2649
2650	if (!selection.op)	2683	if (!selection.op)
2651	return;	2684	return;
2652		2685
2653	pos.row = pos.col = 0;
2654	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2686	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2687	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2688	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657	|| (check_more == 1	2689	|| (check_more == 1
2658	&& current_screen == selection.screen	2690	&& current_screen == selection.screen
2659	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2691	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2692	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661	|| (check_more == 2
2662	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2663	&& ROWCOL_IS_AFTER (selection.end, pos))
2664	|| (check_more == 3
2665	&& ROWCOL_IS_AFTER (selection.end, pos))
2666	|| (check_more == 4 /* screen width change */
2667	&& (selection.beg.row != selection.end.row
2668	|| selection.end.col > ncol)))
2669	CLEAR_SELECTION ();	2693	CLEAR_ALL_SELECTION ();
2670	}	2694	}
2671		2695
2672	/* ------------------------------------------------------------------------- */	2696	/* ------------------------------------------------------------------------- */
2673	/*	2697	/*
2674	* Paste a selection direct to the command fd	2698	* Paste a selection direct to the command fd
2675	*/	2699	*/
2676	void	2700	void
2677	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2701	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678	{	2702	{
2679	/* convert normal newline chars into common keyboard Return key sequence */	2703	/* convert normal newline chars into common keyboard Return key sequence */
2680	for (unsigned int i = 0; i < len; i++)	2704	for (unsigned int i = 0; i < len; i++)
2681	if (data[i] == C0_LF)	2705	if (data[i] == C0_LF)
2682	data[i] = C0_CR;	2706	data[i] = C0_CR;
2683		2707
2684	if (priv_modes & PrivMode_BracketPaste)	2708	if (priv_modes & PrivMode_BracketPaste)
2685	tt_printf ("\e[200~");	2709	tt_printf ("\x1b[200~");
2686		2710
2687	tt_write (data, len);	2711	tt_write (data, len);
2688		2712
2689	if (priv_modes & PrivMode_BracketPaste)	2713	if (priv_modes & PrivMode_BracketPaste)
2690	tt_printf ("\e[201~");	2714	tt_printf ("\x1b[201~");
2691	}	2715	}
2692		2716
2693	/* ------------------------------------------------------------------------- */
2694	/*
2695	* Respond to a notification that a primary selection has been sent
2696	* EXT: SelectionNotify
2697	*/
2698	void	2717	void
2699	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2718	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700	{	2719	{
2701	if (prop == None) /* check for failed XConvertSelection */	2720	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702	{
2703	if ((selection_type & Sel_CompoundText))
2704	{
2705	int selnum = selection_type & Sel_whereMask;
2706
2707	selection_type = 0;
2708	if (selnum != Sel_direct)
2709	selection_request_other (XA_STRING, selnum);
2710	}
2711
2712	if ((selection_type & Sel_UTF8String))
2713	{
2714	int selnum = selection_type & Sel_whereMask;
2715
2716	selection_type = Sel_CompoundText;
2717	if (selnum != Sel_direct)
2718	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719	else
2720	selection_type = 0;
2721	}
2722
2723	return;
2724	}
2725
2726	unsigned long bytes_after;
2727	XTextProperty ct;
2728
2729	if (XGetWindowProperty (dpy, win, prop,
2730	0, PROP_SIZE / 4,
2731	delete_prop, AnyPropertyType,
2732	&ct.encoding, &ct.format,
2733	&ct.nitems, &bytes_after,
2734	&ct.value) != Success)
2735	{
2736	ct.value = 0;
2737	goto bailout;
2738	}
2739
2740	if (ct.encoding == None)
2741	goto bailout;
2742
2743	if (bytes_after)
2744	{
2745	// fetch and append remaining data
2746	XTextProperty ct2;
2747
2748	if (XGetWindowProperty (dpy, win, prop,
2749	ct.nitems / 4, (bytes_after + 3) / 4,
2750	delete_prop, AnyPropertyType,
2751	&ct2.encoding, &ct2.format,
2752	&ct2.nitems, &bytes_after,
2753	&ct2.value) != Success)
2754	goto bailout;
2755
2756	// realloc should be compatible to XFree, here, and elsewhere, too
2757	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759	ct.nitems += ct2.nitems;
2760
2761	XFree (ct2.value);
2762	}
2763
2764	if (ct.value == 0)
2765	goto bailout;
2766
2767	if (ct.encoding == xa[XA_INCR])
2768	{
2769	// INCR selection, start handshake
2770	if (!delete_prop)
2771	XDeleteProperty (dpy, win, prop);
2772
2773	selection_wait = Sel_incr;
2774	incr_buf_fill = 0;
2775	incr_ev.start (10);
2776
2777	goto bailout;
2778	}
2779
2780	if (ct.nitems == 0)
2781	{
2782	if (selection_wait == Sel_incr)
2783	{
2784	XFree (ct.value);
2785
2786	// finally complete, now paste the whole thing
2787	selection_wait = Sel_normal;
2788	ct.value = (unsigned char *)incr_buf;
2789	ct.nitems = incr_buf_fill;
2790	incr_buf = 0;
2791	incr_buf_size = 0;
2792	incr_ev.stop ();
2793	}
2794	else
2795	{
2796	if (selection_wait == Sel_normal
2797	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798	{
2799	/*
2800	* pass through again trying CUT_BUFFER0 if we've come from
2801	* XConvertSelection () but nothing was presented
2802	*/
2803	selection_paste (display->root, XA_CUT_BUFFER0, False);
2804	}
2805
2806	goto bailout;
2807	}
2808	}
2809	else if (selection_wait == Sel_incr)
2810	{
2811	incr_ev.start (10);
2812
2813	while (incr_buf_fill + ct.nitems > incr_buf_size)
2814	{
2815	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817	}
2818
2819	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820	incr_buf_fill += ct.nitems;
2821
2822	goto bailout;
2823	}
2824
2825	char **cl;
2826	int cr;
2827
2828	#if !ENABLE_MINIMAL
2829	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830	// so recode it manually
2831	if (ct.encoding == xa[XA_UTF8_STRING])
2832	{
2833	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834	char *s = rxvt_wcstombs (w);
2835	free (w);
2836	// TODO: strlen == only the first element will be converted. well...
2837	paste (s, strlen (s));
2838	free (s);
2839	}
2840	else
2841	#endif
2842	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843	&& cl)
2844	{
2845	for (int i = 0; i < cr; i++)
2846	paste (cl[i], strlen (cl[i]));
2847
2848	XFreeStringList (cl);
2849	}
2850	else
2851	paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853	bailout:
2854	XFree (ct.value);
2855
2856	if (selection_wait == Sel_normal)
2857	selection_wait = Sel_none;
2858	}
2859
2860	void
2861	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862	{
2863	selection_wait = Sel_none;
2864
2865	incr_buf_size = 0;
2866	free (incr_buf);
2867
2868	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869	}
2870
2871	void
2872	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873	{
2874	if (prop == None || selection_wait != Sel_incr)
2875	return;	2721	return;
2876		2722
2877	selection_paste (win, prop, true);	2723	tt_paste (data, len);
2878	}	2724	}
2879		2725
2880	/* ------------------------------------------------------------------------- */	2726	/* ------------------------------------------------------------------------- */
2881	/*	2727	/*
2882	* Request the current selection:	2728	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883	* Order: > internal selection if available	2729	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2730	* as fallback
2885	* > CUT_BUFFER0
2886	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887	* will auto fallback to CUT_BUFFER0
2888	* EXT: button 2 release	2731	* EXT: button 2 release
2889	*/	2732	*/
2890	void	2733	void
2891	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2734	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892	{	2735	{
2893	if (selection.text && selnum == Sel_Primary)	2736	if (!selection_req)
2894	{
2895	/* internal selection */
2896	char *str = rxvt_wcstombs (selection.text, selection.len);
2897	paste (str, strlen (str));
2898	free (str);
2899	return;
2900	}	2737	{
2901	else	2738	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2739	selection_req->run ();
2902	{	2740	}
2903	selection_request_time = tm;
2904	selection_wait = Sel_normal;
2905
2906	#if X_HAVE_UTF8_STRING
2907	selection_type = Sel_UTF8String;
2908	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909	return;
2910	#else
2911	selection_type = Sel_CompoundText;
2912	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913	return;
2914	#endif
2915	}
2916
2917	selection_wait = Sel_none; /* don't loop in selection_paste () */
2918	selection_paste (display->root, XA_CUT_BUFFER0, false);
2919	}
2920
2921	int
2922	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923	{
2924	Atom sel;
2925
2926	selection_type |= selnum;
2927
2928	if (selnum == Sel_Primary)
2929	sel = XA_PRIMARY;
2930	else if (selnum == Sel_Secondary)
2931	sel = XA_SECONDARY;
2932	else
2933	sel = xa[XA_CLIPBOARD];
2934
2935	if (XGetSelectionOwner (dpy, sel) != None)
2936	{
2937	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938	vt, selection_request_time);
2939	return 1;
2940	}
2941
2942	return 0;
2943	}	2741	}
2944		2742
2945	/* ------------------------------------------------------------------------- */	2743	/* ------------------------------------------------------------------------- */
2946	/*	2744	/*
2947	* Clear all selected text	2745	* Clear all selected text
2948	* EXT: SelectionClear	2746	* EXT: SelectionClear
2949	*/	2747	*/
2950	void	2748	void
2951	rxvt_term::selection_clear () NOTHROW	2749	rxvt_term::selection_clear (bool clipboard) NOTHROW
2952	{	2750	{
		2751	if (!clipboard)
		2752	{
2953	want_refresh = 1;	2753	want_refresh = 1;
2954	free (selection.text);	2754	free (selection.text);
2955	selection.text = NULL;	2755	selection.text = NULL;
2956	selection.len = 0;	2756	selection.len = 0;
2957	CLEAR_SELECTION ();	2757	CLEAR_SELECTION ();
2958		2758
2959	if (display->selection_owner == this)	2759	if (display->selection_owner == this)
2960	display->selection_owner = 0;	2760	display->selection_owner = 0;
		2761	}
		2762	else
		2763	{
		2764	free (selection.clip_text);
		2765	selection.clip_text = NULL;
		2766	selection.clip_len = 0;
		2767
		2768	if (display->clipboard_owner == this)
		2769	display->clipboard_owner = 0;
		2770	}
2961	}	2771	}
2962		2772
2963	/* ------------------------------------------------------------------------- */	2773	/* ------------------------------------------------------------------------- */
2964	/*	2774	/*
2965	* Copy a selection into the cut buffer	2775	* Copy a selection into the cut buffer
2966	* EXT: button 1 or 3 release	2776	* EXT: button 1 or 3 release
2967	*/	2777	*/
2968	void	2778	void
2969	rxvt_term::selection_make (Time tm)	2779	rxvt_term::selection_make (Time tm)
2970	{	2780	{
2971	int i;	2781	int size;
2972	wchar_t *new_selection_text;	2782	wchar_t *new_selection_text;
2973	text_t *t;	2783	text_t *t;
2974		2784
2975	switch (selection.op)	2785	switch (selection.op)
2976	{	2786	{
…		…
2992	return; /* nothing selected, go away */	2802	return; /* nothing selected, go away */
2993		2803
2994	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2804	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995	return;	2805	return;
2996		2806
2997	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2807	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2808	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999		2809
3000	int ofs = 0;	2810	int ofs = 0;
3001	int extra = 0;	2811	int extra = 0;
3002		2812
3003	int col = selection.beg.col;	2813	int col = selection.beg.col;
…		…
3009	{	2819	{
3010	#if !ENABLE_MINIMAL	2820	#if !ENABLE_MINIMAL
3011	if (selection.rect)	2821	if (selection.rect)
3012	{	2822	{
3013	col = selection.beg.col;	2823	col = selection.beg.col;
3014	end_col = ncol + 1;	2824	end_col = selection.end.col;
3015	}	2825	}
3016	else	2826	else
3017	#endif	2827	#endif
3018	end_col = ROW(row).l;	2828	end_col = ROW(row).l;
3019		2829
3020	col = max (col, 0);	2830	col = max (col, 0);
3021		2831
3022	if (row == selection.end.row	2832	if (row == selection.end.row)
3023	#if !ENABLE_MINIMAL
3024	|| selection.rect
3025	#endif
3026	)
3027	min_it (end_col, selection.end.col);	2833	min_it (end_col, selection.end.col);
3028		2834
3029	t = ROW(row).t + col;	2835	t = ROW(row).t + col;
3030		2836
3031	for (; col < end_col; col++)	2837	for (; col < end_col; col++)
…		…
3039		2845
3040	extra -= (len - 1);	2846	extra -= (len - 1);
3041		2847
3042	if (extra < 0)	2848	if (extra < 0)
3043	{	2849	{
3044	extra += i;	2850	extra += size;
3045	i += i;	2851	size += size;
3046	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2852	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047	}	2853	}
3048		2854
3049	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2855	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050	}	2856	}
3051	#endif	2857	#endif
…		…
3063		2869
3064	new_selection_text[ofs++] = C0_LF;	2870	new_selection_text[ofs++] = C0_LF;
3065	}	2871	}
3066	else	2872	else
3067	#endif	2873	#endif
3068	if (!ROW(row).is_longer () && row != selection.end.row)	2874	if (!ROW(row).is_longer ()
		2875	&& (row != selection.end.row || end_col != selection.end.col)
		2876	&& (row != selection.beg.row || selection.beg.col < ncol))
3069	new_selection_text[ofs++] = C0_LF;	2877	new_selection_text[ofs++] = C0_LF;
3070	}	2878	}
3071
3072	if (end_col != selection.end.col)
3073	new_selection_text[ofs++] = C0_LF;
3074		2879
3075	new_selection_text[ofs] = 0;	2880	new_selection_text[ofs] = 0;
3076		2881
3077	if (ofs == 0)	2882	if (ofs == 0)
3078	{	2883	{
…		…
3091		2896
3092	selection_grab (tm);	2897	selection_grab (tm);
3093	}	2898	}
3094		2899
3095	bool	2900	bool
3096	rxvt_term::selection_grab (Time tm) NOTHROW	2901	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097	{	2902	{
		2903	Atom sel;
		2904
		2905	if (!clipboard)
		2906	{
3098	selection_time = tm;	2907	selection_time = tm;
		2908	sel = XA_PRIMARY;
		2909	}
		2910	else
		2911	{
		2912	clipboard_time = tm;
		2913	sel = xa[XA_CLIPBOARD];
		2914	}
3099		2915
3100	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2916	XSetSelectionOwner (dpy, sel, vt, tm);
3101	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2917	if (XGetSelectionOwner (dpy, sel) == vt)
3102	{	2918	{
3103	display->set_selection_owner (this);	2919	display->set_selection_owner (this, clipboard);
3104	return true;	2920	return true;
3105	}	2921	}
3106	else	2922	else
3107	{	2923	{
3108	selection_clear ();	2924	selection_clear (clipboard);
3109	return false;	2925	return false;
3110	}	2926	}
3111		2927
3112	#if 0	2928	#if 0
3113	XTextProperty ct;	2929	XTextProperty ct;
…		…
3573	* EXT: SelectionRequest	3389	* EXT: SelectionRequest
3574	*/	3390	*/
3575	void	3391	void
3576	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3392	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577	{	3393	{
		3394	Atom property = rq.property == None ? rq.target : rq.property;
3578	XSelectionEvent ev;	3395	XSelectionEvent ev;
3579		3396
3580	ev.type = SelectionNotify;	3397	ev.type = SelectionNotify;
3581	ev.property = None;	3398	ev.property = None;
3582	ev.display = rq.display;	3399	ev.display = rq.display;
…		…
3597	*target++ = xa[XA_COMPOUND_TEXT];	3414	*target++ = xa[XA_COMPOUND_TEXT];
3598	#if X_HAVE_UTF8_STRING	3415	#if X_HAVE_UTF8_STRING
3599	*target++ = xa[XA_UTF8_STRING];	3416	*target++ = xa[XA_UTF8_STRING];
3600	#endif	3417	#endif
3601		3418
3602	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3419	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603	32, PropModeReplace,	3420	32, PropModeReplace,
3604	(unsigned char *)target_list, target - target_list);	3421	(unsigned char *)target_list, target - target_list);
3605	ev.property = rq.property;	3422	ev.property = property;
3606	}	3423	}
3607	#if TODO // TODO	3424	#if TODO // TODO
3608	else if (rq.target == xa[XA_MULTIPLE])	3425	else if (rq.target == xa[XA_MULTIPLE])
3609	{	3426	{
3610	/* TODO: Handle MULTIPLE */	3427	/* TODO: Handle MULTIPLE */
3611	}	3428	}
3612	#endif	3429	#endif
3613	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3430	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614	{	3431	{
3615	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3432	XChangeProperty (dpy, rq.requestor, property, rq.target,
3616	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3433	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617	ev.property = rq.property;	3434	ev.property = property;
		3435	}
		3436	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3437	{
		3438	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3439	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3440	ev.property = property;
3618	}	3441	}
3619	else if (rq.target == XA_STRING	3442	else if (rq.target == XA_STRING
3620	|| rq.target == xa[XA_TEXT]	3443	|| rq.target == xa[XA_TEXT]
3621	|| rq.target == xa[XA_COMPOUND_TEXT]	3444	|| rq.target == xa[XA_COMPOUND_TEXT]
3622	|| rq.target == xa[XA_UTF8_STRING]	3445	|| rq.target == xa[XA_UTF8_STRING]
…		…
3654	{	3477	{
3655	target = xa[XA_COMPOUND_TEXT];	3478	target = xa[XA_COMPOUND_TEXT];
3656	style = enc_compound_text;	3479	style = enc_compound_text;
3657	}	3480	}
3658		3481
3659	if (selection.text)	3482	if (rq.selection == XA_PRIMARY && selection.text)
3660	{	3483	{
3661	cl = selection.text;	3484	cl = selection.text;
3662	selectlen = selection.len;	3485	selectlen = selection.len;
		3486	}
		3487	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3488	{
		3489	cl = selection.clip_text;
		3490	selectlen = selection.clip_len;
3663	}	3491	}
3664	else	3492	else
3665	{	3493	{
3666	cl = L"";	3494	cl = L"";
3667	selectlen = 0;	3495	selectlen = 0;
…		…
3688	ct.value = (unsigned char *)cl;	3516	ct.value = (unsigned char *)cl;
3689	ct.nitems = selectlen;	3517	ct.nitems = selectlen;
3690	ct.encoding = target;	3518	ct.encoding = target;
3691	}	3519	}
3692		3520
3693	XChangeProperty (dpy, rq.requestor, rq.property,	3521	XChangeProperty (dpy, rq.requestor, property,
3694	ct.encoding, 8, PropModeReplace,	3522	ct.encoding, 8, PropModeReplace,
3695	ct.value, (int)ct.nitems);	3523	ct.value, (int)ct.nitems);
3696	ev.property = rq.property;	3524	ev.property = property;
3697		3525
3698	if (freect)	3526	if (freect)
3699	XFree (ct.value);	3527	XFree (ct.value);
3700	}	3528	}
3701		3529
…		…
3735	h += 2; min_it (h, nrow);	3563	h += 2; min_it (h, nrow);
3736		3564
3737	x -= 1; clamp_it (x, 0, ncol - w);	3565	x -= 1; clamp_it (x, 0, ncol - w);
3738	y -= 1; clamp_it (y, 0, nrow - h);	3566	y -= 1; clamp_it (y, 0, nrow - h);
3739		3567
3740	ov_x = x; ov_y = y;	3568	ov.x = x; ov.y = y;
3741	ov_w = w; ov_h = h;	3569	ov.w = w; ov.h = h;
3742		3570
3743	ov_text = new text_t *[h];	3571	ov.text = new text_t *[h];
3744	ov_rend = new rend_t *[h];	3572	ov.rend = new rend_t *[h];
3745		3573
3746	for (y = 0; y < h; y++)	3574	for (y = 0; y < h; y++)
3747	{	3575	{
3748	text_t *tp = ov_text[y] = new text_t[w];	3576	text_t *tp = ov.text[y] = new text_t[w];
3749	rend_t *rp = ov_rend[y] = new rend_t[w];	3577	rend_t *rp = ov.rend[y] = new rend_t[w];
3750		3578
3751	text_t t0, t1, t2;	3579	text_t t0, t1, t2;
3752	rend_t r = OVERLAY_RSTYLE;	3580	rend_t r = OVERLAY_RSTYLE;
3753		3581
3754	if (y == 0)	3582	if (y == 0)
…		…
3773	}	3601	}
3774		3602
3775	void	3603	void
3776	rxvt_term::scr_overlay_off () NOTHROW	3604	rxvt_term::scr_overlay_off () NOTHROW
3777	{	3605	{
3778	if (!ov_text)	3606	if (!ov.text)
3779	return;	3607	return;
3780		3608
3781	want_refresh = 1;	3609	want_refresh = 1;
3782		3610
3783	for (int y = 0; y < ov_h; y++)	3611	for (int y = 0; y < ov.h; y++)
3784	{	3612	{
3785	delete [] ov_text[y];	3613	delete [] ov.text[y];
3786	delete [] ov_rend[y];	3614	delete [] ov.rend[y];
3787	}	3615	}
3788		3616
3789	delete [] ov_text; ov_text = 0;	3617	delete [] ov.text; ov.text = 0;
3790	delete [] ov_rend; ov_rend = 0;	3618	delete [] ov.rend; ov.rend = 0;
3791	}	3619	}
3792		3620
3793	void	3621	void
3794	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3622	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795	{	3623	{
3796	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3624	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797	return;	3625	return;
3798		3626
3799	x++, y++;	3627	x++, y++;
3800		3628
3801	ov_text[y][x] = text;	3629	ov.text[y][x] = text;
3802	ov_rend[y][x] = rend;	3630	ov.rend[y][x] = rend;
3803	}	3631	}
3804		3632
3805	void	3633	void
3806	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3634	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807	{	3635	{
…		…
3826	}	3654	}
3827		3655
3828	void	3656	void
3829	rxvt_term::scr_swap_overlay () NOTHROW	3657	rxvt_term::scr_swap_overlay () NOTHROW
3830	{	3658	{
3831	if (!ov_text)	3659	if (!ov.text)
3832	return;	3660	return;
3833		3661
		3662	// hide cursor if it is within the overlay area
		3663	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3664	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3665	screen.flags &= ~Screen_VisibleCursor;
		3666
3834	// swap screen mem with overlay	3667	// swap screen mem with overlay
3835	for (int y = ov_h; y--; )	3668	for (int y = ov.h; y--; )
3836	{	3669	{
3837	text_t *t1 = ov_text[y];	3670	text_t *t1 = ov.text[y];
3838	rend_t *r1 = ov_rend[y];	3671	rend_t *r1 = ov.rend[y];
3839		3672
3840	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3673	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3674	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842		3675
3843	for (int x = ov_w; x--; )	3676	for (int x = ov.w; x--; )
3844	{	3677	{
3845	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3678	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3679	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847	}	3680	}
3848	}	3681	}

Diff Legend

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