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.307 by root, Fri Jun 27 00:44:32 2008 UTC vs.
Revision 1.392 by root, Sun Jul 10 00:40:10 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;
636	l.f = 0;	680	l.f = 0;
637	}	681	}
638	else	682	else
639	scr_blank_screen_mem (l, rstyle);	683	scr_blank_screen_mem (l, rstyle);
640	}
641
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	}	684	}
653		685
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	{
…		…
702	}	734	}
703		735
704	// use a simple and robust scrolling algorithm, this	736	// use a simple and robust scrolling algorithm, this
705	// part of scr_scroll_text is not time-critical.	737	// part of scr_scroll_text is not time-critical.
706		738
		739	// sever line above scroll region
		740	if (row1)
		741	{
		742	line_t &l = ROW(row1 - 1);
		743	l.is_longer (0);
		744	l.touch ();
		745	}
		746
707	int rows = row2 - row1 + 1;	747	int rows = row2 - row1 + 1;
708		748
709	min_it (count, rows);	749	min_it (count, rows);
710		750
711	line_t *temp_buf = row_buf + total_rows;	751	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712		752
713	for (int row = 0; row < rows; row++)	753	for (int row = 0; row < rows; row++)
714	{	754	{
715	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	755	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716		756
…		…
718	scr_blank_screen_mem (temp_buf [row], rstyle);	758	scr_blank_screen_mem (temp_buf [row], rstyle);
719	}	759	}
720		760
721	for (int row = 0; row < rows; row++)	761	for (int row = 0; row < rows; row++)
722	ROW(row1 + row) = temp_buf [row];	762	ROW(row1 + row) = temp_buf [row];
		763
		764	// sever bottommost line
		765	{
		766	line_t &l = ROW(row2);
		767	l.is_longer (0);
		768	l.touch ();
		769	}
		770
