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.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.405 by sf-exg, Tue Nov 15 20:09:13 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 begin, 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++;
153	} while (col < ncol && l.t[col] == NOCHAR);	154	} while (col < ncol && l.t[col] == NOCHAR);
…		…
162	{	163	{
163	#if ENABLE_OVERLAY	164	#if ENABLE_OVERLAY
164	scr_overlay_off ();	165	scr_overlay_off ();
165	#endif	166	#endif
166		167
167	rvideo_mode = false;
168	view_start = 0;	168	view_start = 0;
169	num_scr = 0;	169	num_scr = 0;
170		170
171	if (ncol == 0)	171	if (ncol == 0)
172	ncol = 80;	172	ncol = 80;
…		…
174	if (nrow == 0)	174	if (nrow == 0)
175	nrow = 24;	175	nrow = 24;
176		176
177	if (ncol == prev_ncol && nrow == prev_nrow)	177	if (ncol == prev_ncol && nrow == prev_nrow)
178	return;	178	return;
179
180	if (current_screen != PRIMARY)
181	scr_swap_screen ();
182		179
183	// we need at least two lines for wrapping to work correctly	180	// we need at least two lines for wrapping to work correctly
184	while (nrow + saveLines < 2)	181	while (nrow + saveLines < 2)
185	{	182	{
186	//TODO//FIXME	183	//TODO//FIXME
…		…
206	term_start = 0;	203	term_start = 0;
207		204
208	talloc = new rxvt_salloc (ncol * sizeof (text_t));	205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
209	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210		207
211	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	208	row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
212	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214		211
215	for (int row = nrow; row--; )	212	for (int row = nrow; row--; )
216	{	213	{
…		…
239	selection.text = NULL;	236	selection.text = NULL;
240	selection.len = 0;	237	selection.len = 0;
241	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
242	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
243	selection.clicks = 0;	240	selection.clicks = 0;
		241	selection.clip_text = NULL;
		242	selection.clip_len = 0;
244	}	243	}
245	else	244	else
246	{	245	{
247	/*	246	/*
248	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
276	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);
277	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);
278	}	277	}
279		278
280	line_t *old_buf = row_buf;	279	line_t *old_buf = row_buf;
281	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
282		281
283	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
284	int pend = MOD (term_start + top_row , prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
285	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
286		285
287	if (top_row)	286	if (top_row)
288	{	287	{
289	// 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
290	// 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
291		291
292	row_col_t ocur = screen.cur;	292	row_col_t ocur = screen.cur;
293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294		294
295	do	295	do
296	{	296	{
297	p = MOD (p - 1, prev_total_rows);	297	p = MOD (p - 1, prev_total_rows);
298	#ifdef DEBUG_STRICT
299	assert (old_buf [MOD (p, prev_total_rows)].t);	298	assert (old_buf [MOD (p, prev_total_rows)].t);
300	#endif
301	int plines = 1;	299	int plines = 1;
302	int llen = old_buf [MOD (p, prev_total_rows)].l;	300	int llen = old_buf [MOD (p, prev_total_rows)].l;
303		301
304	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 ())
305	{	303	{
…		…
399	delete old_ta;	397	delete old_ta;
400	delete old_ra;	398	delete old_ra;
401		399
402	clamp_it (screen.cur.row, 0, nrow - 1);	400	clamp_it (screen.cur.row, 0, nrow - 1);
403	clamp_it (screen.cur.col, 0, ncol - 1);	401	clamp_it (screen.cur.col, 0, ncol - 1);
		402	}
404		403
405	free (tabs);	404	free (tabs);
406	}	405	tabs = (char *)rxvt_malloc (ncol);
		406
		407	for (int col = ncol; col--; )
		408	tabs [col] = col % TABSIZE == 0;
407		409
408	CLEAR_ALL_SELECTION ();	410	CLEAR_ALL_SELECTION ();
409		411
410	prev_nrow = nrow;	412	prev_nrow = nrow;
411	prev_ncol = ncol;	413	prev_ncol = ncol;
412
413	tabs = (char *)rxvt_malloc (ncol);
414
415	for (int col = ncol; --col; )
416	tabs [col] = col % TABSIZE == 0;
417
418	if (current_screen != PRIMARY)
419	scr_swap_screen ();
420		414
421	tt_winch ();	415	tt_winch ();
422		416
423	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424	}	418	}
…		…
436	delete ralloc; ralloc = 0;	430	delete ralloc; ralloc = 0;
437		431
438	free (row_buf);	432	free (row_buf);
439	free (swap_buf);	433	free (swap_buf);
440	free (drawn_buf);	434	free (drawn_buf);
		435	row_buf = 0; // signal that we freed all the arrays above
		436
441	free (tabs);	437	free (tabs);
442		438	tabs = 0;
443	row_buf = 0; // signal that we freed all the arrays
444	}	439	}
445	}	440	}
446		441
447	/* ------------------------------------------------------------------------- */	442	/* ------------------------------------------------------------------------- */
448	/*	443	/*
449	* Hard reset	444	* Hard/Soft reset
450	*/	445	*/
451	void	446	void
452	rxvt_term::scr_poweron ()	447	rxvt_term::scr_poweron ()
453	{	448	{
454	scr_release ();	449	scr_release ();
455	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
		451	rvideo_mode = false;
		452	scr_soft_reset ();
456	scr_reset ();	453	scr_reset ();
457		454
458	scr_clear (true);	455	scr_clear (true);
459	scr_refresh ();	456	scr_refresh ();
		457	}
		458
		459	void
		460	rxvt_term::scr_soft_reset ()
		461	{
		462	/* only affects modes, nothing drastic such as clearing the screen */
		463	#if ENABLE_OVERLAY
		464	scr_overlay_off ();
		465	#endif
		466
		467	if (current_screen != PRIMARY)
		468	scr_swap_screen ();
		469
		470	scr_scroll_region (0, MAX_ROWS - 1);
		471	scr_rendition (0, ~RS_None);
		472	scr_insert_mode (0);
460	}	473	}
461		474
462	/* ------------------------------------------------------------------------- *	475	/* ------------------------------------------------------------------------- *
463	* PROCESS SCREEN COMMANDS *	476	* PROCESS SCREEN COMMANDS *
464	* ------------------------------------------------------------------------- */	477	* ------------------------------------------------------------------------- */
…		…
502	}	515	}
503		516
504	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
505	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
506	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
507	#ifdef DEBUG_STRICT
508	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
509	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
510	#endif
511	}	522	}
512		523
513	void	524	void
514	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen ()
515	{	526	{
…		…
540	want_refresh = 1;	551	want_refresh = 1;
541	view_start = 0;	552	view_start = 0;
542		553
543	selection_check (2); /* check for boundary cross */	554	selection_check (2); /* check for boundary cross */
544		555
545	int i = current_screen; current_screen = scrn; scrn = i;	556	current_screen = scrn;
546		557
547	#if NSCREENS	558	#if NSCREENS
548	if (option (Opt_secondaryScreen))	559	if (option (Opt_secondaryScreen))
549	{	560	{
550	num_scr = 0;	561	num_scr = 0;
…		…
627		638
628	if (count > 0	639	if (count > 0
629	&& row1 == 0	640	&& row1 == 0
630	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))	641	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631	{	642	{
		643	min_it (count, total_rows - (nrow - (row2 + 1)));
		644
632	top_row = max (top_row - count, -saveLines);	645	top_row = max (top_row - count, -saveLines);
633
634	// scroll everything up 'count' lines
635	term_start = (term_start + count) % total_rows;
636		646
637	// sever bottommost line	647	// sever bottommost line
638	{	648	{
639	line_t &l = ROW(row2 - count);	649	line_t &l = ROW(row2);
640	l.is_longer (0);	650	l.is_longer (0);
641	l.touch ();	651	l.touch ();
642	}	652	}
643		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
644	// erase newly scrolled-in lines	669	// erase newly scrolled-in lines
645	for (int i = count; i--; )	670	for (int i = count; i--; )
646	{	671	{
647	line_t &l = ROW(nrow - 1 - i);	672	line_t &l = ROW(row2 - i);
648		673
649	// optimize if already cleared, can be significant on slow machines	674	// optimise if already cleared, can be significant on slow machines
650	// could be rolled into scr_blank_screen_mem	675	// could be rolled into scr_blank_screen_mem
651	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)))
652	{	677	{
653	scr_blank_line (l, 0, l.l, rstyle);	678	scr_blank_line (l, 0, l.l, rstyle);
654	l.l = 0;	679	l.l = 0;
…		…
656	}	681	}
657	else	682	else
658	scr_blank_screen_mem (l, rstyle);	683	scr_blank_screen_mem (l, rstyle);
659	}	684	}
660		685
661	// now copy lines below the scroll region bottom to the
662	// bottom of the screen again, so they look as if they
663	// hadn't moved.
664	for (int i = nrow; --i > row2; )
665	{
666	line_t &l1 = ROW(i - count);
667	line_t &l2 = ROW(i);
668
669	::swap (l1, l2);
670	l2.touch ();
671	}
672
673	// move and/or clear selection, if any	686	// move and/or clear selection, if any
674	if (selection.op && current_screen == selection.screen)	687	if (selection.op && current_screen == selection.screen
		688	&& selection.beg.row <= row2)
675	{	689	{
676	selection.beg.row -= count;	690	selection.beg.row -= count;
677	selection.end.row -= count;	691	selection.end.row -= count;
678	selection.mark.row -= count;	692	selection.mark.row -= count;
679		693
680	if (selection.beg.row < top_row	694	selection_check (0);
681	|| selection.end.row < top_row
682	|| selection.mark.row < top_row)
683	{
684	CLEAR_ALL_SELECTION ();
685	selection.op = SELECTION_CLEAR;
686	}
687	}	695	}
688		696
689	// finally move the view window, if desired	697	// finally move the view window, if desired
690	if (option (Opt_scrollWithBuffer)	698	if (option (Opt_scrollWithBuffer)
691	&& view_start != 0	699	&& view_start != 0
…		…
721	}	729	}
722		730
723	// use a simple and robust scrolling algorithm, this	731	// use a simple and robust scrolling algorithm, this
724	// part of scr_scroll_text is not time-critical.	732	// part of scr_scroll_text is not time-critical.
725		733
		734	// sever line above scroll region
		735	if (row1)
		736	{
		737	line_t &l = ROW(row1 - 1);
		738	l.is_longer (0);
		739	l.touch ();
		740	}
		741
726	int rows = row2 - row1 + 1;	742	int rows = row2 - row1 + 1;
727		743
728	min_it (count, rows);	744	min_it (count, rows);
729		745
730	line_t *temp_buf = row_buf + total_rows;	746	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731		747
732	for (int row = 0; row < rows; row++)	748	for (int row = 0; row < rows; row++)
733	{	749	{
734	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	750	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735		751
…		…
737	scr_blank_screen_mem (temp_buf [row], rstyle);	753	scr_blank_screen_mem (temp_buf [row], rstyle);
738	}	754	}
739		755
740	for (int row = 0; row < rows; row++)	756	for (int row = 0; row < rows; row++)
741	ROW(row1 + row) = temp_buf [row];	757	ROW(row1 + row) = temp_buf [row];
		758
		759	// sever bottommost line
		760	{
		761	line_t &l = ROW(row2);
		762	l.is_longer (0);
		763	l.touch ();
		764	}
742	}	765	}
743		766
744	return count;	767	return count;
745	}	768	}
746		769
…		…
752	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	775	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
753	{	776	{
754	if (len <= 0) /* sanity */	777	if (len <= 0) /* sanity */
755	return;	778	return;
756		779
757	unsigned char checksel;	780	bool checksel;
758	unicode_t c;	781	unicode_t c;
759	int ncol = this->ncol;	782	int ncol = this->ncol;
760	const wchar_t *strend = str + len;	783	const wchar_t *strend = str + len;
761		784
762	want_refresh = 1;	785	want_refresh = 1;
…		…
775	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	798	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776	screen.cur.row -= minlines;	799	screen.cur.row -= minlines;
777	}	800	}
778	}	801	}
779		802
780	#ifdef DEBUG_STRICT
781	assert (screen.cur.col < ncol);	803	assert (screen.cur.col < ncol);
782	assert (screen.cur.row < nrow	804	assert (screen.cur.row < nrow
783	&& screen.cur.row >= top_row);	805	&& screen.cur.row >= top_row);
784	#endif
785	int row = screen.cur.row;	806	int row = screen.cur.row;
786		807
787	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	808	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788		809
789	line_t *line = &ROW(row);	810	line_t *line = &ROW(row);
790		811
791	while (str < strend)	812	while (str < strend)
792	{	813	{
793	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	814	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794		815
795	if (expect_false (c < 0x20))	816	if (ecb_unlikely (c < 0x20))
796	if (c == C0_LF)	817	if (c == C0_LF)
797	{	818	{
798	max_it (line->l, screen.cur.col);	819	max_it (line->l, screen.cur.col);
799		820
800	screen.flags &= ~Screen_WrapNext;	821	screen.flags &= ~Screen_WrapNext;
…		…
819	{	840	{
820	scr_tab (1, true);	841	scr_tab (1, true);
821	continue;	842	continue;
822	}	843	}
823		844
824	if (expect_false (	845	if (ecb_unlikely (
825	checksel /* see if we're writing within selection */	846	checksel /* see if we're writing within selection */
826	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	847	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	848	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
828	))	849	))
829	{	850	{
…		…
834	* should be a similar check.	855	* should be a similar check.
835	*/	856	*/
836	CLEAR_SELECTION ();	857	CLEAR_SELECTION ();
837	}	858	}
838		859
839	if (expect_false (screen.flags & Screen_WrapNext))	860	if (ecb_unlikely (screen.flags & Screen_WrapNext))
840	{	861	{
841	scr_do_wrap ();	862	scr_do_wrap ();
842		863
843	line->l = ncol;	864	line->l = ncol;
844	line->is_longer (1);	865	line->is_longer (1);
…		…
846	row = screen.cur.row;	867	row = screen.cur.row;
847	line = &ROW(row); /* _must_ refresh */	868	line = &ROW(row); /* _must_ refresh */
848	}	869	}
849		870
850	// some utf-8 decoders "decode" surrogate characters: let's fix this.	871	// some utf-8 decoders "decode" surrogate characters: let's fix this.
851	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	872	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852	c = 0xfffd;	873	c = 0xfffd;
853		874
854	// rely on wcwidth to tell us the character width, do wcwidth before	875	// rely on wcwidth to tell us the character width, do wcwidth before
855	// further replacements, as wcwidth might return -1 for the line	876	// further replacements, as wcwidth might return -1 for the line
856	// drawing characters below as they might be invalid in the current	877	// drawing characters below as they might be invalid in the current
857	// locale.	878	// locale.
858	int width = WCWIDTH (c);	879	int width = WCWIDTH (c);
859		880
860	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	881	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861	{	882	{
862	// vt100 special graphics and line drawing	883	// vt100 special graphics and line drawing
863	// 5f-7e standard vt100	884	// 5f-7e standard vt100
864	// 40-5e rxvt extension for extra curses acs chars	885	// 40-5e rxvt extension for extra curses acs chars
865	static uint16_t vt100_0[62] = { // 41 .. 7e	886	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
878	c = vt100_0[c - 0x41];	899	c = vt100_0[c - 0x41];
879	width = 1; // vt100 line drawing characters are always single-width	900	width = 1; // vt100 line drawing characters are always single-width
880	}	901	}
881	}	902	}
882		903
883	if (expect_false (screen.flags & Screen_Insert))	904	if (ecb_unlikely (screen.flags & Screen_Insert))
884	scr_insdel_chars (width, INSERT);	905	scr_insdel_chars (width, INSERT);
885		906
886	if (width != 0)	907	if (width != 0)
887	{	908	{
888	#if !UNICODE_3	909	#if !UNICODE_3
…		…
893	# else	914	# else
894	c = 0xfffd;	915	c = 0xfffd;
895	# endif	916	# endif
896	#endif	917	#endif
897		918
		919	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		920
		921	// if the character doesn't fit into the remaining columns...
		922	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		923	{
		924	if (screen.flags & Screen_Autowrap)
		925	{
		926	// ... artificially enlargen the previous one
		927	c = NOCHAR;
		928	// and try the same character next loop iteration
		929	--str;
		930	}
		931	else
		932	screen.cur.col = ncol - width;
		933	}
		934
898	// nuke the character at this position, if required	935	// nuke the character at this position, if required
899	if (expect_false (	936	// due to wonderful coincidences everywhere else in this loop
		937	// we never have to check for overwriting a wide char itself,
		938	// only its tail.
900	line->t[screen.cur.col] == NOCHAR	939	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901	|| (screen.cur.col < ncol - 1
902	&& line->t[screen.cur.col + 1] == NOCHAR)
903	))
904	scr_kill_char (*line, screen.cur.col);	940	scr_kill_char (*line, screen.cur.col);
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 (expect_false (screen.cur.col > ncol - width && ncol >= width))
910	{
911	// ...output spaces
912	c = ' ';
913	// and try the same character next loop iteration
914	--str;
915	}
916		941
917	line->touch ();	942	line->touch ();
918		943
919	do	944	do
920	{	945	{
921	line->t[screen.cur.col] = c;	946	line->t[screen.cur.col] = c;
922	line->r[screen.cur.col] = rend;	947	line->r[screen.cur.col] = rend;
923		948
924	if (expect_true (screen.cur.col < ncol - 1))	949	if (ecb_likely (screen.cur.col < ncol - 1))
925	screen.cur.col++;	950	screen.cur.col++;
926	else	951	else
927	{	952	{
928	line->l = ncol;	953	line->l = ncol;
929	if (screen.flags & Screen_Autowrap)	954	if (screen.flags & Screen_Autowrap)
930	screen.flags |= Screen_WrapNext;	955	screen.flags |= Screen_WrapNext;
931	break;	956
		957	goto end_of_line;
932	}	958	}
933		959
934	c = NOCHAR;	960	c = NOCHAR;
935	}	961	}
936	while (expect_false (--width > 0));	962	while (ecb_unlikely (--width > 0));
937		963
938	// pad with spaces when overwriting wide character with smaller one	964	// pad with spaces when overwriting wide character with smaller one
939	if (expect_false (!width))	965	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940	{	966	{
941	line->touch ();
942
943	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944	{
945	line->t[c] = ' ';	967	line->t[c] = ' ';
946	line->r[c] = rend;	968	line->r[c] = rend;
947	}
948	}	969	}
		970
		971	end_of_line:
		972	;
949	}	973	}
950	#if ENABLE_COMBINING	974	#if ENABLE_COMBINING
951	else // width == 0	975	else // width == 0
952	{	976	{
953	if (c != 0xfeff) // ignore BOM	977	if (c != 0xfeff) // ignore BOM
…		…
993	#endif	1017	#endif
994	}	1018	}
995		1019
996	max_it (line->l, screen.cur.col);	1020	max_it (line->l, screen.cur.col);
997		1021
998	#ifdef DEBUG_STRICT
999	assert (screen.cur.row >= 0);	1022	assert (screen.cur.row >= 0);
1000	#endif
1001	}	1023	}
1002		1024
1003	/* ------------------------------------------------------------------------- */	1025	/* ------------------------------------------------------------------------- */
1004	/*	1026	/*
1005	* Process Backspace. Move back the cursor back a position, wrap if have to	1027	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1018		1040
1019	want_refresh = 1;	1041	want_refresh = 1;
1020	#endif	1042	#endif
1021	}	1043	}
1022	}	1044	}
		1045	else if (screen.flags & Screen_WrapNext)
		1046	screen.flags &= ~Screen_WrapNext;
1023	else	1047	else
1024	scr_gotorc (0, -1, RELATIVE);	1048	scr_gotorc (0, -1, RELATIVE);
1025	}	1049	}
1026		1050
1027	/* ------------------------------------------------------------------------- */	1051	/* ------------------------------------------------------------------------- */
…		…
1333	if (row >= nrow) /* Out Of Bounds */	1357	if (row >= nrow) /* Out Of Bounds */
1334	return;	1358	return;
1335		1359
1336	min_it (num, nrow - row);	1360	min_it (num, nrow - row);
1337		1361
1338	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339	if (rstyle & (RS_RVid | RS_Uline))	1362	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340	ren = (rend_t) ~RS_None;	1363	ren = (rend_t) ~RS_None;
1341	else if (GET_BASEBG (rstyle) == Color_bg)	1364	else if (GET_BASEBG (rstyle) == Color_bg)
1342	{	1365	{
1343	ren = DEFAULT_RSTYLE;	1366	ren = DEFAULT_RSTYLE;
1344		1367
1345	if (mapped)	1368	if (mapped)
1346	XClearArea (dpy, vt, 0,	1369	XClearArea (dpy, vt, 0,
1347	Row2Pixel (row), (unsigned int)width,	1370	Row2Pixel (row - view_start), (unsigned int)width,
1348	(unsigned int)Height2Pixel (num), False);	1371	(unsigned int)Height2Pixel (num), False);
1349	}	1372	}
1350	else	1373	else
1351	{	1374	{
1352	ren = rstyle & (RS_fgMask | RS_bgMask);	1375	ren = rstyle & (RS_fgMask | RS_bgMask);
1353		1376
		1377	if (mapped)
		1378	{
1354	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1379	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1380	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356	XFillRectangle (dpy, vt, gc,	1381	XFillRectangle (dpy, vt, gc,
1357	0, Row2Pixel (row),	1382	0, Row2Pixel (row - view_start),
1358	(unsigned int)width,	1383	(unsigned int)width,
1359	(unsigned int)Height2Pixel (num));	1384	(unsigned int)Height2Pixel (num));
1360	gcvalue.foreground = pix_colors[Color_fg];	1385	gcvalue.foreground = pix_colors[Color_fg];
1361	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1386	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1387	}
1362	}	1388	}
1363		1389
1364	for (; num--; row++)	1390	for (; num--; row++)
1365	{	1391	{
1366	scr_blank_screen_mem (ROW(row), rstyle);	1392	scr_blank_screen_mem (ROW(row), rstyle);
		1393
		1394	if (row - view_start < nrow)
1367	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1395	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368	}	1396	}
1369	}	1397	}
1370		1398
1371	#if !ENABLE_MINIMAL	1399	#if !ENABLE_MINIMAL
1372	void	1400	void
…		…
1446	* Insert/Delete <count> characters from the current position	1474	* Insert/Delete <count> characters from the current position
1447	*/	1475	*/
1448	void	1476	void
1449	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1477	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1450	{	1478	{
1451	int col, row;
1452	rend_t tr;
1453
1454	want_refresh = 1;	1479	want_refresh = 1;
1455	ZERO_SCROLLBACK ();	1480	ZERO_SCROLLBACK ();
1456		1481
1457	if (count <= 0)	1482	if (count <= 0)
1458	return;	1483	return;
…		…
1460	scr_do_wrap ();	1485	scr_do_wrap ();
1461		1486
1462	selection_check (1);	1487	selection_check (1);
1463	min_it (count, ncol - screen.cur.col);	1488	min_it (count, ncol - screen.cur.col);
1464		1489
1465	row = screen.cur.row;	1490	int row = screen.cur.row;
1466		1491
1467	line_t *line = &ROW(row);	1492	line_t *line = &ROW(row);
1468		1493
1469	line->touch ();	1494	line->touch ();
1470	line->is_longer (0);	1495	line->is_longer (0);
1471		1496
		1497	// nuke wide spanning the start
		1498	if (line->t[screen.cur.col] == NOCHAR)
		1499	scr_kill_char (*line, screen.cur.col);
		1500
1472	switch (insdel)	1501	switch (insdel)
1473	{	1502	{
1474	case INSERT:	1503	case INSERT:
1475	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1504	line->l = min (line->l + count, ncol);
		1505
		1506	if (line->t[screen.cur.col] == NOCHAR)
		1507	scr_kill_char (*line, screen.cur.col);
		1508
		1509	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1476	{	1510	{
1477	line->t[col] = line->t[col - count];	1511	line->t[col] = line->t[col - count];
1478	line->r[col] = line->r[col - count];	1512	line->r[col] = line->r[col - count];
1479	}	1513	}
1480
1481	line->l = min (line->l + count, ncol);
1482		1514
1483	if (selection.op && current_screen == selection.screen	1515	if (selection.op && current_screen == selection.screen
1484	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1516	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1485	{	1517	{
1486	if (selection.end.row != screen.cur.row	1518	if (selection.end.row != screen.cur.row
…		…
1501	case ERASE:	1533	case ERASE:
1502	screen.cur.col += count; /* don't worry if > ncol */	1534	screen.cur.col += count; /* don't worry if > ncol */
1503	selection_check (1);	1535	selection_check (1);
1504	screen.cur.col -= count;	1536	screen.cur.col -= count;
1505		1537
		1538	// nuke wide char after the end
		1539	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1540	scr_kill_char (*line, screen.cur.col + count);
		1541
1506	scr_blank_line (*line, screen.cur.col, count, rstyle);	1542	scr_blank_line (*line, screen.cur.col, count, rstyle);
1507	break;	1543	break;
1508		1544
1509	case DELETE:	1545	case DELETE:
1510	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1546	line->l = max (line->l - count, 0);
1511		1547
		1548	// nuke wide char spanning the end
		1549	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1550	scr_kill_char (*line, screen.cur.col + count);
		1551
1512	for (col = screen.cur.col; (col + count) < ncol; col++)	1552	for (int col = screen.cur.col; (col + count) < ncol; col++)
1513	{	1553	{
1514	line->t[col] = line->t[col + count];	1554	line->t[col] = line->t[col + count];
1515	line->r[col] = line->r[col + count];	1555	line->r[col] = line->r[col + count];
1516	}	1556	}
1517		1557
1518	line->l = max (line->l - count, 0);
1519	scr_blank_line (*line, ncol - count, count, tr);	1558	scr_blank_line (*line, ncol - count, count, rstyle);
1520		1559
1521	if (selection.op && current_screen == selection.screen	1560	if (selection.op && current_screen == selection.screen
1522	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1561	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1523	{	1562	{
1524	if (selection.end.row != screen.cur.row	1563	if (selection.end.row != screen.cur.row
…		…
1660	{	1699	{
1661	rvideo_state = on;	1700	rvideo_state = on;
1662		1701
1663	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1702	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1664	#ifdef HAVE_BG_PIXMAP	1703	#ifdef HAVE_BG_PIXMAP
1665	if (bgPixmap.pixmap == None)	1704	if (bg_pixmap == None)
1666	#endif	1705	#endif
1667	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1706	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1668		1707
1669	XGCValues gcvalue;	1708	XGCValues gcvalue;
1670	gcvalue.foreground = pix_colors[Color_fg];	1709	gcvalue.foreground = pix_colors[Color_fg];
…		…
1814	for (i = PART_BEG; i < RC_COUNT; i++)	1853	for (i = PART_BEG; i < RC_COUNT; i++)
1815	{	1854	{
1816	min_it (rc[i].col, ncol - 1);	1855	min_it (rc[i].col, ncol - 1);
1817	min_it (rc[i].row, nrow - 1);	1856	min_it (rc[i].row, nrow - 1);
1818	}	1857	}
1819	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1858
1820	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1859	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1821	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1860	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1822		1861
1823	num_scr_allow = 0;	1862	num_scr_allow = 0;
1824		1863
…		…
1897		1936
1898	# ifndef NO_MAPALERT	1937	# ifndef NO_MAPALERT
1899	# ifdef MAPALERT_OPTION	1938	# ifdef MAPALERT_OPTION
1900	if (option (Opt_mapAlert))	1939	if (option (Opt_mapAlert))
1901	# endif	1940	# endif
1902	XMapWindow (dpy, parent[0]);	1941	XMapWindow (dpy, parent);
1903	# endif	1942	# endif
1904		1943
1905	# if ENABLE_FRILLS	1944	# if ENABLE_FRILLS
1906	if (option (Opt_urgentOnBell))	1945	if (option (Opt_urgentOnBell))
1907	set_urgency (1);	1946	set_urgency (1);
…		…
1915		1954
1916	bell_ev.start (VISUAL_BELL_DURATION);	1955	bell_ev.start (VISUAL_BELL_DURATION);
1917	}	1956	}
1918	else	1957	else
1919	XBell (dpy, 0);	1958	XBell (dpy, 0);
		1959	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920	#endif	1960	#endif
1921	}	1961	}
1922		1962
1923	/* ------------------------------------------------------------------------- */	1963	/* ------------------------------------------------------------------------- */
1924	/* ARGSUSED */
1925	void	1964	void
1926	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1965	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1927	{	1966	{
1928	#ifdef PRINTPIPE	1967	#ifdef PRINTPIPE
1929	int nrows, row_start;	1968	int nrows, row_start;
…		…
1943	row_start = view_start;	1982	row_start = view_start;
1944	}	1983	}
1945		1984
1946	wctomb (0, 0);	1985	wctomb (0, 0);
1947		1986
1948	for (int r1 = 0; r1 < nrows; r1++)	1987	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949	{	1988	{
1950	text_t *tp = ROW(r1).t;	1989	text_t *tp = ROW(r1).t;
1951	int len = ROW(r1).l;	1990	int len = ROW(r1).l;
1952		1991
1953	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1992	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1982	* screen.text/screen.rend contain what the screen will change to.	2021	* screen.text/screen.rend contain what the screen will change to.
1983	*/	2022	*/
1984	void	2023	void
1985	rxvt_term::scr_refresh () NOTHROW	2024	rxvt_term::scr_refresh () NOTHROW
1986	{	2025	{
1987	unsigned char have_bg,
1988	showcursor; /* show the cursor */
1989	int16_t col, row, /* column/row we're processing */	2026	int16_t col, row, /* column/row we're processing */
1990	ocrow; /* old cursor row */	2027	ocrow; /* old cursor row */
1991	int i; /* tmp */	2028	int i; /* tmp */
1992	#ifndef NO_CURSORCOLOR	2029	#ifndef NO_CURSORCOLOR
1993	rend_t cc1; /* store colours at cursor position (s) */	2030	rend_t cc1; /* store colours at cursor position (s) */
…		…
2004	/*	2041	/*
2005	* A: set up vars	2042	* A: set up vars
2006	*/	2043	*/
2007	refresh_count = 0;	2044	refresh_count = 0;
2008		2045
		2046	unsigned int old_screen_flags = screen.flags;
2009	have_bg = 0;	2047	bool have_bg = 0;
2010	#ifdef HAVE_BG_PIXMAP	2048	#ifdef HAVE_BG_PIXMAP
2011	have_bg = bgPixmap.pixmap != None;	2049	have_bg = bg_pixmap != None;
2012	#endif	2050	#endif
2013	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2051	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014		2052
2015	/*	2053	/*
2016	* B: reverse any characters which are selected	2054	* B: reverse any characters which are selected
2017	*/	2055	*/
2018	scr_reverse_selection ();	2056	scr_reverse_selection ();
2019		2057
		2058	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2059	#if ENABLE_OVERLAY
		2060	scr_swap_overlay ();
		2061	#endif
		2062
		2063	bool showcursor = screen.flags & Screen_VisibleCursor;
		2064
2020	/*	2065	/*
2021	* C: set the cursor character (s)	2066	* C: set the cursor character (s)
2022	*/	2067	*/
2023	{	2068	{
2024	unsigned char setoldcursor;	2069	bool setoldcursor;
2025		2070
2026	showcursor = (screen.flags & Screen_VisibleCursor);
2027	#ifdef CURSOR_BLINK	2071	#ifdef CURSOR_BLINK
2028	if (hidden_cursor)	2072	if (hidden_cursor)
2029	showcursor = 0;	2073	showcursor = 0;
2030	#endif	2074	#endif
2031		2075
…		…
2059	ccol2 = bgcolor_of (rstyle);	2103	ccol2 = bgcolor_of (rstyle);
2060	#else	2104	#else
2061	ccol2 = Color_bg;	2105	ccol2 = Color_bg;
2062	#endif	2106	#endif
2063		2107
2064	if (showcursor && focus)	2108	if (focus)
2065	{	2109	{
2066	if (option (Opt_cursorUnderline))	2110	if (option (Opt_cursorUnderline))
2067	*crp ^= RS_Uline;	2111	*crp ^= RS_Uline;
2068	else	2112	else
2069	{	2113	{
…		…
2104	oldcursor.col = screen.cur.col;	2148	oldcursor.col = screen.cur.col;
2105	}	2149	}
2106	}	2150	}
2107	}	2151	}
2108		2152
2109	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110	#if ENABLE_OVERLAY
2111	scr_swap_overlay ();
2112	#endif
2113
2114	#ifndef NO_SLOW_LINK_SUPPORT	2153	#ifndef NO_SLOW_LINK_SUPPORT
2115	/*	2154	/*
2116	* D: CopyArea pass - very useful for slower links	2155	* D: CopyArea pass - very useful for slower links
2117	* This has been deliberately kept simple.	2156	* This has been deliberately kept simple.
2118	*/	2157	*/
…		…
2207	continue;	2246	continue;
2208		2247
2209	// redraw one or more characters	2248	// redraw one or more characters
2210		2249
2211	// seek to the beginning of wide characters	2250	// seek to the beginning of wide characters
2212	while (expect_false (stp[col] == NOCHAR && col > 0))	2251	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2213	--col;	2252	--col;
2214		2253
2215	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2254	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2216	text_t *text = stp + col;	2255	text_t *text = stp + col;
2217	int count = 1;	2256	int count = 1;
2218		2257
2219	dtp[col] = stp[col];	2258	dtp[col] = stp[col];
2220	drp[col] = rend;	2259	drp[col] = rend;
…		…
2224	for (i = 0; ++col < ncol; )	2263	for (i = 0; ++col < ncol; )
2225	{	2264	{
2226	if (stp[col] == NOCHAR)	2265	if (stp[col] == NOCHAR)
2227	{	2266	{
2228	dtp[col] = stp[col];	2267	dtp[col] = stp[col];
2229	drp[col] = rend;	2268	drp[col] = srp[col];
		2269
2230	count++;	2270	count++;
2231	i++;	2271	i++;
2232		2272
2233	continue;	2273	continue;
2234	}	2274	}
…		…
2254		2294
2255	col--; /* went one too far. move back */	2295	col--; /* went one too far. move back */
2256	count -= i; /* dump any matching trailing chars */	2296	count -= i; /* dump any matching trailing chars */
2257		2297
2258	// sometimes we optimize away the trailing NOCHAR's, add them back	2298	// sometimes we optimize away the trailing NOCHAR's, add them back
2259	while (expect_false (i && text[count] == NOCHAR))	2299	while (ecb_unlikely (i && text[count] == NOCHAR))
2260	count++, i--;	2300	count++, i--;
2261		2301
2262	/*	2302	/*
2263	* Determine the attributes for the string	2303	* Determine the attributes for the string
2264	*/	2304	*/
2265	int fore = fgcolor_of (rend); // desired foreground	2305	int fore = fgcolor_of (rend); // desired foreground
2266	int back = bgcolor_of (rend); // desired background	2306	int back = bgcolor_of (rend); // desired background
2267		2307
2268	// only do special processing if any attributes are set, which is unlikely	2308	// only do special processing if any attributes are set, which is unlikely
2269	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2309	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2270	{	2310	{
2271	bool invert = rend & RS_RVid;	2311	bool invert = rend & RS_RVid;
2272		2312
2273	#ifndef NO_BOLD_UNDERLINE_REVERSE	2313	#ifndef NO_BOLD_UNDERLINE_REVERSE
2274	if (rend & RS_Bold && fore == Color_fg)	2314	if (rend & RS_Bold && fore == Color_fg)
…		…
2293		2333
2294	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2334	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295	fore = Color_UL;	2335	fore = Color_UL;
2296	#endif	2336	#endif
2297		2337
		2338	#ifdef OPTION_HC
		2339	if (rend & RS_Sel)
		2340	{
		2341	/* invert the column if no highlightColor is set or it is the
		2342	* current cursor column */
		2343	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2344	&& ISSET_PIXCOLOR (Color_HC))
		2345	{
		2346	if (ISSET_PIXCOLOR (Color_HTC))
		2347	fore = Color_HTC;
		2348	// if invert is 0 reverse video is set so we use bg color as fg color
		2349	else if (!invert)
		2350	fore = back;
		2351
		2352	back = Color_HC;
		2353	invert = 0;
		2354	}
		2355	}
		2356	#endif
		2357
2298	if (invert)	2358	if (invert)
2299	{	2359	{
2300	#ifdef OPTION_HC
2301	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2302	|| !ISSET_PIXCOLOR (Color_HC))
2303	#endif
2304	/* invert the column if no highlightColor is set or it is the
2305	* current cursor column */
2306	::swap (fore, back);	2360	::swap (fore, back);
2307	#ifdef OPTION_HC
2308	else if (ISSET_PIXCOLOR (Color_HC))
2309	back = Color_HC;
2310	#endif
2311		2361
2312	#ifndef NO_BOLD_UNDERLINE_REVERSE	2362	#ifndef NO_BOLD_UNDERLINE_REVERSE
2313	# ifndef OPTION_HC
2314	if (ISSET_PIXCOLOR (Color_RV))
2315	back = Color_RV;
2316	# endif
2317	if (fore == back)	2363	if (fore == back)
2318	{	2364	{
2319	fore = Color_bg;	2365	fore = Color_bg;
2320	back = Color_fg;	2366	back = Color_fg;
2321	}	2367	}
…		…
2357	/*	2403	/*
2358	* Actually do the drawing of the string here	2404	* Actually do the drawing of the string here
2359	*/	2405	*/
2360	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2406	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2361		2407
2362	if (expect_true (have_bg && back == Color_bg))	2408	if (ecb_likely (have_bg && back == Color_bg))
2363	{	2409	{
2364	// this is very ugly, maybe push it into ->draw?	2410	// this is very ugly, maybe push it into ->draw?
2365		2411
2366	for (i = 0; i < count; i++) /* don't draw empty strings */	2412	for (i = 0; i < count; i++) /* don't draw empty strings */
2367	if (text[i] != ' ')	2413	if (text[i] != ' ')
…		…
2374	did_clear: ;	2420	did_clear: ;
2375	}	2421	}
2376	else	2422	else
2377	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2423	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2378		2424
2379	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2425	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2380	{	2426	{
2381	#if ENABLE_FRILLS	2427	#if ENABLE_FRILLS
2382	if (ISSET_PIXCOLOR (Color_underline))	2428	if (ISSET_PIXCOLOR (Color_underline))
2383	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2429	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2384	else	2430	else
…		…
2389	xpixel, ypixel + font->ascent + 1,	2435	xpixel, ypixel + font->ascent + 1,
2390	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2436	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2391	}	2437	}
2392	} /* for (col....) */	2438	} /* for (col....) */
2393	} /* for (row....) */	2439	} /* for (row....) */
2394
2395	#if ENABLE_OVERLAY
2396	scr_swap_overlay ();
2397	#endif
2398	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2399		2440
2400	/*	2441	/*
2401	* G: cleanup cursor and display outline cursor if necessary	2442	* G: cleanup cursor and display outline cursor if necessary
2402	*/	2443	*/
2403	if (showcursor)	2444	if (showcursor)
…		…
2442	}	2483	}
2443		2484
2444	/*	2485	/*
2445	* H: cleanup selection	2486	* H: cleanup selection
2446	*/	2487	*/
		2488	#if ENABLE_OVERLAY
		2489	scr_swap_overlay ();
		2490	#endif
		2491	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2492
2447	scr_reverse_selection ();	2493	scr_reverse_selection ();
2448		2494
		2495	screen.flags = old_screen_flags;
2449	num_scr = 0;	2496	num_scr = 0;
2450	num_scr_allow = 1;	2497	num_scr_allow = 1;
2451	}	2498	}
2452		2499
2453	void	2500	void
…		…
2474	scr_remap_chars (swap_buf [i]);	2521	scr_remap_chars (swap_buf [i]);
2475	}	2522	}
2476	}	2523	}
2477		2524
2478	void	2525	void
2479	rxvt_term::scr_recolour () NOTHROW	2526	rxvt_term::scr_recolour (bool refresh) NOTHROW
2480	{	2527	{
		2528	bool transparent = false;
		2529
2481	#ifdef HAVE_BG_PIXMAP	2530	#ifdef HAVE_BG_PIXMAP
2482	bgPixmap.apply ();	2531	if (bg_pixmap != None)
2483	#else	2532	{
		2533	# ifdef ENABLE_TRANSPARENCY
		2534	if (bg_flags & BG_IS_TRANSPARENT)
		2535	{
		2536	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2537	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2484		2538
		2539	transparent = true;
		2540	}
		2541	else
		2542	# endif
		2543	{
		2544	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2545	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2546	}
		2547	}
		2548	else
		2549	#endif
		2550	{
2485	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2551	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2486	XClearWindow (dpy, parent[0]);
2487	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2552	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2553	}
		2554
		2555	XClearWindow (dpy, parent);
2488		2556
2489	if (scrollBar.win)	2557	if (scrollBar.win)
2490	{	2558	{
		2559	if (transparent)
		2560	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2561	else
2491	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2562	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2492	scrollBar.state = STATE_IDLE;	2563	scrollBar.state = SB_STATE_IDLE;
2493	scrollBar.show (0);	2564	scrollBar.show (0);
2494	}	2565	}
2495		2566
2496	#endif	2567	if (refresh)
2497		2568	{
2498	/* bgPixmap.apply () does not do the following : */
2499	scr_clear ();	2569	scr_clear ();
2500	scr_touch (true);	2570	scr_touch (true);
		2571	}
2501	want_refresh = 1;	2572	want_refresh = 1;
2502	}	2573	}
2503		2574
2504	/* ------------------------------------------------------------------------- */	2575	/* ------------------------------------------------------------------------- */
2505	void	2576	void
…		…
2573	{	2644	{
2574	#if !ENABLE_MINIMAL	2645	#if !ENABLE_MINIMAL
2575	if (selection.rect)	2646	if (selection.rect)
2576	scr_xor_rect (selection.beg.row, selection.beg.col,	2647	scr_xor_rect (selection.beg.row, selection.beg.col,
2577	selection.end.row, selection.end.col,	2648	selection.end.row, selection.end.col,
2578	RS_RVid, RS_RVid | RS_Uline);	2649	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2579	else	2650	else
2580	#endif	2651	#endif
2581	scr_xor_span (selection.beg.row, selection.beg.col,	2652	scr_xor_span (selection.beg.row, selection.beg.col,
2582	selection.end.row, selection.end.col,	2653	selection.end.row, selection.end.col,
2583	RS_RVid);	2654	RS_Sel | RS_RVid);
2584	}	2655	}
2585	}	2656	}
2586		2657
2587	/* ------------------------------------------------------------------------- */	2658	/* ------------------------------------------------------------------------- */
2588	/*	2659	/*
…		…
2593	void	2664	void
2594	rxvt_term::scr_dump (int fd) NOTHROW	2665	rxvt_term::scr_dump (int fd) NOTHROW
2595	{	2666	{
2596	int row, wrote;	2667	int row, wrote;
2597	unsigned int width, towrite;	2668	unsigned int width, towrite;
2598	char r1[] = "\n";	2669	const char r1[] = "\n";
2599		2670
2600	for (row = saveLines + top_row;	2671	for (row = saveLines + top_row;
2601	row < saveLines + nrow - 1; row++)	2672	row < saveLines + nrow - 1; row++)
2602	{	2673	{
2603	width = row_buf[row].l >= 0 ? row_buf[row].l	2674	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2620	* CHARACTER SELECTION *	2691	* CHARACTER SELECTION *
2621	* ------------------------------------------------------------------------- */	2692	* ------------------------------------------------------------------------- */
2622	void	2693	void
2623	rxvt_term::selection_check (int check_more) NOTHROW	2694	rxvt_term::selection_check (int check_more) NOTHROW
2624	{	2695	{
2625	row_col_t pos;
2626
2627	if (!selection.op)	2696	if (!selection.op)
2628	return;	2697	return;
2629		2698
		2699	row_col_t pos;
2630	pos.row = pos.col = 0;	2700	pos.row = pos.col = 0;
		2701
2631	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2702	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2632	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2703	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2633	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2704	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2634	|| (check_more == 1	2705	|| (check_more == 1
2635	&& current_screen == selection.screen	2706	&& current_screen == selection.screen
…		…
2637	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2708	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638	|| (check_more == 2	2709	|| (check_more == 2
2639	&& ROWCOL_IS_BEFORE (selection.beg, pos)	2710	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2640	&& ROWCOL_IS_AFTER (selection.end, pos))	2711	&& ROWCOL_IS_AFTER (selection.end, pos))
2641	|| (check_more == 3	2712	|| (check_more == 3
2642	&& ROWCOL_IS_AFTER (selection.end, pos))	2713	&& ROWCOL_IS_AFTER (selection.end, pos)))
2643	|| (check_more == 4 /* screen width change */
2644	&& (selection.beg.row != selection.end.row
2645	|| selection.end.col > ncol)))
2646	CLEAR_SELECTION ();	2714	CLEAR_ALL_SELECTION ();
2647	}	2715	}
2648		2716
2649	/* ------------------------------------------------------------------------- */	2717	/* ------------------------------------------------------------------------- */
2650	/*	2718	/*
2651	* Paste a selection direct to the command fd	2719	* Paste a selection direct to the command fd
2652	*/	2720	*/
2653	void	2721	void
2654	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2722	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2655	{	2723	{
2656	/* convert normal newline chars into common keyboard Return key sequence */	2724	/* convert normal newline chars into common keyboard Return key sequence */
2657	for (unsigned int i = 0; i < len; i++)	2725	for (unsigned int i = 0; i < len; i++)
2658	if (data[i] == C0_LF)	2726	if (data[i] == C0_LF)
2659	data[i] = C0_CR;	2727	data[i] = C0_CR;
…		…
2665		2733
2666	if (priv_modes & PrivMode_BracketPaste)	2734	if (priv_modes & PrivMode_BracketPaste)
2667	tt_printf ("\e[201~");	2735	tt_printf ("\e[201~");
2668	}	2736	}
2669		2737
2670	/* ------------------------------------------------------------------------- */
2671	/*
2672	* Respond to a notification that a primary selection has been sent
2673	* EXT: SelectionNotify
2674	*/
2675	void	2738	void
2676	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2739	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2677	{	2740	{
2678	if (prop == None) /* check for failed XConvertSelection */	2741	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2679	{
2680	if ((selection_type & Sel_CompoundText))
2681	{
2682	int selnum = selection_type & Sel_whereMask;
2683
2684	selection_type = 0;
2685	if (selnum != Sel_direct)
2686	selection_request_other (XA_STRING, selnum);
2687	}
2688
2689	if ((selection_type & Sel_UTF8String))
2690	{
2691	int selnum = selection_type & Sel_whereMask;
2692
2693	selection_type = Sel_CompoundText;
2694	if (selnum != Sel_direct)
2695	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2696	else
2697	selection_type = 0;
2698	}
2699
2700	return;
2701	}
2702
2703	unsigned long bytes_after;
2704	XTextProperty ct;
2705
2706	if (XGetWindowProperty (dpy, win, prop,
2707	0, PROP_SIZE / 4,
2708	delete_prop, AnyPropertyType,
2709	&ct.encoding, &ct.format,
2710	&ct.nitems, &bytes_after,
2711	&ct.value) != Success)
2712	{
2713	ct.value = 0;
2714	goto bailout;
2715	}
2716
2717	if (ct.encoding == None)
2718	goto bailout;
2719
2720	if (bytes_after)
2721	{
2722	// fetch and append remaining data
2723	XTextProperty ct2;
2724
2725	if (XGetWindowProperty (dpy, win, prop,
2726	ct.nitems / 4, (bytes_after + 3) / 4,
2727	delete_prop, AnyPropertyType,
2728	&ct2.encoding, &ct2.format,
2729	&ct2.nitems, &bytes_after,
2730	&ct2.value) != Success)
2731	goto bailout;
2732
2733	// realloc should be compatible to XFree, here, and elsewhere, too
2734	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2735	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2736	ct.nitems += ct2.nitems;
2737
2738	XFree (ct2.value);
2739	}
2740
2741	if (ct.value == 0)
2742	goto bailout;
2743
2744	if (ct.encoding == xa[XA_INCR])
2745	{
2746	// INCR selection, start handshake
2747	if (!delete_prop)
2748	XDeleteProperty (dpy, win, prop);
2749
2750	selection_wait = Sel_incr;
2751	incr_buf_fill = 0;
2752	incr_ev.start (10);
2753
2754	goto bailout;
2755	}
2756
2757	if (ct.nitems == 0)
2758	{
2759	if (selection_wait == Sel_incr)
2760	{
2761	XFree (ct.value);
2762
2763	// finally complete, now paste the whole thing
2764	selection_wait = Sel_normal;
2765	ct.value = (unsigned char *)incr_buf;
2766	ct.nitems = incr_buf_fill;
2767	incr_buf = 0;
2768	incr_buf_size = 0;
2769	incr_ev.stop ();
2770	}
2771	else
2772	{
2773	if (selection_wait == Sel_normal
2774	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775	{
2776	/*
2777	* pass through again trying CUT_BUFFER0 if we've come from
2778	* XConvertSelection () but nothing was presented
2779	*/
2780	selection_paste (display->root, XA_CUT_BUFFER0, False);
2781	}
2782
2783	goto bailout;
2784	}
2785	}
2786	else if (selection_wait == Sel_incr)
2787	{
2788	incr_ev.start (10);
2789
2790	while (incr_buf_fill + ct.nitems > incr_buf_size)
2791	{
2792	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2794	}
2795
2796	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2797	incr_buf_fill += ct.nitems;
2798
2799	goto bailout;
2800	}
2801
2802	char **cl;
2803	int cr;
2804
2805	#if !ENABLE_MINIMAL
2806	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2807	// so recode it manually
2808	if (ct.encoding == xa[XA_UTF8_STRING])
2809	{
2810	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2811	char *s = rxvt_wcstombs (w);
2812	free (w);
2813	// TODO: strlen == only the first element will be converted. well...
2814	paste (s, strlen (s));
2815	free (s);
2816	}
2817	else
2818	#endif
2819	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2820	&& cl)
2821	{
2822	for (int i = 0; i < cr; i++)
2823	paste (cl[i], strlen (cl[i]));
2824
2825	XFreeStringList (cl);
2826	}
2827	else
2828	paste ((char *)ct.value, ct.nitems); // paste raw
2829
2830	bailout:
2831	XFree (ct.value);
2832
2833	if (selection_wait == Sel_normal)
2834	selection_wait = Sel_none;
2835	}
2836
2837	void
2838	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839	{
2840	selection_wait = Sel_none;
2841
2842	incr_buf_size = 0;
2843	free (incr_buf);
2844
2845	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2846	}
2847
2848	void
2849	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2850	{
2851	if (prop == None || selection_wait != Sel_incr)
2852	return;	2742	return;
2853		2743
2854	selection_paste (win, prop, true);	2744	tt_paste (data, len);
2855	}	2745	}
2856		2746
2857	/* ------------------------------------------------------------------------- */	2747	/* ------------------------------------------------------------------------- */
2858	/*	2748	/*
2859	* Request the current selection:	2749	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2860	* Order: > internal selection if available	2750	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2861	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2751	* as fallback
2862	* > CUT_BUFFER0
2863	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864	* will auto fallback to CUT_BUFFER0
2865	* EXT: button 2 release	2752	* EXT: button 2 release
2866	*/	2753	*/
2867	void	2754	void
2868	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2755	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869	{	2756	{
2870	if (selection.text && selnum == Sel_Primary)	2757	if (!selection_req)
2871	{
2872	/* internal selection */
2873	char *str = rxvt_wcstombs (selection.text, selection.len);
2874	paste (str, strlen (str));
2875	free (str);
2876	return;
2877	}	2758	{
2878	else	2759	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2760	selection_req->run ();
2879	{	2761	}
2880	selection_request_time = tm;
2881	selection_wait = Sel_normal;
2882
2883	#if X_HAVE_UTF8_STRING
2884	selection_type = Sel_UTF8String;
2885	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2886	return;
2887	#else
2888	selection_type = Sel_CompoundText;
2889	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2890	return;
2891	#endif
2892	}
2893
2894	selection_wait = Sel_none; /* don't loop in selection_paste () */
2895	selection_paste (display->root, XA_CUT_BUFFER0, false);
2896	}
2897
2898	int
2899	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2900	{
2901	Atom sel;
2902
2903	selection_type |= selnum;
2904
2905	if (selnum == Sel_Primary)
2906	sel = XA_PRIMARY;
2907	else if (selnum == Sel_Secondary)
2908	sel = XA_SECONDARY;
2909	else
2910	sel = xa[XA_CLIPBOARD];
2911
2912	if (XGetSelectionOwner (dpy, sel) != None)
2913	{
2914	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2915	vt, selection_request_time);
2916	return 1;
2917	}
2918
2919	return 0;
2920	}	2762	}
2921		2763
2922	/* ------------------------------------------------------------------------- */	2764	/* ------------------------------------------------------------------------- */
2923	/*	2765	/*
2924	* Clear all selected text	2766	* Clear all selected text
2925	* EXT: SelectionClear	2767	* EXT: SelectionClear
2926	*/	2768	*/
2927	void	2769	void
2928	rxvt_term::selection_clear () NOTHROW	2770	rxvt_term::selection_clear (bool clipboard) NOTHROW
2929	{	2771	{
		2772	if (!clipboard)
		2773	{
2930	want_refresh = 1;	2774	want_refresh = 1;
2931	free (selection.text);	2775	free (selection.text);
2932	selection.text = NULL;	2776	selection.text = NULL;
2933	selection.len = 0;	2777	selection.len = 0;
2934	CLEAR_SELECTION ();	2778	CLEAR_SELECTION ();
2935		2779
2936	if (display->selection_owner == this)	2780	if (display->selection_owner == this)
2937	display->selection_owner = 0;	2781	display->selection_owner = 0;
		2782	}
		2783	else
		2784	{
		2785	free (selection.clip_text);
		2786	selection.clip_text = NULL;
		2787	selection.clip_len = 0;
		2788
		2789	if (display->clipboard_owner == this)
		2790	display->clipboard_owner = 0;
		2791	}
2938	}	2792	}
2939		2793
2940	/* ------------------------------------------------------------------------- */	2794	/* ------------------------------------------------------------------------- */
2941	/*	2795	/*
2942	* Copy a selection into the cut buffer	2796	* Copy a selection into the cut buffer
2943	* EXT: button 1 or 3 release	2797	* EXT: button 1 or 3 release
2944	*/	2798	*/
2945	void	2799	void
2946	rxvt_term::selection_make (Time tm)	2800	rxvt_term::selection_make (Time tm)
2947	{	2801	{
2948	int i;	2802	int size;
2949	wchar_t *new_selection_text;	2803	wchar_t *new_selection_text;
2950	text_t *t;	2804	text_t *t;
2951		2805
2952	switch (selection.op)	2806	switch (selection.op)
2953	{	2807	{
…		…
2969	return; /* nothing selected, go away */	2823	return; /* nothing selected, go away */
2970		2824
2971	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2825	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2972	return;	2826	return;
2973		2827
2974	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2828	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2975	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2829	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2976		2830
2977	int ofs = 0;	2831	int ofs = 0;
2978	int extra = 0;	2832	int extra = 0;
2979		2833
2980	int col = selection.beg.col;	2834	int col = selection.beg.col;
…		…
2986	{	2840	{
2987	#if !ENABLE_MINIMAL	2841	#if !ENABLE_MINIMAL
2988	if (selection.rect)	2842	if (selection.rect)
2989	{	2843	{
2990	col = selection.beg.col;	2844	col = selection.beg.col;
2991	end_col = ncol + 1;	2845	end_col = selection.end.col;
2992	}	2846	}
2993	else	2847	else
2994	#endif	2848	#endif
2995	end_col = ROW(row).l;	2849	end_col = ROW(row).l;
2996		2850
2997	col = max (col, 0);	2851	col = max (col, 0);
2998		2852
2999	if (row == selection.end.row	2853	if (row == selection.end.row)
3000	#if !ENABLE_MINIMAL
3001	|| selection.rect
3002	#endif
3003	)
3004	min_it (end_col, selection.end.col);	2854	min_it (end_col, selection.end.col);
3005		2855
3006	t = ROW(row).t + col;	2856	t = ROW(row).t + col;
3007		2857
3008	for (; col < end_col; col++)	2858	for (; col < end_col; col++)
…		…
3016		2866
3017	extra -= (len - 1);	2867	extra -= (len - 1);
3018		2868
3019	if (extra < 0)	2869	if (extra < 0)
3020	{	2870	{
3021	extra += i;	2871	extra += size;
3022	i += i;	2872	size += size;
3023	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2873	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3024	}	2874	}
3025		2875
3026	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2876	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3027	}	2877	}
3028	#endif	2878	#endif
…		…
3040		2890
3041	new_selection_text[ofs++] = C0_LF;	2891	new_selection_text[ofs++] = C0_LF;
3042	}	2892	}
3043	else	2893	else
3044	#endif	2894	#endif
3045	if (!ROW(row).is_longer () && row != selection.end.row)	2895	if (!ROW(row).is_longer ()
		2896	&& (row != selection.end.row || end_col != selection.end.col)
		2897	&& (row != selection.beg.row || selection.beg.col < ncol))
3046	new_selection_text[ofs++] = C0_LF;	2898	new_selection_text[ofs++] = C0_LF;
3047	}	2899	}
3048
3049	if (end_col != selection.end.col)
3050	new_selection_text[ofs++] = C0_LF;
3051		2900
3052	new_selection_text[ofs] = 0;	2901	new_selection_text[ofs] = 0;
3053		2902
3054	if (ofs == 0)	2903	if (ofs == 0)
3055	{	2904	{
…		…
3068		2917
3069	selection_grab (tm);	2918	selection_grab (tm);
3070	}	2919	}
3071		2920
3072	bool	2921	bool
3073	rxvt_term::selection_grab (Time tm) NOTHROW	2922	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3074	{	2923	{
		2924	Atom sel;
		2925
		2926	if (!clipboard)
		2927	{
3075	selection_time = tm;	2928	selection_time = tm;
		2929	sel = XA_PRIMARY;
		2930	}
		2931	else
		2932	{
		2933	clipboard_time = tm;
		2934	sel = xa[XA_CLIPBOARD];
		2935	}
3076		2936
3077	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2937	XSetSelectionOwner (dpy, sel, vt, tm);
3078	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2938	if (XGetSelectionOwner (dpy, sel) == vt)
3079	{	2939	{
3080	display->set_selection_owner (this);	2940	display->set_selection_owner (this, clipboard);
3081	return true;	2941	return true;
3082	}	2942	}
3083	else	2943	else
3084	{	2944	{
3085	selection_clear ();	2945	selection_clear (clipboard);
3086	return false;	2946	return false;
3087	}	2947	}
3088		2948
3089	#if 0	2949	#if 0
3090	XTextProperty ct;	2950	XTextProperty ct;
…		…
3550	* EXT: SelectionRequest	3410	* EXT: SelectionRequest
3551	*/	3411	*/
3552	void	3412	void
3553	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3413	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3554	{	3414	{
		3415	Atom property = rq.property == None ? rq.target : rq.property;
3555	XSelectionEvent ev;	3416	XSelectionEvent ev;
3556		3417
3557	ev.type = SelectionNotify;	3418	ev.type = SelectionNotify;
3558	ev.property = None;	3419	ev.property = None;
3559	ev.display = rq.display;	3420	ev.display = rq.display;
…		…
3574	*target++ = xa[XA_COMPOUND_TEXT];	3435	*target++ = xa[XA_COMPOUND_TEXT];
3575	#if X_HAVE_UTF8_STRING	3436	#if X_HAVE_UTF8_STRING
3576	*target++ = xa[XA_UTF8_STRING];	3437	*target++ = xa[XA_UTF8_STRING];
3577	#endif	3438	#endif
3578		3439
3579	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3440	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3580	32, PropModeReplace,	3441	32, PropModeReplace,
3581	(unsigned char *)target_list, target - target_list);	3442	(unsigned char *)target_list, target - target_list);
3582	ev.property = rq.property;	3443	ev.property = property;
3583	}	3444	}
3584	#if TODO // TODO	3445	#if TODO // TODO
3585	else if (rq.target == xa[XA_MULTIPLE])	3446	else if (rq.target == xa[XA_MULTIPLE])
3586	{	3447	{
3587	/* TODO: Handle MULTIPLE */	3448	/* TODO: Handle MULTIPLE */
3588	}	3449	}
3589	#endif	3450	#endif
3590	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3451	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3591	{	3452	{
3592	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3453	XChangeProperty (dpy, rq.requestor, property, rq.target,
3593	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3454	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3594	ev.property = rq.property;	3455	ev.property = property;
		3456	}
		3457	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3458	{
		3459	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3460	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3461	ev.property = property;
3595	}	3462	}
3596	else if (rq.target == XA_STRING	3463	else if (rq.target == XA_STRING
3597	|| rq.target == xa[XA_TEXT]	3464	|| rq.target == xa[XA_TEXT]
3598	|| rq.target == xa[XA_COMPOUND_TEXT]	3465	|| rq.target == xa[XA_COMPOUND_TEXT]
3599	|| rq.target == xa[XA_UTF8_STRING]	3466	|| rq.target == xa[XA_UTF8_STRING]
…		…
3631	{	3498	{
3632	target = xa[XA_COMPOUND_TEXT];	3499	target = xa[XA_COMPOUND_TEXT];
3633	style = enc_compound_text;	3500	style = enc_compound_text;
3634	}	3501	}
3635		3502
3636	if (selection.text)	3503	if (rq.selection == XA_PRIMARY && selection.text)
3637	{	3504	{
3638	cl = selection.text;	3505	cl = selection.text;
3639	selectlen = selection.len;	3506	selectlen = selection.len;
		3507	}
		3508	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3509	{
		3510	cl = selection.clip_text;
		3511	selectlen = selection.clip_len;
3640	}	3512	}
3641	else	3513	else
3642	{	3514	{
3643	cl = L"";	3515	cl = L"";
3644	selectlen = 0;	3516	selectlen = 0;
…		…
3665	ct.value = (unsigned char *)cl;	3537	ct.value = (unsigned char *)cl;
3666	ct.nitems = selectlen;	3538	ct.nitems = selectlen;
3667	ct.encoding = target;	3539	ct.encoding = target;
3668	}	3540	}
3669		3541
3670	XChangeProperty (dpy, rq.requestor, rq.property,	3542	XChangeProperty (dpy, rq.requestor, property,
3671	ct.encoding, 8, PropModeReplace,	3543	ct.encoding, 8, PropModeReplace,
3672	ct.value, (int)ct.nitems);	3544	ct.value, (int)ct.nitems);
3673	ev.property = rq.property;	3545	ev.property = property;
3674		3546
3675	if (freect)	3547	if (freect)
3676	XFree (ct.value);	3548	XFree (ct.value);
3677	}	3549	}
3678		3550
…		…
3712	h += 2; min_it (h, nrow);	3584	h += 2; min_it (h, nrow);
3713		3585
3714	x -= 1; clamp_it (x, 0, ncol - w);	3586	x -= 1; clamp_it (x, 0, ncol - w);
3715	y -= 1; clamp_it (y, 0, nrow - h);	3587	y -= 1; clamp_it (y, 0, nrow - h);
3716		3588
3717	ov_x = x; ov_y = y;	3589	ov.x = x; ov.y = y;
3718	ov_w = w; ov_h = h;	3590	ov.w = w; ov.h = h;
3719		3591
3720	ov_text = new text_t *[h];	3592	ov.text = new text_t *[h];
3721	ov_rend = new rend_t *[h];	3593	ov.rend = new rend_t *[h];
3722		3594
3723	for (y = 0; y < h; y++)	3595	for (y = 0; y < h; y++)
3724	{	3596	{
3725	text_t *tp = ov_text[y] = new text_t[w];	3597	text_t *tp = ov.text[y] = new text_t[w];
3726	rend_t *rp = ov_rend[y] = new rend_t[w];	3598	rend_t *rp = ov.rend[y] = new rend_t[w];
3727		3599
3728	text_t t0, t1, t2;	3600	text_t t0, t1, t2;
3729	rend_t r = OVERLAY_RSTYLE;	3601	rend_t r = OVERLAY_RSTYLE;
3730		3602
3731	if (y == 0)	3603	if (y == 0)
…		…
3750	}	3622	}
3751		3623
3752	void	3624	void
3753	rxvt_term::scr_overlay_off () NOTHROW	3625	rxvt_term::scr_overlay_off () NOTHROW
3754	{	3626	{
3755	if (!ov_text)	3627	if (!ov.text)
3756	return;	3628	return;
3757		3629
3758	want_refresh = 1;	3630	want_refresh = 1;
3759		3631
3760	for (int y = 0; y < ov_h; y++)	3632	for (int y = 0; y < ov.h; y++)
3761	{	3633	{
3762	delete [] ov_text[y];	3634	delete [] ov.text[y];
3763	delete [] ov_rend[y];	3635	delete [] ov.rend[y];
3764	}	3636	}
3765		3637
3766	delete [] ov_text; ov_text = 0;	3638	delete [] ov.text; ov.text = 0;
3767	delete [] ov_rend; ov_rend = 0;	3639	delete [] ov.rend; ov.rend = 0;
3768	}	3640	}
3769		3641
3770	void	3642	void
3771	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3643	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3772	{	3644	{
3773	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3645	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3774	return;	3646	return;
3775		3647
3776	x++, y++;	3648	x++, y++;
3777		3649
3778	ov_text[y][x] = text;	3650	ov.text[y][x] = text;
3779	ov_rend[y][x] = rend;	3651	ov.rend[y][x] = rend;
3780	}	3652	}
3781		3653
3782	void	3654	void
3783	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3655	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3784	{	3656	{
…		…
3803	}	3675	}
3804		3676
3805	void	3677	void
3806	rxvt_term::scr_swap_overlay () NOTHROW	3678	rxvt_term::scr_swap_overlay () NOTHROW
3807	{	3679	{
3808	if (!ov_text)	3680	if (!ov.text)
3809	return;	3681	return;
3810		3682
		3683	// hide cursor if it is within the overlay area
		3684	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3685	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3686	screen.flags &= ~Screen_VisibleCursor;
		3687
3811	// swap screen mem with overlay	3688	// swap screen mem with overlay
3812	for (int y = ov_h; y--; )	3689	for (int y = ov.h; y--; )
3813	{	3690	{
3814	text_t *t1 = ov_text[y];	3691	text_t *t1 = ov.text[y];
3815	rend_t *r1 = ov_rend[y];	3692	rend_t *r1 = ov.rend[y];
3816		3693
3817	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3694	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3818	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3695	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3819		3696
3820	for (int x = ov_w; x--; )	3697	for (int x = ov.w; x--; )
3821	{	3698	{
3822	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3699	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3823	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3700	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3824	}	3701	}
3825	}	3702	}

Diff Legend

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