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

Diff Legend

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