723	}	771	}
724		772
725	return count;	773	return count;
726	}	774	}
727		775
…		…
756	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	804	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757	screen.cur.row -= minlines;	805	screen.cur.row -= minlines;
758	}	806	}
759	}	807	}
760		808
761	#ifdef DEBUG_STRICT
762	assert (screen.cur.col < ncol);	809	assert (screen.cur.col < ncol);
763	assert (screen.cur.row < nrow	810	assert (screen.cur.row < nrow
764	&& screen.cur.row >= top_row);	811	&& screen.cur.row >= top_row);
765	#endif
766	int row = screen.cur.row;	812	int row = screen.cur.row;
767		813
768	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	814	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769		815
770	line_t *line = &ROW(row);	816	line_t *line = &ROW(row);
771		817
772	while (str < strend)	818	while (str < strend)
773	{	819	{
774	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	820	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775		821
776	if (c < 0x20)	822	if (ecb_unlikely (c < 0x20))
777	if (c == C0_LF)	823	if (c == C0_LF)
778	{	824	{
779	max_it (line->l, screen.cur.col);	825	max_it (line->l, screen.cur.col);
780		826
781	screen.flags &= ~Screen_WrapNext;	827	screen.flags &= ~Screen_WrapNext;
…		…
800	{	846	{
801	scr_tab (1, true);	847	scr_tab (1, true);
802	continue;	848	continue;
803	}	849	}
804		850
		851	if (ecb_unlikely (
805	if (checksel /* see if we're writing within selection */	852	checksel /* see if we're writing within selection */
806	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	853	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	854	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		855	))
808	{	856	{
809	checksel = 0;	857	checksel = 0;
810	/*	858	/*
811	* If we wrote anywhere in the selected area, kill the selection	859	* If we wrote anywhere in the selected area, kill the selection
812	* XXX: should we kill the mark too? Possibly, but maybe that	860	* XXX: should we kill the mark too? Possibly, but maybe that
813	* should be a similar check.	861	* should be a similar check.
814	*/	862	*/
815	CLEAR_SELECTION ();	863	CLEAR_SELECTION ();
816	}	864	}
817		865
818	if (screen.flags & Screen_WrapNext)	866	if (ecb_unlikely (screen.flags & Screen_WrapNext))
819	{	867	{
820	scr_do_wrap ();	868	scr_do_wrap ();
821		869
822	line->l = ncol;	870	line->l = ncol;
823	line->is_longer (1);	871	line->is_longer (1);
…		…
825	row = screen.cur.row;	873	row = screen.cur.row;
826	line = &ROW(row); /* _must_ refresh */	874	line = &ROW(row); /* _must_ refresh */
827	}	875	}
828		876
829	// some utf-8 decoders "decode" surrogate characters: let's fix this.	877	// some utf-8 decoders "decode" surrogate characters: let's fix this.
830	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	878	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831	c = 0xfffd;	879	c = 0xfffd;
832		880
833	// rely on wcwidth to tell us the character width, do wcwidth before	881	// rely on wcwidth to tell us the character width, do wcwidth before
834	// further replacements, as wcwidth might return -1 for the line	882	// further replacements, as wcwidth might return -1 for the line
835	// drawing characters below as they might be invalid in the current	883	// drawing characters below as they might be invalid in the current
836	// locale.	884	// locale.
837	int width = WCWIDTH (c);	885	int width = WCWIDTH (c);
838		886
839	if (charsets [screen.charset] == '0') // DEC SPECIAL	887	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
840	{	888	{
841	// vt100 special graphics and line drawing	889	// vt100 special graphics and line drawing
842	// 5f-7e standard vt100	890	// 5f-7e standard vt100
843	// 40-5e rxvt extension for extra curses acs chars	891	// 40-5e rxvt extension for extra curses acs chars
844	static uint16_t vt100_0[62] = { // 41 .. 7e	892	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
857	c = vt100_0[c - 0x41];	905	c = vt100_0[c - 0x41];
858	width = 1; // vt100 line drawing characters are always single-width	906	width = 1; // vt100 line drawing characters are always single-width
859	}	907	}
860	}	908	}
861		909
862	if (screen.flags & Screen_Insert)	910	if (ecb_unlikely (screen.flags & Screen_Insert))
863	scr_insdel_chars (width, INSERT);	911	scr_insdel_chars (width, INSERT);
864		912
865	if (width != 0)	913	if (width != 0)
866	{	914	{
867	#if !UNICODE_3	915	#if !UNICODE_3
…		…
872	# else	920	# else
873	c = 0xfffd;	921	c = 0xfffd;
874	# endif	922	# endif
875	#endif	923	#endif
876		924
		925	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		926
		927	// if the character doesn't fit into the remaining columns...
		928	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		929	{
		930	if (screen.flags & Screen_Autowrap)
		931	{
		932	// ... artificially enlargen the previous one
		933	c = NOCHAR;
		934	// and try the same character next loop iteration
		935	--str;
		936	}
		937	else
		938	screen.cur.col = ncol - width;
		939	}
		940
877	// nuke the character at this position, if required	941	// nuke the character at this position, if required
		942	// due to wonderful coincidences everywhere else in this loop
		943	// we never have to check for overwriting a wide char itself,
		944	// only its tail.
878	if (line->t[screen.cur.col] == NOCHAR	945	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
879	|| (screen.cur.col < ncol - 1	946	scr_kill_char (*line, screen.cur.col);
880	&& line->t[screen.cur.col + 1] == NOCHAR))
881	{
882	int col = screen.cur.col;
883
884	// find begin
885	while (col > 0 && line->t[col] == NOCHAR)
886	col--;
887
888	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890	// found begin, nuke
891	do {
892	line->t[col] = ' ';
893	line->r[col] = rend;
894	col++;
895	} while (col < ncol && line->t[col] == NOCHAR);
896	}
897
898	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900	// if the character doesn't fit into the remaining columns...
901	if (screen.cur.col > ncol - width && ncol >= width)
902	{
903	// ...output spaces
904	c = ' ';
905	// and try the same character next loop iteration
906	--str;
907	}
908		947
909	line->touch ();	948	line->touch ();
910		949
911	do	950	do
912	{	951	{
913	line->t[screen.cur.col] = c;	952	line->t[screen.cur.col] = c;
914	line->r[screen.cur.col] = rend;	953	line->r[screen.cur.col] = rend;
915		954
916	if (screen.cur.col < ncol - 1)	955	if (ecb_likely (screen.cur.col < ncol - 1))
917	screen.cur.col++;	956	screen.cur.col++;
918	else	957	else
919	{	958	{
920	line->l = ncol;	959	line->l = ncol;
921	if (screen.flags & Screen_Autowrap)	960	if (screen.flags & Screen_Autowrap)
922	screen.flags |= Screen_WrapNext;	961	screen.flags |= Screen_WrapNext;
923	break;	962
		963	goto end_of_line;
924	}	964	}
925		965
926	c = NOCHAR;	966	c = NOCHAR;
927	}	967	}
928	while (--width > 0);	968	while (ecb_unlikely (--width > 0));
929		969
930	// pad with spaces when overwriting wide character with smaller one	970	// pad with spaces when overwriting wide character with smaller one
931	if (!width)	971	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
932	{	972	{
933	line->touch ();	973	line->t[c] = ' ';
		974	line->r[c] = rend;
		975	}
934		976
935	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	977	end_of_line:
		978	;
		979	}
		980	#if ENABLE_COMBINING
		981	else // width == 0
		982	{
		983	if (c != 0xfeff) // ignore BOM
		984	{
		985	// handle combining characters
		986	// we just tag the accent on the previous on-screen character.
		987	// this is arguably not correct, but also arguably not wrong.
		988	// we don't handle double-width characters nicely yet.
		989	line_t *linep;
		990	text_t *tp;
		991	rend_t *rp;
		992
		993	if (screen.cur.col > 0)
936	{	994	{
937	line->t[c] = ' ';
938	line->r[c] = rend;	995	linep = line;
		996	tp = line->t + screen.cur.col - 1;
		997	rp = line->r + screen.cur.col - 1;
939	}	998	}
		999	else if (screen.cur.row > 0
		1000	&& ROW(screen.cur.row - 1).is_longer ())
		1001	{
		1002	linep = &ROW(screen.cur.row - 1);
		1003	tp = line->t + ncol - 1;
		1004	rp = line->r + ncol - 1;
		1005	}
		1006	else
		1007	continue;
		1008
		1009	linep->touch ();
		1010
		1011	while (*tp == NOCHAR && tp > linep->t)
		1012	tp--, rp--;
		1013
		1014	// first try to find a precomposed character
		1015	unicode_t n = rxvt_compose (*tp, c);
		1016	if (n == NOCHAR)
		1017	n = rxvt_composite.compose (*tp, c);
		1018
		1019	*tp = n;
		1020	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940	}	1021	}
941	}	1022	}
942	else // width == 0
943	{
944	#if ENABLE_COMBINING
945	// handle combining characters
946	// we just tag the accent on the previous on-screen character.
947	// this is arguably not correct, but also arguably not wrong.
948	// we don't handle double-width characters nicely yet.
949	line_t *linep;
950	text_t *tp;
951	rend_t *rp;
952
953	if (screen.cur.col > 0)
954	{
955	linep = line;
956	tp = line->t + screen.cur.col - 1;
957	rp = line->r + screen.cur.col - 1;
958	}
959	else if (screen.cur.row > 0
960	&& ROW(screen.cur.row - 1).is_longer ())
961	{
962	linep = &ROW(screen.cur.row - 1);
963	tp = line->t + ncol - 1;
964	rp = line->r + ncol - 1;
965	}
966	else
967	continue;
968
969	linep->touch ();
970
971	while (*tp == NOCHAR && tp > linep->t)
972	tp--, rp--;
973
974	// first try to find a precomposed character
975	unicode_t n = rxvt_compose (*tp, c);
976	if (n == NOCHAR)
977	n = rxvt_composite.compose (*tp, c);
978
979	*tp = n;
980	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981	#endif	1023	#endif
982	}
983	}	1024	}
984		1025
985	max_it (line->l, screen.cur.col);	1026	max_it (line->l, screen.cur.col);
986		1027
987	#ifdef DEBUG_STRICT
988	assert (screen.cur.row >= 0);	1028	assert (screen.cur.row >= 0);
989	#endif
990	}	1029	}
991		1030
992	/* ------------------------------------------------------------------------- */	1031	/* ------------------------------------------------------------------------- */
993	/*	1032	/*
994	* Process Backspace. Move back the cursor back a position, wrap if have to	1033	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1007		1046
1008	want_refresh = 1;	1047	want_refresh = 1;
1009	#endif	1048	#endif
1010	}	1049	}
1011	}	1050	}
		1051	else if (screen.flags & Screen_WrapNext)
		1052	screen.flags &= ~Screen_WrapNext;
1012	else	1053	else
1013	scr_gotorc (0, -1, RELATIVE);	1054	scr_gotorc (0, -1, RELATIVE);
1014	}	1055	}
1015		1056
1016	/* ------------------------------------------------------------------------- */	1057	/* ------------------------------------------------------------------------- */
…		…
1322	if (row >= nrow) /* Out Of Bounds */	1363	if (row >= nrow) /* Out Of Bounds */
1323	return;	1364	return;
1324		1365
1325	min_it (num, nrow - row);	1366	min_it (num, nrow - row);
1326		1367
1327	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1328	if (rstyle & (RS_RVid | RS_Uline))	1368	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1329	ren = (rend_t) ~RS_None;	1369	ren = (rend_t) ~RS_None;
1330	else if (GET_BASEBG (rstyle) == Color_bg)	1370	else if (GET_BASEBG (rstyle) == Color_bg)
1331	{	1371	{
1332	ren = DEFAULT_RSTYLE;	1372	ren = DEFAULT_RSTYLE;
1333		1373
1334	if (mapped)	1374	if (mapped)
1335	XClearArea (dpy, vt, 0,	1375	XClearArea (dpy, vt, 0,
1336	Row2Pixel (row), (unsigned int)width,	1376	Row2Pixel (row - view_start), (unsigned int)width,
1337	(unsigned int)Height2Pixel (num), False);	1377	(unsigned int)Height2Pixel (num), False);
1338	}	1378	}
1339	else	1379	else
1340	{	1380	{
1341	ren = rstyle & (RS_fgMask | RS_bgMask);	1381	ren = rstyle & (RS_fgMask | RS_bgMask);
1342		1382
		1383	if (mapped)
		1384	{
1343	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1385	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1386	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345	XFillRectangle (dpy, vt, gc,	1387	XFillRectangle (dpy, vt, gc,
1346	0, Row2Pixel (row),	1388	0, Row2Pixel (row - view_start),
1347	(unsigned int)width,	1389	(unsigned int)width,
1348	(unsigned int)Height2Pixel (num));	1390	(unsigned int)Height2Pixel (num));
1349	gcvalue.foreground = pix_colors[Color_fg];	1391	gcvalue.foreground = pix_colors[Color_fg];
1350	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1392	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1393	}
1351	}	1394	}
1352		1395
1353	for (; num--; row++)	1396	for (; num--; row++)
1354	{	1397	{
1355	scr_blank_screen_mem (ROW(row), rstyle);	1398	scr_blank_screen_mem (ROW(row), rstyle);
		1399
		1400	if (row - view_start < nrow)
1356	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1401	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357	}	1402	}
1358	}	1403	}
1359		1404
1360	#if !ENABLE_MINIMAL	1405	#if !ENABLE_MINIMAL
1361	void	1406	void
…		…
1435	* Insert/Delete <count> characters from the current position	1480	* Insert/Delete <count> characters from the current position
1436	*/	1481	*/
1437	void	1482	void
1438	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1483	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439	{	1484	{
1440	int col, row;
1441	rend_t tr;
1442
1443	want_refresh = 1;	1485	want_refresh = 1;
1444	ZERO_SCROLLBACK ();	1486	ZERO_SCROLLBACK ();
1445		1487
1446	if (count <= 0)	1488	if (count <= 0)
1447	return;	1489	return;
…		…
1449	scr_do_wrap ();	1491	scr_do_wrap ();
1450		1492
1451	selection_check (1);	1493	selection_check (1);
1452	min_it (count, ncol - screen.cur.col);	1494	min_it (count, ncol - screen.cur.col);
1453		1495
1454	row = screen.cur.row;	1496	int row = screen.cur.row;
1455		1497
1456	line_t *line = &ROW(row);	1498	line_t *line = &ROW(row);
1457		1499
1458	line->touch ();	1500	line->touch ();
1459	line->is_longer (0);	1501	line->is_longer (0);
1460		1502
		1503	// nuke wide spanning the start
		1504	if (line->t[screen.cur.col] == NOCHAR)
		1505	scr_kill_char (*line, screen.cur.col);
		1506
1461	switch (insdel)	1507	switch (insdel)
1462	{	1508	{
1463	case INSERT:	1509	case INSERT:
1464	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1510	line->l = min (line->l + count, ncol);
		1511
		1512	if (line->t[screen.cur.col] == NOCHAR)
		1513	scr_kill_char (*line, screen.cur.col);
		1514
		1515	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465	{	1516	{
1466	line->t[col] = line->t[col - count];	1517	line->t[col] = line->t[col - count];
1467	line->r[col] = line->r[col - count];	1518	line->r[col] = line->r[col - count];
1468	}	1519	}
1469
1470	line->l = min (line->l + count, ncol);
1471		1520
1472	if (selection.op && current_screen == selection.screen	1521	if (selection.op && current_screen == selection.screen
1473	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1522	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474	{	1523	{
1475	if (selection.end.row != screen.cur.row	1524	if (selection.end.row != screen.cur.row
…		…
1490	case ERASE:	1539	case ERASE:
1491	screen.cur.col += count; /* don't worry if > ncol */	1540	screen.cur.col += count; /* don't worry if > ncol */
1492	selection_check (1);	1541	selection_check (1);
1493	screen.cur.col -= count;	1542	screen.cur.col -= count;
1494		1543
1495	line->l = max (line->l - count, 0);	1544	// nuke wide char after the end
		1545	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1546	scr_kill_char (*line, screen.cur.col + count);
		1547
1496	scr_blank_line (*line, screen.cur.col, count, rstyle);	1548	scr_blank_line (*line, screen.cur.col, count, rstyle);
1497	break;	1549	break;
1498		1550
1499	case DELETE:	1551	case DELETE:
1500	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1552	line->l = max (line->l - count, 0);
1501		1553
		1554	// nuke wide char spanning the end
		1555	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1556	scr_kill_char (*line, screen.cur.col + count);
		1557
1502	for (col = screen.cur.col; (col + count) < ncol; col++)	1558	for (int col = screen.cur.col; (col + count) < ncol; col++)
1503	{	1559	{
1504	line->t[col] = line->t[col + count];	1560	line->t[col] = line->t[col + count];
1505	line->r[col] = line->r[col + count];	1561	line->r[col] = line->r[col + count];
1506	}	1562	}
1507		1563
1508	line->l = max (line->l - count, 0);
1509	scr_blank_line (*line, ncol - count, count, tr);	1564	scr_blank_line (*line, ncol - count, count, rstyle);
1510		1565
1511	if (selection.op && current_screen == selection.screen	1566	if (selection.op && current_screen == selection.screen
1512	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1567	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513	{	1568	{
1514	if (selection.end.row != screen.cur.row	1569	if (selection.end.row != screen.cur.row
…		…
1650	{	1705	{
1651	rvideo_state = on;	1706	rvideo_state = on;
1652		1707
1653	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1708	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1654	#ifdef HAVE_BG_PIXMAP	1709	#ifdef HAVE_BG_PIXMAP
1655	if (bgPixmap.pixmap == None)	1710	if (bg_pixmap == None)
1656	#endif	1711	#endif
1657	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1712	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658		1713
1659	XGCValues gcvalue;	1714	XGCValues gcvalue;
1660	gcvalue.foreground = pix_colors[Color_fg];	1715	gcvalue.foreground = pix_colors[Color_fg];
…		…
1804	for (i = PART_BEG; i < RC_COUNT; i++)	1859	for (i = PART_BEG; i < RC_COUNT; i++)
1805	{	1860	{
1806	min_it (rc[i].col, ncol - 1);	1861	min_it (rc[i].col, ncol - 1);
1807	min_it (rc[i].row, nrow - 1);	1862	min_it (rc[i].row, nrow - 1);
1808	}	1863	}
1809	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1864
1810	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1865	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1811	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1866	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812		1867
1813	num_scr_allow = 0;	1868	num_scr_allow = 0;
1814		1869
…		…
1887		1942
1888	# ifndef NO_MAPALERT	1943	# ifndef NO_MAPALERT
1889	# ifdef MAPALERT_OPTION	1944	# ifdef MAPALERT_OPTION
1890	if (option (Opt_mapAlert))	1945	if (option (Opt_mapAlert))
1891	# endif	1946	# endif
1892	XMapWindow (dpy, parent[0]);	1947	XMapWindow (dpy, parent);
1893	# endif	1948	# endif
1894		1949
1895	# if ENABLE_FRILLS	1950	# if ENABLE_FRILLS
1896	if (option (Opt_urgentOnBell))	1951	if (option (Opt_urgentOnBell))
1897	{	1952	set_urgency (1);
1898	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899	{
1900	h->flags |= XUrgencyHint;
1901	XSetWMHints (dpy, parent[0], h);
1902	}
1903	}
1904	# endif	1953	# endif
1905		1954
1906	if (option (Opt_visualBell))	1955	if (option (Opt_visualBell))
1907	{	1956	{
1908	rvideo_bell = true;	1957	rvideo_bell = true;
…		…
1911		1960
1912	bell_ev.start (VISUAL_BELL_DURATION);	1961	bell_ev.start (VISUAL_BELL_DURATION);
1913	}	1962	}
1914	else	1963	else
1915	XBell (dpy, 0);	1964	XBell (dpy, 0);
		1965	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916	#endif	1966	#endif
1917	}	1967	}
1918		1968
1919	/* ------------------------------------------------------------------------- */	1969	/* ------------------------------------------------------------------------- */
1920	/* ARGSUSED */
1921	void	1970	void
1922	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1971	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923	{	1972	{
1924	#ifdef PRINTPIPE	1973	#ifdef PRINTPIPE
1925	int nrows, row_start;	1974	int nrows, row_start;
1926	FILE *fd;	1975	FILE *fd = popen_printer ();
1927		1976
1928	if ((fd = popen_printer ()) == NULL)	1977	if (!fd)
1929	return;	1978	return;
1930		1979
1931	if (fullhist)	1980	if (fullhist)
1932	{	1981	{
1933	nrows = nrow - top_row;	1982	nrows = nrow - top_row;
…		…
1939	row_start = view_start;	1988	row_start = view_start;
1940	}	1989	}
1941		1990
1942	wctomb (0, 0);	1991	wctomb (0, 0);
1943		1992
1944	for (int r1 = 0; r1 < nrows; r1++)	1993	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945	{	1994	{
1946	text_t *tp = ROW(r1).t;	1995	text_t *tp = ROW(r1).t;
1947	int len = ROW(r1).l;	1996	int len = ROW(r1).l;
1948		1997
1949	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1998	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1978	* screen.text/screen.rend contain what the screen will change to.	2027	* screen.text/screen.rend contain what the screen will change to.
1979	*/	2028	*/
1980	void	2029	void
1981	rxvt_term::scr_refresh () NOTHROW	2030	rxvt_term::scr_refresh () NOTHROW
1982	{	2031	{
1983	unsigned char have_bg,
1984	showcursor; /* show the cursor */
1985	int16_t col, row, /* column/row we're processing */	2032	int16_t col, row, /* column/row we're processing */
1986	ocrow; /* old cursor row */	2033	ocrow; /* old cursor row */
1987	int i; /* tmp */	2034	int i; /* tmp */
1988	#ifndef NO_CURSORCOLOR	2035	#ifndef NO_CURSORCOLOR
1989	rend_t cc1; /* store colours at cursor position (s) */	2036	rend_t cc1; /* store colours at cursor position (s) */
…		…
2000	/*	2047	/*
2001	* A: set up vars	2048	* A: set up vars
2002	*/	2049	*/
2003	refresh_count = 0;	2050	refresh_count = 0;
2004		2051
		2052	unsigned int old_screen_flags = screen.flags;
2005	have_bg = 0;	2053	char have_bg = 0;
2006	#ifdef HAVE_BG_PIXMAP	2054	#ifdef HAVE_BG_PIXMAP
2007	have_bg = bgPixmap.pixmap != None;	2055	have_bg = bg_pixmap != None;
2008	#endif	2056	#endif
2009	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2057	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010		2058
2011	/*	2059	/*
2012	* B: reverse any characters which are selected	2060	* B: reverse any characters which are selected
2013	*/	2061	*/
2014	scr_reverse_selection ();	2062	scr_reverse_selection ();
		2063
		2064	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2065	#if ENABLE_OVERLAY
		2066	scr_swap_overlay ();
		2067	#endif
		2068
		2069	char showcursor = screen.flags & Screen_VisibleCursor;
2015		2070
2016	/*	2071	/*
2017	* C: set the cursor character (s)	2072	* C: set the cursor character (s)
2018	*/	2073	*/
2019	{	2074	{
2020	unsigned char setoldcursor;	2075	unsigned char setoldcursor;
2021		2076
2022	showcursor = (screen.flags & Screen_VisibleCursor);
2023	#ifdef CURSOR_BLINK	2077	#ifdef CURSOR_BLINK
2024	if (hidden_cursor)	2078	if (hidden_cursor)
2025	showcursor = 0;	2079	showcursor = 0;
2026	#endif	2080	#endif
2027		2081
…		…
2055	ccol2 = bgcolor_of (rstyle);	2109	ccol2 = bgcolor_of (rstyle);
2056	#else	2110	#else
2057	ccol2 = Color_bg;	2111	ccol2 = Color_bg;
2058	#endif	2112	#endif
2059		2113
2060	if (showcursor && focus)	2114	if (focus)
2061	{	2115	{
2062	if (option (Opt_cursorUnderline))	2116	if (option (Opt_cursorUnderline))
2063	*crp ^= RS_Uline;	2117	*crp ^= RS_Uline;
2064	else	2118	else
2065	{	2119	{
…		…
2100	oldcursor.col = screen.cur.col;	2154	oldcursor.col = screen.cur.col;
2101	}	2155	}
2102	}	2156	}
2103	}	2157	}
2104		2158
2105	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106	#if ENABLE_OVERLAY
2107	scr_swap_overlay ();
2108	#endif
2109
2110	#ifndef NO_SLOW_LINK_SUPPORT	2159	#ifndef NO_SLOW_LINK_SUPPORT
2111	/*	2160	/*
2112	* D: CopyArea pass - very useful for slower links	2161	* D: CopyArea pass - very useful for slower links
2113	* This has been deliberately kept simple.	2162	* This has been deliberately kept simple.
2114	*/	2163	*/
…		…
2203	continue;	2252	continue;
2204		2253
2205	// redraw one or more characters	2254	// redraw one or more characters
2206		2255
2207	// seek to the beginning of wide characters	2256	// seek to the beginning of wide characters
2208	while (stp[col] == NOCHAR && col > 0)	2257	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209	--col;	2258	--col;
2210		2259
2211	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2260	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212	text_t *text = stp + col;	2261	text_t *text = stp + col;
2213	int count = 1;	2262	int count = 1;
2214		2263
2215	dtp[col] = stp[col];	2264	dtp[col] = stp[col];
2216	drp[col] = rend;	2265	drp[col] = rend;
…		…
2220	for (i = 0; ++col < ncol; )	2269	for (i = 0; ++col < ncol; )
2221	{	2270	{
2222	if (stp[col] == NOCHAR)	2271	if (stp[col] == NOCHAR)
2223	{	2272	{
2224	dtp[col] = stp[col];	2273	dtp[col] = stp[col];
2225	drp[col] = rend;	2274	drp[col] = srp[col];
		2275
2226	count++;	2276	count++;
2227	i++;	2277	i++;
2228		2278
2229	continue;	2279	continue;
2230	}	2280	}
…		…
2250		2300
2251	col--; /* went one too far. move back */	2301	col--; /* went one too far. move back */
2252	count -= i; /* dump any matching trailing chars */	2302	count -= i; /* dump any matching trailing chars */
2253		2303
2254	// sometimes we optimize away the trailing NOCHAR's, add them back	2304	// sometimes we optimize away the trailing NOCHAR's, add them back
2255	while (i && text[count] == NOCHAR)	2305	while (ecb_unlikely (i && text[count] == NOCHAR))
2256	count++, i--;	2306	count++, i--;
2257		2307
2258	/*	2308	/*
2259	* Determine the attributes for the string	2309	* Determine the attributes for the string
2260	*/	2310	*/
2261	int fore = fgcolor_of (rend); // desired foreground	2311	int fore = fgcolor_of (rend); // desired foreground
2262	int back = bgcolor_of (rend); // desired background	2312	int back = bgcolor_of (rend); // desired background
2263		2313
2264	// only do special processing if any attributes are set, which is unlikely	2314	// only do special processing if any attributes are set, which is unlikely
2265	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2315	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266	{	2316	{
2267	bool invert = rend & RS_RVid;	2317	bool invert = rend & RS_RVid;
2268		2318
2269	#ifndef NO_BOLD_UNDERLINE_REVERSE	2319	#ifndef NO_BOLD_UNDERLINE_REVERSE
2270	if (rend & RS_Bold && fore == Color_fg)	2320	if (rend & RS_Bold && fore == Color_fg)
…		…
2289		2339
2290	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2340	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291	fore = Color_UL;	2341	fore = Color_UL;
2292	#endif	2342	#endif
2293		2343
		2344	#ifdef OPTION_HC
		2345	if (rend & RS_Sel)
		2346	{
		2347	/* invert the column if no highlightColor is set or it is the
		2348	* current cursor column */
		2349	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2350	&& ISSET_PIXCOLOR (Color_HC))
		2351	{
		2352	if (ISSET_PIXCOLOR (Color_HTC))
		2353	fore = Color_HTC;
		2354	// if invert is 0 reverse video is set so we use bg color as fg color
		2355	else if (!invert)
		2356	fore = back;
		2357
		2358	back = Color_HC;
		2359	invert = 0;
		2360	}
		2361	}
		2362	#endif
		2363
2294	if (invert)	2364	if (invert)
2295	{	2365	{
2296	#ifdef OPTION_HC
2297	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298	|| !ISSET_PIXCOLOR (Color_HC))
2299	#endif
2300	/* invert the column if no highlightColor is set or it is the
2301	* current cursor column */
2302	::swap (fore, back);	2366	::swap (fore, back);
2303	#ifdef OPTION_HC
2304	else if (ISSET_PIXCOLOR (Color_HC))
2305	back = Color_HC;
2306	#endif
2307		2367
2308	#ifndef NO_BOLD_UNDERLINE_REVERSE	2368	#ifndef NO_BOLD_UNDERLINE_REVERSE
2309	# ifndef OPTION_HC
2310	if (ISSET_PIXCOLOR (Color_RV))
2311	back = Color_RV;
2312	# endif
2313	if (fore == back)	2369	if (fore == back)
2314	{	2370	{
2315	fore = Color_bg;	2371	fore = Color_bg;
2316	back = Color_fg;	2372	back = Color_fg;
2317	}	2373	}
…		…
2353	/*	2409	/*
2354	* Actually do the drawing of the string here	2410	* Actually do the drawing of the string here
2355	*/	2411	*/
2356	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2412	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357		2413
2358	if (have_bg && back == Color_bg)	2414	if (ecb_likely (have_bg && back == Color_bg))
2359	{	2415	{
2360	// this is very ugly, maybe push it into ->draw?	2416	// this is very ugly, maybe push it into ->draw?
2361		2417
2362	for (i = 0; i < count; i++) /* don't draw empty strings */	2418	for (i = 0; i < count; i++) /* don't draw empty strings */
2363	if (text[i] != ' ')	2419	if (text[i] != ' ')
…		…
2370	did_clear: ;	2426	did_clear: ;
2371	}	2427	}
2372	else	2428	else
2373	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2429	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374		2430
2375	if (rend & RS_Uline && font->descent > 1 && fore != back)	2431	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376	{	2432	{
2377	#if ENABLE_FRILLS	2433	#if ENABLE_FRILLS
2378	if (ISSET_PIXCOLOR (Color_underline))	2434	if (ISSET_PIXCOLOR (Color_underline))
2379	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2435	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380	else	2436	else
…		…
2385	xpixel, ypixel + font->ascent + 1,	2441	xpixel, ypixel + font->ascent + 1,
2386	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2442	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387	}	2443	}
2388	} /* for (col....) */	2444	} /* for (col....) */
2389	} /* for (row....) */	2445	} /* for (row....) */
2390
2391	#if ENABLE_OVERLAY
2392	scr_swap_overlay ();
2393	#endif
2394	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395		2446
2396	/*	2447	/*
2397	* G: cleanup cursor and display outline cursor if necessary	2448	* G: cleanup cursor and display outline cursor if necessary
2398	*/	2449	*/
2399	if (showcursor)	2450	if (showcursor)
…		…
2438	}	2489	}
2439		2490
2440	/*	2491	/*
2441	* H: cleanup selection	2492	* H: cleanup selection
2442	*/	2493	*/
		2494	#if ENABLE_OVERLAY
		2495	scr_swap_overlay ();
		2496	#endif
		2497	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2498
2443	scr_reverse_selection ();	2499	scr_reverse_selection ();
2444		2500
		2501	screen.flags = old_screen_flags;
2445	num_scr = 0;	2502	num_scr = 0;
2446	num_scr_allow = 1;	2503	num_scr_allow = 1;
2447	}	2504	}
2448		2505
2449	void	2506	void
…		…
2470	scr_remap_chars (swap_buf [i]);	2527	scr_remap_chars (swap_buf [i]);
2471	}	2528	}
2472	}	2529	}
2473		2530
2474	void	2531	void
2475	rxvt_term::scr_recolour () NOTHROW	2532	rxvt_term::scr_recolour (bool refresh) NOTHROW
2476	{	2533	{
		2534	bool transparent = false;
		2535
2477	#ifdef HAVE_BG_PIXMAP	2536	#ifdef HAVE_BG_PIXMAP
2478	bgPixmap.apply ();	2537	if (bg_pixmap != None)
2479	#else	2538	{
		2539	# ifdef ENABLE_TRANSPARENCY
		2540	if (bg_flags & BG_IS_TRANSPARENT)
		2541	{
		2542	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2543	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480		2544
		2545	transparent = true;
		2546	}
		2547	else
		2548	# endif
		2549	{
		2550	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2551	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2552	}
		2553	}
		2554	else
		2555	#endif
		2556	{
2481	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2557	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482	XClearWindow (dpy, parent[0]);
2483	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2558	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2559	}
		2560
		2561	XClearWindow (dpy, parent);
2484		2562
2485	if (scrollBar.win)	2563	if (scrollBar.win)
2486	{	2564	{
		2565	if (transparent)
		2566	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2567	else
2487	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2568	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488	scrollBar.state = STATE_IDLE;	2569	scrollBar.state = STATE_IDLE;
2489	scrollBar.show (0);	2570	scrollBar.show (0);
2490	}	2571	}
2491		2572
2492	#endif	2573	if (refresh)
2493		2574	{
2494	/* bgPixmap.apply () does not do the following : */
2495	scr_clear ();	2575	scr_clear ();
2496	scr_touch (true);	2576	scr_touch (true);
		2577	}
2497	want_refresh = 1;	2578	want_refresh = 1;
2498	}	2579	}
2499		2580
2500	/* ------------------------------------------------------------------------- */	2581	/* ------------------------------------------------------------------------- */
2501	void	2582	void
…		…
2569	{	2650	{
2570	#if !ENABLE_MINIMAL	2651	#if !ENABLE_MINIMAL
2571	if (selection.rect)	2652	if (selection.rect)
2572	scr_xor_rect (selection.beg.row, selection.beg.col,	2653	scr_xor_rect (selection.beg.row, selection.beg.col,
2573	selection.end.row, selection.end.col,	2654	selection.end.row, selection.end.col,
2574	RS_RVid, RS_RVid | RS_Uline);	2655	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575	else	2656	else
2576	#endif	2657	#endif
2577	scr_xor_span (selection.beg.row, selection.beg.col,	2658	scr_xor_span (selection.beg.row, selection.beg.col,
2578	selection.end.row, selection.end.col,	2659	selection.end.row, selection.end.col,
2579	RS_RVid);	2660	RS_Sel | RS_RVid);
2580	}	2661	}
2581	}	2662	}
2582		2663
2583	/* ------------------------------------------------------------------------- */	2664	/* ------------------------------------------------------------------------- */
2584	/*	2665	/*
…		…
2589	void	2670	void
2590	rxvt_term::scr_dump (int fd) NOTHROW	2671	rxvt_term::scr_dump (int fd) NOTHROW
2591	{	2672	{
2592	int row, wrote;	2673	int row, wrote;
2593	unsigned int width, towrite;	2674	unsigned int width, towrite;
2594	char r1[] = "\n";	2675	const char r1[] = "\n";
2595		2676
2596	for (row = saveLines + top_row;	2677	for (row = saveLines + top_row;
2597	row < saveLines + nrow - 1; row++)	2678	row < saveLines + nrow - 1; row++)
2598	{	2679	{
2599	width = row_buf[row].l >= 0 ? row_buf[row].l	2680	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2645	/* ------------------------------------------------------------------------- */	2726	/* ------------------------------------------------------------------------- */
2646	/*	2727	/*
2647	* Paste a selection direct to the command fd	2728	* Paste a selection direct to the command fd
2648	*/	2729	*/
2649	void	2730	void
2650	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2731	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651	{	2732	{
2652	/* convert normal newline chars into common keyboard Return key sequence */	2733	/* convert normal newline chars into common keyboard Return key sequence */
2653	for (unsigned int i = 0; i < len; i++)	2734	for (unsigned int i = 0; i < len; i++)
2654	if (data[i] == C0_LF)	2735	if (data[i] == C0_LF)
2655	data[i] = C0_CR;	2736	data[i] = C0_CR;
…		…
2661		2742
2662	if (priv_modes & PrivMode_BracketPaste)	2743	if (priv_modes & PrivMode_BracketPaste)
2663	tt_printf ("\e[201~");	2744	tt_printf ("\e[201~");
2664	}	2745	}
2665		2746
2666	/* ------------------------------------------------------------------------- */
2667	/*
2668	* Respond to a notification that a primary selection has been sent
2669	* EXT: SelectionNotify
2670	*/
2671	void	2747	void
2672	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2748	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673	{	2749	{
2674	if (prop == None) /* check for failed XConvertSelection */	2750	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675	{
2676	if ((selection_type & Sel_CompoundText))
2677	{
2678	int selnum = selection_type & Sel_whereMask;
2679
2680	selection_type = 0;
2681	if (selnum != Sel_direct)
2682	selection_request_other (XA_STRING, selnum);
2683	}
2684
2685	if ((selection_type & Sel_UTF8String))
2686	{
2687	int selnum = selection_type & Sel_whereMask;
2688
2689	selection_type = Sel_CompoundText;
2690	if (selnum != Sel_direct)
2691	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692	else
2693	selection_type = 0;
2694	}
2695
2696	return;
2697	}
2698
2699	unsigned long bytes_after;
2700	XTextProperty ct;
2701
2702	if (XGetWindowProperty (dpy, win, prop,
2703	0, PROP_SIZE / 4,
2704	delete_prop, AnyPropertyType,
2705	&ct.encoding, &ct.format,
2706	&ct.nitems, &bytes_after,
2707	&ct.value) != Success)
2708	{
2709	ct.value = 0;
2710	goto bailout;
2711	}
2712
2713	if (ct.encoding == None)
2714	goto bailout;
2715
2716	if (bytes_after)
2717	{
2718	// fetch and append remaining data
2719	XTextProperty ct2;
2720
2721	if (XGetWindowProperty (dpy, win, prop,
2722	ct.nitems / 4, (bytes_after + 3) / 4,
2723	delete_prop, AnyPropertyType,
2724	&ct2.encoding, &ct2.format,
2725	&ct2.nitems, &bytes_after,
2726	&ct2.value) != Success)
2727	goto bailout;
2728
2729	// realloc should be compatible to XFree, here, and elsewhere, too
2730	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732	ct.nitems += ct2.nitems;
2733
2734	XFree (ct2.value);
2735	}
2736
2737	if (ct.value == 0)
2738	goto bailout;
2739
2740	if (ct.encoding == xa[XA_INCR])
2741	{
2742	// INCR selection, start handshake
2743	if (!delete_prop)
2744	XDeleteProperty (dpy, win, prop);
2745
2746	selection_wait = Sel_incr;
2747	incr_buf_fill = 0;
2748	incr_ev.start (10);
2749
2750	goto bailout;
2751	}
2752
2753	if (ct.nitems == 0)
2754	{
2755	if (selection_wait == Sel_incr)
2756	{
2757	XFree (ct.value);
2758
2759	// finally complete, now paste the whole thing
2760	selection_wait = Sel_normal;
2761	ct.value = (unsigned char *)incr_buf;
2762	ct.nitems = incr_buf_fill;
2763	incr_buf = 0;
2764	incr_buf_size = 0;
2765	incr_ev.stop ();
2766	}
2767	else
2768	{
2769	if (selection_wait == Sel_normal
2770	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771	{
2772	/*
2773	* pass through again trying CUT_BUFFER0 if we've come from
2774	* XConvertSelection () but nothing was presented
2775	*/
2776	selection_paste (display->root, XA_CUT_BUFFER0, False);
2777	}
2778
2779	goto bailout;
2780	}
2781	}
2782	else if (selection_wait == Sel_incr)
2783	{
2784	incr_ev.start (10);
2785
2786	while (incr_buf_fill + ct.nitems > incr_buf_size)
2787	{
2788	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790	}
2791
2792	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793	incr_buf_fill += ct.nitems;
2794
2795	goto bailout;
2796	}
2797
2798	char **cl;
2799	int cr;
2800
2801	#if !ENABLE_MINIMAL
2802	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803	// so recode it manually
2804	if (ct.encoding == xa[XA_UTF8_STRING])
2805	{
2806	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807	char *s = rxvt_wcstombs (w);
2808	free (w);
2809	// TODO: strlen == only the first element will be converted. well...
2810	paste (s, strlen (s));
2811	free (s);
2812	}
2813	else
2814	#endif
2815	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816	&& cl)
2817	{
2818	for (int i = 0; i < cr; i++)
2819	paste (cl[i], strlen (cl[i]));
2820
2821	XFreeStringList (cl);
2822	}
2823	else
2824	paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826	bailout:
2827	XFree (ct.value);
2828
2829	if (selection_wait == Sel_normal)
2830	selection_wait = Sel_none;
2831	}
2832
2833	void
2834	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835	{
2836	selection_wait = Sel_none;
2837
2838	incr_buf_size = 0;
2839	free (incr_buf);
2840
2841	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842	}
2843
2844	void
2845	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846	{
2847	if (prop == None || selection_wait != Sel_incr)
2848	return;	2751	return;
2849		2752
2850	selection_paste (win, prop, true);	2753	tt_paste (data, len);
2851	}	2754	}
2852		2755
2853	/* ------------------------------------------------------------------------- */	2756	/* ------------------------------------------------------------------------- */
2854	/*	2757	/*
2855	* Request the current selection:	2758	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856	* Order: > internal selection if available	2759	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2760	* as fallback
2858	* > CUT_BUFFER0
2859	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860	* will auto fallback to CUT_BUFFER0
2861	* EXT: button 2 release	2761	* EXT: button 2 release
2862	*/	2762	*/
2863	void	2763	void
2864	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2764	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865	{	2765	{
2866	if (selection.text && selnum == Sel_Primary)	2766	if (!selection_req)
2867	{
2868	/* internal selection */
2869	char *str = rxvt_wcstombs (selection.text, selection.len);
2870	paste (str, strlen (str));
2871	free (str);
2872	return;
2873	}	2767	{
2874	else	2768	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2769	selection_req->run ();
2875	{	2770	}
2876	selection_request_time = tm;
2877	selection_wait = Sel_normal;
2878
2879	#if X_HAVE_UTF8_STRING
2880	selection_type = Sel_UTF8String;
2881	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882	return;
2883	#else
2884	selection_type = Sel_CompoundText;
2885	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886	return;
2887	#endif
2888	}
2889
2890	selection_wait = Sel_none; /* don't loop in selection_paste () */
2891	selection_paste (display->root, XA_CUT_BUFFER0, false);
2892	}
2893
2894	int
2895	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896	{
2897	Atom sel;
2898
2899	selection_type |= selnum;
2900
2901	if (selnum == Sel_Primary)
2902	sel = XA_PRIMARY;
2903	else if (selnum == Sel_Secondary)
2904	sel = XA_SECONDARY;
2905	else
2906	sel = xa[XA_CLIPBOARD];
2907
2908	if (XGetSelectionOwner (dpy, sel) != None)
2909	{
2910	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911	vt, selection_request_time);
2912	return 1;
2913	}
2914
2915	return 0;
2916	}	2771	}
2917		2772
2918	/* ------------------------------------------------------------------------- */	2773	/* ------------------------------------------------------------------------- */
2919	/*	2774	/*
2920	* Clear all selected text	2775	* Clear all selected text
2921	* EXT: SelectionClear	2776	* EXT: SelectionClear
2922	*/	2777	*/
2923	void	2778	void
2924	rxvt_term::selection_clear () NOTHROW	2779	rxvt_term::selection_clear (bool clipboard) NOTHROW
2925	{	2780	{
		2781	if (!clipboard)
		2782	{
2926	want_refresh = 1;	2783	want_refresh = 1;
2927	free (selection.text);	2784	free (selection.text);
2928	selection.text = NULL;	2785	selection.text = NULL;
2929	selection.len = 0;	2786	selection.len = 0;
2930	CLEAR_SELECTION ();	2787	CLEAR_SELECTION ();
2931		2788
2932	if (display->selection_owner == this)	2789	if (display->selection_owner == this)
2933	display->selection_owner = 0;	2790	display->selection_owner = 0;
		2791	}
		2792	else
		2793	{
		2794	free (selection.clip_text);
		2795	selection.clip_text = NULL;
		2796	selection.clip_len = 0;
		2797
		2798	if (display->clipboard_owner == this)
		2799	display->clipboard_owner = 0;
		2800	}
2934	}	2801	}
2935		2802
2936	/* ------------------------------------------------------------------------- */	2803	/* ------------------------------------------------------------------------- */
2937	/*	2804	/*
2938	* Copy a selection into the cut buffer	2805	* Copy a selection into the cut buffer
2939	* EXT: button 1 or 3 release	2806	* EXT: button 1 or 3 release
2940	*/	2807	*/
2941	void	2808	void
2942	rxvt_term::selection_make (Time tm)	2809	rxvt_term::selection_make (Time tm)
2943	{	2810	{
2944	int i;	2811	int size;
2945	wchar_t *new_selection_text;	2812	wchar_t *new_selection_text;
2946	text_t *t;	2813	text_t *t;
2947		2814
2948	switch (selection.op)	2815	switch (selection.op)
2949	{	2816	{
…		…
2965	return; /* nothing selected, go away */	2832	return; /* nothing selected, go away */
2966		2833
2967	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2834	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968	return;	2835	return;
2969		2836
2970	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2837	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2838	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972		2839
2973	int ofs = 0;	2840	int ofs = 0;
2974	int extra = 0;	2841	int extra = 0;
2975		2842
2976	int col = selection.beg.col;	2843	int col = selection.beg.col;
…		…
2982	{	2849	{
2983	#if !ENABLE_MINIMAL	2850	#if !ENABLE_MINIMAL
2984	if (selection.rect)	2851	if (selection.rect)
2985	{	2852	{
2986	col = selection.beg.col;	2853	col = selection.beg.col;
2987	end_col = ncol + 1;	2854	end_col = selection.end.col;
2988	}	2855	}
2989	else	2856	else
2990	#endif	2857	#endif
2991	end_col = ROW(row).l;	2858	end_col = ROW(row).l;
2992		2859
2993	col = max (col, 0);	2860	col = max (col, 0);
2994		2861
2995	if (row == selection.end.row	2862	if (row == selection.end.row)
2996	#if !ENABLE_MINIMAL
2997	|| selection.rect
2998	#endif
2999	)
3000	min_it (end_col, selection.end.col);	2863	min_it (end_col, selection.end.col);
3001		2864
3002	t = ROW(row).t + col;	2865	t = ROW(row).t + col;
3003		2866
3004	for (; col < end_col; col++)	2867	for (; col < end_col; col++)
…		…
3012		2875
3013	extra -= (len - 1);	2876	extra -= (len - 1);
3014		2877
3015	if (extra < 0)	2878	if (extra < 0)
3016	{	2879	{
3017	extra += i;	2880	extra += size;
3018	i += i;	2881	size += size;
3019	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2882	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020	}	2883	}
3021		2884
3022	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2885	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023	}	2886	}
3024	#endif	2887	#endif
…		…
3036		2899
3037	new_selection_text[ofs++] = C0_LF;	2900	new_selection_text[ofs++] = C0_LF;
3038	}	2901	}
3039	else	2902	else
3040	#endif	2903	#endif
3041	if (!ROW(row).is_longer () && row != selection.end.row)	2904	if (!ROW(row).is_longer ()
		2905	&& (row != selection.end.row || end_col != selection.end.col)
		2906	&& (row != selection.beg.row || selection.beg.col < ncol))
3042	new_selection_text[ofs++] = C0_LF;	2907	new_selection_text[ofs++] = C0_LF;
3043	}	2908	}
3044
3045	if (end_col != selection.end.col)
3046	new_selection_text[ofs++] = C0_LF;
3047		2909
3048	new_selection_text[ofs] = 0;	2910	new_selection_text[ofs] = 0;
3049		2911
3050	if (ofs == 0)	2912	if (ofs == 0)
3051	{	2913	{
…		…
3064		2926
3065	selection_grab (tm);	2927	selection_grab (tm);
3066	}	2928	}
3067		2929
3068	bool	2930	bool
3069	rxvt_term::selection_grab (Time tm) NOTHROW	2931	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070	{	2932	{
		2933	Atom sel;
		2934
		2935	if (!clipboard)
		2936	{
3071	selection_time = tm;	2937	selection_time = tm;
		2938	sel = XA_PRIMARY;
		2939	}
		2940	else
		2941	{
		2942	clipboard_time = tm;
		2943	sel = xa[XA_CLIPBOARD];
		2944	}
3072		2945
3073	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2946	XSetSelectionOwner (dpy, sel, vt, tm);
3074	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2947	if (XGetSelectionOwner (dpy, sel) == vt)
3075	{	2948	{
3076	display->set_selection_owner (this);	2949	display->set_selection_owner (this, clipboard);
3077	return true;	2950	return true;
3078	}	2951	}
3079	else	2952	else
3080	{	2953	{
3081	selection_clear ();	2954	selection_clear (clipboard);
3082	return false;	2955	return false;
3083	}	2956	}
3084		2957
3085	#if 0	2958	#if 0
3086	XTextProperty ct;	2959	XTextProperty ct;
…		…
3546	* EXT: SelectionRequest	3419	* EXT: SelectionRequest
3547	*/	3420	*/
3548	void	3421	void
3549	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3422	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550	{	3423	{
		3424	Atom property = rq.property == None ? rq.target : rq.property;
3551	XSelectionEvent ev;	3425	XSelectionEvent ev;
3552		3426
3553	ev.type = SelectionNotify;	3427	ev.type = SelectionNotify;
3554	ev.property = None;	3428	ev.property = None;
3555	ev.display = rq.display;	3429	ev.display = rq.display;
…		…
3570	*target++ = xa[XA_COMPOUND_TEXT];	3444	*target++ = xa[XA_COMPOUND_TEXT];
3571	#if X_HAVE_UTF8_STRING	3445	#if X_HAVE_UTF8_STRING
3572	*target++ = xa[XA_UTF8_STRING];	3446	*target++ = xa[XA_UTF8_STRING];
3573	#endif	3447	#endif
3574		3448
3575	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3449	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576	32, PropModeReplace,	3450	32, PropModeReplace,
3577	(unsigned char *)target_list, target - target_list);	3451	(unsigned char *)target_list, target - target_list);
3578	ev.property = rq.property;	3452	ev.property = property;
3579	}	3453	}
3580	#if TODO // TODO	3454	#if TODO // TODO
3581	else if (rq.target == xa[XA_MULTIPLE])	3455	else if (rq.target == xa[XA_MULTIPLE])
3582	{	3456	{
3583	/* TODO: Handle MULTIPLE */	3457	/* TODO: Handle MULTIPLE */
3584	}	3458	}
3585	#endif	3459	#endif
3586	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3460	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587	{	3461	{
3588	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3462	XChangeProperty (dpy, rq.requestor, property, rq.target,
3589	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3463	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590	ev.property = rq.property;	3464	ev.property = property;
		3465	}
		3466	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3467	{
		3468	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3469	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3470	ev.property = property;
3591	}	3471	}
3592	else if (rq.target == XA_STRING	3472	else if (rq.target == XA_STRING
3593	|| rq.target == xa[XA_TEXT]	3473	|| rq.target == xa[XA_TEXT]
3594	|| rq.target == xa[XA_COMPOUND_TEXT]	3474	|| rq.target == xa[XA_COMPOUND_TEXT]
3595	|| rq.target == xa[XA_UTF8_STRING]	3475	|| rq.target == xa[XA_UTF8_STRING]
…		…
3627	{	3507	{
3628	target = xa[XA_COMPOUND_TEXT];	3508	target = xa[XA_COMPOUND_TEXT];
3629	style = enc_compound_text;	3509	style = enc_compound_text;
3630	}	3510	}
3631		3511
3632	if (selection.text)	3512	if (rq.selection == XA_PRIMARY && selection.text)
3633	{	3513	{
3634	cl = selection.text;	3514	cl = selection.text;
3635	selectlen = selection.len;	3515	selectlen = selection.len;
		3516	}
		3517	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3518	{
		3519	cl = selection.clip_text;
		3520	selectlen = selection.clip_len;
3636	}	3521	}
3637	else	3522	else
3638	{	3523	{
3639	cl = L"";	3524	cl = L"";
3640	selectlen = 0;	3525	selectlen = 0;
…		…
3661	ct.value = (unsigned char *)cl;	3546	ct.value = (unsigned char *)cl;
3662	ct.nitems = selectlen;	3547	ct.nitems = selectlen;
3663	ct.encoding = target;	3548	ct.encoding = target;
3664	}	3549	}
3665		3550
3666	XChangeProperty (dpy, rq.requestor, rq.property,	3551	XChangeProperty (dpy, rq.requestor, property,
3667	ct.encoding, 8, PropModeReplace,	3552	ct.encoding, 8, PropModeReplace,
3668	ct.value, (int)ct.nitems);	3553	ct.value, (int)ct.nitems);
3669	ev.property = rq.property;	3554	ev.property = property;
3670		3555
3671	if (freect)	3556	if (freect)
3672	XFree (ct.value);	3557	XFree (ct.value);
3673	}	3558	}
3674		3559
…		…
3708	h += 2; min_it (h, nrow);	3593	h += 2; min_it (h, nrow);
3709		3594
3710	x -= 1; clamp_it (x, 0, ncol - w);	3595	x -= 1; clamp_it (x, 0, ncol - w);
3711	y -= 1; clamp_it (y, 0, nrow - h);	3596	y -= 1; clamp_it (y, 0, nrow - h);
3712		3597
3713	ov_x = x; ov_y = y;	3598	ov.x = x; ov.y = y;
3714	ov_w = w; ov_h = h;	3599	ov.w = w; ov.h = h;
3715		3600
3716	ov_text = new text_t *[h];	3601	ov.text = new text_t *[h];
3717	ov_rend = new rend_t *[h];	3602	ov.rend = new rend_t *[h];
3718		3603
3719	for (y = 0; y < h; y++)	3604	for (y = 0; y < h; y++)
3720	{	3605	{
3721	text_t *tp = ov_text[y] = new text_t[w];	3606	text_t *tp = ov.text[y] = new text_t[w];
3722	rend_t *rp = ov_rend[y] = new rend_t[w];	3607	rend_t *rp = ov.rend[y] = new rend_t[w];
3723		3608
3724	text_t t0, t1, t2;	3609	text_t t0, t1, t2;
3725	rend_t r = OVERLAY_RSTYLE;	3610	rend_t r = OVERLAY_RSTYLE;
3726		3611
3727	if (y == 0)	3612	if (y == 0)
…		…
3746	}	3631	}
3747		3632
3748	void	3633	void
3749	rxvt_term::scr_overlay_off () NOTHROW	3634	rxvt_term::scr_overlay_off () NOTHROW
3750	{	3635	{
3751	if (!ov_text)	3636	if (!ov.text)
3752	return;	3637	return;
3753		3638
3754	want_refresh = 1;	3639	want_refresh = 1;
3755		3640
3756	for (int y = 0; y < ov_h; y++)	3641	for (int y = 0; y < ov.h; y++)
3757	{	3642	{
3758	delete [] ov_text[y];	3643	delete [] ov.text[y];
3759	delete [] ov_rend[y];	3644	delete [] ov.rend[y];
3760	}	3645	}
3761		3646
3762	delete [] ov_text; ov_text = 0;	3647	delete [] ov.text; ov.text = 0;
3763	delete [] ov_rend; ov_rend = 0;	3648	delete [] ov.rend; ov.rend = 0;
3764	}	3649	}
3765		3650
3766	void	3651	void
3767	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3652	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768	{	3653	{
3769	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3654	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770	return;	3655	return;
3771		3656
3772	x++, y++;	3657	x++, y++;
3773		3658
3774	ov_text[y][x] = text;	3659	ov.text[y][x] = text;
3775	ov_rend[y][x] = rend;	3660	ov.rend[y][x] = rend;
3776	}	3661	}
3777		3662
3778	void	3663	void
3779	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3664	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780	{	3665	{
…		…
3799	}	3684	}
3800		3685
3801	void	3686	void
3802	rxvt_term::scr_swap_overlay () NOTHROW	3687	rxvt_term::scr_swap_overlay () NOTHROW
3803	{	3688	{
3804	if (!ov_text)	3689	if (!ov.text)
3805	return;	3690	return;
3806		3691
		3692	// hide cursor if it is within the overlay area
		3693	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3694	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3695	screen.flags &= ~Screen_VisibleCursor;
		3696
3807	// swap screen mem with overlay	3697	// swap screen mem with overlay
3808	for (int y = ov_h; y--; )	3698	for (int y = ov.h; y--; )
3809	{	3699	{
3810	text_t *t1 = ov_text[y];	3700	text_t *t1 = ov.text[y];
3811	rend_t *r1 = ov_rend[y];	3701	rend_t *r1 = ov.rend[y];
3812		3702
3813	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3703	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3704	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815		3705
3816	for (int x = ov_w; x--; )	3706	for (int x = ov.w; x--; )
3817	{	3707	{
3818	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3708	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3709	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820	}	3710	}
3821	}	3711	}

Diff Legend

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