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.398 by sf-exg, Wed Nov 2 15:11:51 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
655	if (selection.op && current_screen == selection.screen)
656	{
657	selection.beg.row -= count;
658	selection.end.row -= count;
659	selection.mark.row -= count;
660
661	if (selection.beg.row < top_row
662	|| selection.end.row < top_row
663	|| selection.mark.row < top_row)
664	{
665	CLEAR_ALL_SELECTION ();
666	selection.op = SELECTION_CLEAR;
667	}
668	}
669
670	// finally move the view window, if desired	686	// finally move the view window, if desired
671	if (option (Opt_scrollWithBuffer)	687	if (option (Opt_scrollWithBuffer)
672	&& view_start != 0	688	&& view_start != 0
673	&& view_start != -saveLines)	689	&& view_start != -saveLines)
674	scr_page (UP, count);	690	scr_page (UP, count);
…		…
676	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
677	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	693	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
678	}	694	}
679	else	695	else
680	{	696	{
681	if (selection.op && current_screen == selection.screen)
682	{
683	if ((selection.beg.row < row1 && selection.end.row > row1)
684	|| (selection.beg.row < row2 && selection.end.row > row2)
685	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
686	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
687	|| (selection.end.row - count < row1 && selection.end.row >= row1)
688	|| (selection.end.row - count > row2 && selection.end.row <= row2))
689	{
690	CLEAR_ALL_SELECTION ();
691	selection.op = SELECTION_CLEAR;
692	}
693	else if (selection.end.row >= row1 && selection.end.row <= row2)
694	{
695	/* move selected region too */
696	selection.beg.row -= count;
697	selection.end.row -= count;
698	selection.mark.row -= count;
699
700	selection_check (0);
701	}
702	}
703
704	// use a simple and robust scrolling algorithm, this	697	// use a simple and robust scrolling algorithm, this
705	// part of scr_scroll_text is not time-critical.	698	// part of scr_scroll_text is not time-critical.
706		699
		700	// sever line above scroll region
		701	if (row1)
		702	{
		703	line_t &l = ROW(row1 - 1);
		704	l.is_longer (0);
		705	l.touch ();
		706	}
		707
707	int rows = row2 - row1 + 1;	708	int rows = row2 - row1 + 1;
708		709
709	min_it (count, rows);	710	min_it (count, rows);
710		711
711	line_t *temp_buf = row_buf + total_rows;	712	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712		713
713	for (int row = 0; row < rows; row++)	714	for (int row = 0; row < rows; row++)
714	{	715	{
715	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	716	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716		717
…		…
718	scr_blank_screen_mem (temp_buf [row], rstyle);	719	scr_blank_screen_mem (temp_buf [row], rstyle);
719	}	720	}
720		721
721	for (int row = 0; row < rows; row++)	722	for (int row = 0; row < rows; row++)
722	ROW(row1 + row) = temp_buf [row];	723	ROW(row1 + row) = temp_buf [row];
		724
		725	// sever bottommost line
		726	{
		727	line_t &l = ROW(row2);
		728	l.is_longer (0);
		729	l.touch ();
		730	}
		731	}
		732
		733	// move and/or clear selection, if any
		734	if (selection.op && current_screen == selection.screen)
		735	{
		736	if ((selection.beg.row < row1 && selection.end.row > row1)
		737	|| (selection.beg.row < row2 && selection.end.row > row2)
		738	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
		739	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
		740	|| (selection.end.row - count < row1 && selection.end.row >= row1)
		741	|| (selection.end.row - count > row2 && selection.end.row <= row2))
		742	CLEAR_ALL_SELECTION ();
		743	else if (selection.end.row >= row1 && selection.end.row <= row2)
		744	{
		745	/* move selected region too */
		746	selection.beg.row -= count;
		747	selection.end.row -= count;
		748	selection.mark.row -= count;
		749
		750	selection_check (0);
		751	}
723	}	752	}
724		753
725	return count;	754	return count;
726	}	755	}
727		756
…		…
756	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	785	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757	screen.cur.row -= minlines;	786	screen.cur.row -= minlines;
758	}	787	}
759	}	788	}
760		789
761	#ifdef DEBUG_STRICT
762	assert (screen.cur.col < ncol);	790	assert (screen.cur.col < ncol);
763	assert (screen.cur.row < nrow	791	assert (screen.cur.row < nrow
764	&& screen.cur.row >= top_row);	792	&& screen.cur.row >= top_row);
765	#endif
766	int row = screen.cur.row;	793	int row = screen.cur.row;
767		794
768	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	795	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769		796
770	line_t *line = &ROW(row);	797	line_t *line = &ROW(row);
771		798
772	while (str < strend)	799	while (str < strend)
773	{	800	{
774	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	801	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775		802
776	if (expect_false (c < 0x20))	803	if (ecb_unlikely (c < 0x20))
777	if (c == C0_LF)	804	if (c == C0_LF)
778	{	805	{
779	max_it (line->l, screen.cur.col);	806	max_it (line->l, screen.cur.col);
780		807
781	screen.flags &= ~Screen_WrapNext;	808	screen.flags &= ~Screen_WrapNext;
…		…
800	{	827	{
801	scr_tab (1, true);	828	scr_tab (1, true);
802	continue;	829	continue;
803	}	830	}
804		831
805	if (expect_false (	832	if (ecb_unlikely (
806	checksel /* see if we're writing within selection */	833	checksel /* see if we're writing within selection */
807	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	834	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)	835	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
809	))	836	))
810	{	837	{
…		…
815	* should be a similar check.	842	* should be a similar check.
816	*/	843	*/
817	CLEAR_SELECTION ();	844	CLEAR_SELECTION ();
818	}	845	}
819		846
820	if (expect_false (screen.flags & Screen_WrapNext))	847	if (ecb_unlikely (screen.flags & Screen_WrapNext))
821	{	848	{
822	scr_do_wrap ();	849	scr_do_wrap ();
823		850
824	line->l = ncol;	851	line->l = ncol;
825	line->is_longer (1);	852	line->is_longer (1);
…		…
827	row = screen.cur.row;	854	row = screen.cur.row;
828	line = &ROW(row); /* _must_ refresh */	855	line = &ROW(row); /* _must_ refresh */
829	}	856	}
830		857
831	// some utf-8 decoders "decode" surrogate characters: let's fix this.	858	// some utf-8 decoders "decode" surrogate characters: let's fix this.
832	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))	859	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833	c = 0xfffd;	860	c = 0xfffd;
834		861
835	// rely on wcwidth to tell us the character width, do wcwidth before	862	// rely on wcwidth to tell us the character width, do wcwidth before
836	// further replacements, as wcwidth might return -1 for the line	863	// further replacements, as wcwidth might return -1 for the line
837	// drawing characters below as they might be invalid in the current	864	// drawing characters below as they might be invalid in the current
838	// locale.	865	// locale.
839	int width = WCWIDTH (c);	866	int width = WCWIDTH (c);
840		867
841	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL	868	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842	{	869	{
843	// vt100 special graphics and line drawing	870	// vt100 special graphics and line drawing
844	// 5f-7e standard vt100	871	// 5f-7e standard vt100
845	// 40-5e rxvt extension for extra curses acs chars	872	// 40-5e rxvt extension for extra curses acs chars
846	static uint16_t vt100_0[62] = { // 41 .. 7e	873	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
859	c = vt100_0[c - 0x41];	886	c = vt100_0[c - 0x41];
860	width = 1; // vt100 line drawing characters are always single-width	887	width = 1; // vt100 line drawing characters are always single-width
861	}	888	}
862	}	889	}
863		890
864	if (expect_false (screen.flags & Screen_Insert))	891	if (ecb_unlikely (screen.flags & Screen_Insert))
865	scr_insdel_chars (width, INSERT);	892	scr_insdel_chars (width, INSERT);
866		893
867	if (width != 0)	894	if (width != 0)
868	{	895	{
869	#if !UNICODE_3	896	#if !UNICODE_3
…		…
874	# else	901	# else
875	c = 0xfffd;	902	c = 0xfffd;
876	# endif	903	# endif
877	#endif	904	#endif
878		905
		906	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		907
		908	// if the character doesn't fit into the remaining columns...
		909	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		910	{
		911	if (screen.flags & Screen_Autowrap)
		912	{
		913	// ... artificially enlargen the previous one
		914	c = NOCHAR;
		915	// and try the same character next loop iteration
		916	--str;
		917	}
		918	else
		919	screen.cur.col = ncol - width;
		920	}
		921
879	// nuke the character at this position, if required	922	// nuke the character at this position, if required
880	if (expect_false (	923	// due to wonderful coincidences everywhere else in this loop
		924	// we never have to check for overwriting a wide char itself,
		925	// only its tail.
881	line->t[screen.cur.col] == NOCHAR	926	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882	|| (screen.cur.col < ncol - 1	927	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		928
913	line->touch ();	929	line->touch ();
914		930
915	do	931	do
916	{	932	{
917	line->t[screen.cur.col] = c;	933	line->t[screen.cur.col] = c;
918	line->r[screen.cur.col] = rend;	934	line->r[screen.cur.col] = rend;
919		935
920	if (expect_true (screen.cur.col < ncol - 1))	936	if (ecb_likely (screen.cur.col < ncol - 1))
921	screen.cur.col++;	937	screen.cur.col++;
922	else	938	else
923	{	939	{
924	line->l = ncol;	940	line->l = ncol;
925	if (screen.flags & Screen_Autowrap)	941	if (screen.flags & Screen_Autowrap)
926	screen.flags |= Screen_WrapNext;	942	screen.flags |= Screen_WrapNext;
927	break;	943
		944	goto end_of_line;
928	}	945	}
929		946
930	c = NOCHAR;	947	c = NOCHAR;
931	}	948	}
932	while (expect_false (--width > 0));	949	while (ecb_unlikely (--width > 0));
933		950
934	// pad with spaces when overwriting wide character with smaller one	951	// pad with spaces when overwriting wide character with smaller one
935	if (expect_false (!width))	952	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936	{	953	{
937	line->touch ();
938
939	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940	{
941	line->t[c] = ' ';	954	line->t[c] = ' ';
942	line->r[c] = rend;	955	line->r[c] = rend;
943	}
944	}	956	}
		957
		958	end_of_line:
		959	;
945	}	960	}
946	#if ENABLE_COMBINING	961	#if ENABLE_COMBINING
947	else // width == 0	962	else // width == 0
948	{	963	{
949	if (c != 0xfeff) // ignore BOM	964	if (c != 0xfeff) // ignore BOM
…		…
989	#endif	1004	#endif
990	}	1005	}
991		1006
992	max_it (line->l, screen.cur.col);	1007	max_it (line->l, screen.cur.col);
993		1008
994	#ifdef DEBUG_STRICT
995	assert (screen.cur.row >= 0);	1009	assert (screen.cur.row >= 0);
996	#endif
997	}	1010	}
998		1011
999	/* ------------------------------------------------------------------------- */	1012	/* ------------------------------------------------------------------------- */
1000	/*	1013	/*
1001	* Process Backspace. Move back the cursor back a position, wrap if have to	1014	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1014		1027
1015	want_refresh = 1;	1028	want_refresh = 1;
1016	#endif	1029	#endif
1017	}	1030	}
1018	}	1031	}
		1032	else if (screen.flags & Screen_WrapNext)
		1033	screen.flags &= ~Screen_WrapNext;
1019	else	1034	else
1020	scr_gotorc (0, -1, RELATIVE);	1035	scr_gotorc (0, -1, RELATIVE);
1021	}	1036	}
1022		1037
1023	/* ------------------------------------------------------------------------- */	1038	/* ------------------------------------------------------------------------- */
…		…
1329	if (row >= nrow) /* Out Of Bounds */	1344	if (row >= nrow) /* Out Of Bounds */
1330	return;	1345	return;
1331		1346
1332	min_it (num, nrow - row);	1347	min_it (num, nrow - row);
1333		1348
1334	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335	if (rstyle & (RS_RVid | RS_Uline))	1349	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336	ren = (rend_t) ~RS_None;	1350	ren = (rend_t) ~RS_None;
1337	else if (GET_BASEBG (rstyle) == Color_bg)	1351	else if (GET_BASEBG (rstyle) == Color_bg)
1338	{	1352	{
1339	ren = DEFAULT_RSTYLE;	1353	ren = DEFAULT_RSTYLE;
1340		1354
1341	if (mapped)	1355	if (mapped)
1342	XClearArea (dpy, vt, 0,	1356	XClearArea (dpy, vt, 0,
1343	Row2Pixel (row), (unsigned int)width,	1357	Row2Pixel (row - view_start), (unsigned int)width,
1344	(unsigned int)Height2Pixel (num), False);	1358	(unsigned int)Height2Pixel (num), False);
1345	}	1359	}
1346	else	1360	else
1347	{	1361	{
1348	ren = rstyle & (RS_fgMask | RS_bgMask);	1362	ren = rstyle & (RS_fgMask | RS_bgMask);
1349		1363
		1364	if (mapped)
		1365	{
1350	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352	XFillRectangle (dpy, vt, gc,	1368	XFillRectangle (dpy, vt, gc,
1353	0, Row2Pixel (row),	1369	0, Row2Pixel (row - view_start),
1354	(unsigned int)width,	1370	(unsigned int)width,
1355	(unsigned int)Height2Pixel (num));	1371	(unsigned int)Height2Pixel (num));
1356	gcvalue.foreground = pix_colors[Color_fg];	1372	gcvalue.foreground = pix_colors[Color_fg];
1357	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1374	}
1358	}	1375	}
1359		1376
1360	for (; num--; row++)	1377	for (; num--; row++)
1361	{	1378	{
1362	scr_blank_screen_mem (ROW(row), rstyle);	1379	scr_blank_screen_mem (ROW(row), rstyle);
		1380
		1381	if (row - view_start < nrow)
1363	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1382	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364	}	1383	}
1365	}	1384	}
1366		1385
1367	#if !ENABLE_MINIMAL	1386	#if !ENABLE_MINIMAL
1368	void	1387	void
…		…
1442	* Insert/Delete <count> characters from the current position	1461	* Insert/Delete <count> characters from the current position
1443	*/	1462	*/
1444	void	1463	void
1445	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1464	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446	{	1465	{
1447	int col, row;
1448	rend_t tr;
1449
1450	want_refresh = 1;	1466	want_refresh = 1;
1451	ZERO_SCROLLBACK ();	1467	ZERO_SCROLLBACK ();
1452		1468
1453	if (count <= 0)	1469	if (count <= 0)
1454	return;	1470	return;
…		…
1456	scr_do_wrap ();	1472	scr_do_wrap ();
1457		1473
1458	selection_check (1);	1474	selection_check (1);
1459	min_it (count, ncol - screen.cur.col);	1475	min_it (count, ncol - screen.cur.col);
1460		1476
1461	row = screen.cur.row;	1477	int row = screen.cur.row;
1462		1478
1463	line_t *line = &ROW(row);	1479	line_t *line = &ROW(row);
1464		1480
1465	line->touch ();	1481	line->touch ();
1466	line->is_longer (0);	1482	line->is_longer (0);
1467		1483
		1484	// nuke wide spanning the start
		1485	if (line->t[screen.cur.col] == NOCHAR)
		1486	scr_kill_char (*line, screen.cur.col);
		1487
1468	switch (insdel)	1488	switch (insdel)
1469	{	1489	{
1470	case INSERT:	1490	case INSERT:
1471	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1491	line->l = min (line->l + count, ncol);
		1492
		1493	if (line->t[screen.cur.col] == NOCHAR)
		1494	scr_kill_char (*line, screen.cur.col);
		1495
		1496	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472	{	1497	{
1473	line->t[col] = line->t[col - count];	1498	line->t[col] = line->t[col - count];
1474	line->r[col] = line->r[col - count];	1499	line->r[col] = line->r[col - count];
1475	}	1500	}
1476
1477	line->l = min (line->l + count, ncol);
1478		1501
1479	if (selection.op && current_screen == selection.screen	1502	if (selection.op && current_screen == selection.screen
1480	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1503	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481	{	1504	{
1482	if (selection.end.row != screen.cur.row	1505	if (selection.end.row != screen.cur.row
…		…
1497	case ERASE:	1520	case ERASE:
1498	screen.cur.col += count; /* don't worry if > ncol */	1521	screen.cur.col += count; /* don't worry if > ncol */
1499	selection_check (1);	1522	selection_check (1);
1500	screen.cur.col -= count;	1523	screen.cur.col -= count;
1501		1524
1502	line->l = max (line->l - count, 0);	1525	// nuke wide char after the end
		1526	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1527	scr_kill_char (*line, screen.cur.col + count);
		1528
1503	scr_blank_line (*line, screen.cur.col, count, rstyle);	1529	scr_blank_line (*line, screen.cur.col, count, rstyle);
1504	break;	1530	break;
1505		1531
1506	case DELETE:	1532	case DELETE:
1507	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1533	line->l = max (line->l - count, 0);
1508		1534
		1535	// nuke wide char spanning the end
		1536	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1537	scr_kill_char (*line, screen.cur.col + count);
		1538
1509	for (col = screen.cur.col; (col + count) < ncol; col++)	1539	for (int col = screen.cur.col; (col + count) < ncol; col++)
1510	{	1540	{
1511	line->t[col] = line->t[col + count];	1541	line->t[col] = line->t[col + count];
1512	line->r[col] = line->r[col + count];	1542	line->r[col] = line->r[col + count];
1513	}	1543	}
1514		1544
1515	line->l = max (line->l - count, 0);
1516	scr_blank_line (*line, ncol - count, count, tr);	1545	scr_blank_line (*line, ncol - count, count, rstyle);
1517		1546
1518	if (selection.op && current_screen == selection.screen	1547	if (selection.op && current_screen == selection.screen
1519	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1548	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520	{	1549	{
1521	if (selection.end.row != screen.cur.row	1550	if (selection.end.row != screen.cur.row
…		…
1657	{	1686	{
1658	rvideo_state = on;	1687	rvideo_state = on;
1659		1688
1660	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1689	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661	#ifdef HAVE_BG_PIXMAP	1690	#ifdef HAVE_BG_PIXMAP
1662	if (bgPixmap.pixmap == None)	1691	if (bg_pixmap == None)
1663	#endif	1692	#endif
1664	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1693	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665		1694
1666	XGCValues gcvalue;	1695	XGCValues gcvalue;
1667	gcvalue.foreground = pix_colors[Color_fg];	1696	gcvalue.foreground = pix_colors[Color_fg];
…		…
1811	for (i = PART_BEG; i < RC_COUNT; i++)	1840	for (i = PART_BEG; i < RC_COUNT; i++)
1812	{	1841	{
1813	min_it (rc[i].col, ncol - 1);	1842	min_it (rc[i].col, ncol - 1);
1814	min_it (rc[i].row, nrow - 1);	1843	min_it (rc[i].row, nrow - 1);
1815	}	1844	}
1816	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1845
1817	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1846	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1847	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819		1848
1820	num_scr_allow = 0;	1849	num_scr_allow = 0;
1821		1850
…		…
1894		1923
1895	# ifndef NO_MAPALERT	1924	# ifndef NO_MAPALERT
1896	# ifdef MAPALERT_OPTION	1925	# ifdef MAPALERT_OPTION
1897	if (option (Opt_mapAlert))	1926	if (option (Opt_mapAlert))
1898	# endif	1927	# endif
1899	XMapWindow (dpy, parent[0]);	1928	XMapWindow (dpy, parent);
1900	# endif	1929	# endif
1901		1930
1902	# if ENABLE_FRILLS	1931	# if ENABLE_FRILLS
1903	if (option (Opt_urgentOnBell))	1932	if (option (Opt_urgentOnBell))
1904	{	1933	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	1934	# endif
1912		1935
1913	if (option (Opt_visualBell))	1936	if (option (Opt_visualBell))
1914	{	1937	{
1915	rvideo_bell = true;	1938	rvideo_bell = true;
…		…
1918		1941
1919	bell_ev.start (VISUAL_BELL_DURATION);	1942	bell_ev.start (VISUAL_BELL_DURATION);
1920	}	1943	}
1921	else	1944	else
1922	XBell (dpy, 0);	1945	XBell (dpy, 0);
		1946	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923	#endif	1947	#endif
1924	}	1948	}
1925		1949
1926	/* ------------------------------------------------------------------------- */	1950	/* ------------------------------------------------------------------------- */
1927	/* ARGSUSED */
1928	void	1951	void
1929	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1930	{	1953	{
1931	#ifdef PRINTPIPE	1954	#ifdef PRINTPIPE
1932	int nrows, row_start;	1955	int nrows, row_start;
…		…
1946	row_start = view_start;	1969	row_start = view_start;
1947	}	1970	}
1948		1971
1949	wctomb (0, 0);	1972	wctomb (0, 0);
1950		1973
1951	for (int r1 = 0; r1 < nrows; r1++)	1974	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952	{	1975	{
1953	text_t *tp = ROW(r1).t;	1976	text_t *tp = ROW(r1).t;
1954	int len = ROW(r1).l;	1977	int len = ROW(r1).l;
1955		1978
1956	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1979	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1985	* screen.text/screen.rend contain what the screen will change to.	2008	* screen.text/screen.rend contain what the screen will change to.
1986	*/	2009	*/
1987	void	2010	void
1988	rxvt_term::scr_refresh () NOTHROW	2011	rxvt_term::scr_refresh () NOTHROW
1989	{	2012	{
1990	unsigned char have_bg,
1991	showcursor; /* show the cursor */
1992	int16_t col, row, /* column/row we're processing */	2013	int16_t col, row, /* column/row we're processing */
1993	ocrow; /* old cursor row */	2014	ocrow; /* old cursor row */
1994	int i; /* tmp */	2015	int i; /* tmp */
1995	#ifndef NO_CURSORCOLOR	2016	#ifndef NO_CURSORCOLOR
1996	rend_t cc1; /* store colours at cursor position (s) */	2017	rend_t cc1; /* store colours at cursor position (s) */
…		…
2007	/*	2028	/*
2008	* A: set up vars	2029	* A: set up vars
2009	*/	2030	*/
2010	refresh_count = 0;	2031	refresh_count = 0;
2011		2032
		2033	unsigned int old_screen_flags = screen.flags;
2012	have_bg = 0;	2034	char have_bg = 0;
2013	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2014	have_bg = bgPixmap.pixmap != None;	2036	have_bg = bg_pixmap != None;
2015	#endif	2037	#endif
2016	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017		2039
2018	/*	2040	/*
2019	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
2020	*/	2042	*/
2021	scr_reverse_selection ();	2043	scr_reverse_selection ();
		2044
		2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2046	#if ENABLE_OVERLAY
		2047	scr_swap_overlay ();
		2048	#endif
		2049
		2050	char showcursor = screen.flags & Screen_VisibleCursor;
2022		2051
2023	/*	2052	/*
2024	* C: set the cursor character (s)	2053	* C: set the cursor character (s)
2025	*/	2054	*/
2026	{	2055	{
2027	unsigned char setoldcursor;	2056	unsigned char setoldcursor;
2028		2057
2029	showcursor = (screen.flags & Screen_VisibleCursor);
2030	#ifdef CURSOR_BLINK	2058	#ifdef CURSOR_BLINK
2031	if (hidden_cursor)	2059	if (hidden_cursor)
2032	showcursor = 0;	2060	showcursor = 0;
2033	#endif	2061	#endif
2034		2062
…		…
2062	ccol2 = bgcolor_of (rstyle);	2090	ccol2 = bgcolor_of (rstyle);
2063	#else	2091	#else
2064	ccol2 = Color_bg;	2092	ccol2 = Color_bg;
2065	#endif	2093	#endif
2066		2094
2067	if (showcursor && focus)	2095	if (focus)
2068	{	2096	{
2069	if (option (Opt_cursorUnderline))	2097	if (option (Opt_cursorUnderline))
2070	*crp ^= RS_Uline;	2098	*crp ^= RS_Uline;
2071	else	2099	else
2072	{	2100	{
…		…
2107	oldcursor.col = screen.cur.col;	2135	oldcursor.col = screen.cur.col;
2108	}	2136	}
2109	}	2137	}
2110	}	2138	}
2111		2139
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	2140	#ifndef NO_SLOW_LINK_SUPPORT
2118	/*	2141	/*
2119	* D: CopyArea pass - very useful for slower links	2142	* D: CopyArea pass - very useful for slower links
2120	* This has been deliberately kept simple.	2143	* This has been deliberately kept simple.
2121	*/	2144	*/
…		…
2210	continue;	2233	continue;
2211		2234
2212	// redraw one or more characters	2235	// redraw one or more characters
2213		2236
2214	// seek to the beginning of wide characters	2237	// seek to the beginning of wide characters
2215	while (expect_false (stp[col] == NOCHAR && col > 0))	2238	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216	--col;	2239	--col;
2217		2240
2218	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2241	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219	text_t *text = stp + col;	2242	text_t *text = stp + col;
2220	int count = 1;	2243	int count = 1;
2221		2244
2222	dtp[col] = stp[col];	2245	dtp[col] = stp[col];
2223	drp[col] = rend;	2246	drp[col] = rend;
…		…
2227	for (i = 0; ++col < ncol; )	2250	for (i = 0; ++col < ncol; )
2228	{	2251	{
2229	if (stp[col] == NOCHAR)	2252	if (stp[col] == NOCHAR)
2230	{	2253	{
2231	dtp[col] = stp[col];	2254	dtp[col] = stp[col];
2232	drp[col] = rend;	2255	drp[col] = srp[col];
		2256
2233	count++;	2257	count++;
2234	i++;	2258	i++;
2235		2259
2236	continue;	2260	continue;
2237	}	2261	}
…		…
2257		2281
2258	col--; /* went one too far. move back */	2282	col--; /* went one too far. move back */
2259	count -= i; /* dump any matching trailing chars */	2283	count -= i; /* dump any matching trailing chars */
2260		2284
2261	// sometimes we optimize away the trailing NOCHAR's, add them back	2285	// sometimes we optimize away the trailing NOCHAR's, add them back
2262	while (expect_false (i && text[count] == NOCHAR))	2286	while (ecb_unlikely (i && text[count] == NOCHAR))
2263	count++, i--;	2287	count++, i--;
2264		2288
2265	/*	2289	/*
2266	* Determine the attributes for the string	2290	* Determine the attributes for the string
2267	*/	2291	*/
2268	int fore = fgcolor_of (rend); // desired foreground	2292	int fore = fgcolor_of (rend); // desired foreground
2269	int back = bgcolor_of (rend); // desired background	2293	int back = bgcolor_of (rend); // desired background
2270		2294
2271	// only do special processing if any attributes are set, which is unlikely	2295	// only do special processing if any attributes are set, which is unlikely
2272	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))	2296	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273	{	2297	{
2274	bool invert = rend & RS_RVid;	2298	bool invert = rend & RS_RVid;
2275		2299
2276	#ifndef NO_BOLD_UNDERLINE_REVERSE	2300	#ifndef NO_BOLD_UNDERLINE_REVERSE
2277	if (rend & RS_Bold && fore == Color_fg)	2301	if (rend & RS_Bold && fore == Color_fg)
…		…
2296		2320
2297	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2321	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298	fore = Color_UL;	2322	fore = Color_UL;
2299	#endif	2323	#endif
2300		2324
		2325	#ifdef OPTION_HC
		2326	if (rend & RS_Sel)
		2327	{
		2328	/* invert the column if no highlightColor is set or it is the
		2329	* current cursor column */
		2330	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2331	&& ISSET_PIXCOLOR (Color_HC))
		2332	{
		2333	if (ISSET_PIXCOLOR (Color_HTC))
		2334	fore = Color_HTC;
		2335	// if invert is 0 reverse video is set so we use bg color as fg color
		2336	else if (!invert)
		2337	fore = back;
		2338
		2339	back = Color_HC;
		2340	invert = 0;
		2341	}
		2342	}
		2343	#endif
		2344
2301	if (invert)	2345	if (invert)
2302	{	2346	{
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);	2347	::swap (fore, back);
2310	#ifdef OPTION_HC
2311	else if (ISSET_PIXCOLOR (Color_HC))
2312	back = Color_HC;
2313	#endif
2314		2348
2315	#ifndef NO_BOLD_UNDERLINE_REVERSE	2349	#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)	2350	if (fore == back)
2321	{	2351	{
2322	fore = Color_bg;	2352	fore = Color_bg;
2323	back = Color_fg;	2353	back = Color_fg;
2324	}	2354	}
…		…
2360	/*	2390	/*
2361	* Actually do the drawing of the string here	2391	* Actually do the drawing of the string here
2362	*/	2392	*/
2363	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2393	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364		2394
2365	if (expect_true (have_bg && back == Color_bg))	2395	if (ecb_likely (have_bg && back == Color_bg))
2366	{	2396	{
2367	// this is very ugly, maybe push it into ->draw?	2397	// this is very ugly, maybe push it into ->draw?
2368		2398
2369	for (i = 0; i < count; i++) /* don't draw empty strings */	2399	for (i = 0; i < count; i++) /* don't draw empty strings */
2370	if (text[i] != ' ')	2400	if (text[i] != ' ')
…		…
2377	did_clear: ;	2407	did_clear: ;
2378	}	2408	}
2379	else	2409	else
2380	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2410	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381		2411
2382	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))	2412	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2383	{	2413	{
2384	#if ENABLE_FRILLS	2414	#if ENABLE_FRILLS
2385	if (ISSET_PIXCOLOR (Color_underline))	2415	if (ISSET_PIXCOLOR (Color_underline))
2386	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2416	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387	else	2417	else
…		…
2392	xpixel, ypixel + font->ascent + 1,	2422	xpixel, ypixel + font->ascent + 1,
2393	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2423	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394	}	2424	}
2395	} /* for (col....) */	2425	} /* for (col....) */
2396	} /* for (row....) */	2426	} /* for (row....) */
2397
2398	#if ENABLE_OVERLAY
2399	scr_swap_overlay ();
2400	#endif
2401	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402		2427
2403	/*	2428	/*
2404	* G: cleanup cursor and display outline cursor if necessary	2429	* G: cleanup cursor and display outline cursor if necessary
2405	*/	2430	*/
2406	if (showcursor)	2431	if (showcursor)
…		…
2445	}	2470	}
2446		2471
2447	/*	2472	/*
2448	* H: cleanup selection	2473	* H: cleanup selection
2449	*/	2474	*/
		2475	#if ENABLE_OVERLAY
		2476	scr_swap_overlay ();
		2477	#endif
		2478	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2479
2450	scr_reverse_selection ();	2480	scr_reverse_selection ();
2451		2481
		2482	screen.flags = old_screen_flags;
2452	num_scr = 0;	2483	num_scr = 0;
2453	num_scr_allow = 1;	2484	num_scr_allow = 1;
2454	}	2485	}
2455		2486
2456	void	2487	void
…		…
2477	scr_remap_chars (swap_buf [i]);	2508	scr_remap_chars (swap_buf [i]);
2478	}	2509	}
2479	}	2510	}
2480		2511
2481	void	2512	void
2482	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour (bool refresh) NOTHROW
2483	{	2514	{
		2515	bool transparent = false;
		2516
2484	#ifdef HAVE_BG_PIXMAP	2517	#ifdef HAVE_BG_PIXMAP
2485	bgPixmap.apply ();	2518	if (bg_pixmap != None)
2486	#else	2519	{
		2520	# ifdef ENABLE_TRANSPARENCY
		2521	if (bg_flags & BG_IS_TRANSPARENT)
		2522	{
		2523	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2487		2525
		2526	transparent = true;
		2527	}
		2528	else
		2529	# endif
		2530	{
		2531	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2533	}
		2534	}
		2535	else
		2536	#endif
		2537	{
2488	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2489	XClearWindow (dpy, parent[0]);
2490	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2540	}
		2541
		2542	XClearWindow (dpy, parent);
2491		2543
2492	if (scrollBar.win)	2544	if (scrollBar.win)
2493	{	2545	{
		2546	if (transparent)
		2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2548	else
2494	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2495	scrollBar.state = STATE_IDLE;	2550	scrollBar.state = SB_STATE_IDLE;
2496	scrollBar.show (0);	2551	scrollBar.show (0);
2497	}	2552	}
2498		2553
2499	#endif	2554	if (refresh)
2500		2555	{
2501	/* bgPixmap.apply () does not do the following : */
2502	scr_clear ();	2556	scr_clear ();
2503	scr_touch (true);	2557	scr_touch (true);
		2558	}
2504	want_refresh = 1;	2559	want_refresh = 1;
2505	}	2560	}
2506		2561
2507	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2508	void	2563	void
…		…
2576	{	2631	{
2577	#if !ENABLE_MINIMAL	2632	#if !ENABLE_MINIMAL
2578	if (selection.rect)	2633	if (selection.rect)
2579	scr_xor_rect (selection.beg.row, selection.beg.col,	2634	scr_xor_rect (selection.beg.row, selection.beg.col,
2580	selection.end.row, selection.end.col,	2635	selection.end.row, selection.end.col,
2581	RS_RVid, RS_RVid | RS_Uline);	2636	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582	else	2637	else
2583	#endif	2638	#endif
2584	scr_xor_span (selection.beg.row, selection.beg.col,	2639	scr_xor_span (selection.beg.row, selection.beg.col,
2585	selection.end.row, selection.end.col,	2640	selection.end.row, selection.end.col,
2586	RS_RVid);	2641	RS_Sel | RS_RVid);
2587	}	2642	}
2588	}	2643	}
2589		2644
2590	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2591	/*	2646	/*
…		…
2596	void	2651	void
2597	rxvt_term::scr_dump (int fd) NOTHROW	2652	rxvt_term::scr_dump (int fd) NOTHROW
2598	{	2653	{
2599	int row, wrote;	2654	int row, wrote;
2600	unsigned int width, towrite;	2655	unsigned int width, towrite;
2601	char r1[] = "\n";	2656	const char r1[] = "\n";
2602		2657
2603	for (row = saveLines + top_row;	2658	for (row = saveLines + top_row;
2604	row < saveLines + nrow - 1; row++)	2659	row < saveLines + nrow - 1; row++)
2605	{	2660	{
2606	width = row_buf[row].l >= 0 ? row_buf[row].l	2661	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2623	* CHARACTER SELECTION *	2678	* CHARACTER SELECTION *
2624	* ------------------------------------------------------------------------- */	2679	* ------------------------------------------------------------------------- */
2625	void	2680	void
2626	rxvt_term::selection_check (int check_more) NOTHROW	2681	rxvt_term::selection_check (int check_more) NOTHROW
2627	{	2682	{
2628	row_col_t pos;
2629
2630	if (!selection.op)	2683	if (!selection.op)
2631	return;	2684	return;
2632		2685
		2686	row_col_t pos;
2633	pos.row = pos.col = 0;	2687	pos.row = pos.col = 0;
		2688
2634	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2635	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2690	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2636	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2691	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2637	|| (check_more == 1	2692	|| (check_more == 1
2638	&& current_screen == selection.screen	2693	&& current_screen == selection.screen
…		…
2644	|| (check_more == 3	2699	|| (check_more == 3
2645	&& ROWCOL_IS_AFTER (selection.end, pos))	2700	&& ROWCOL_IS_AFTER (selection.end, pos))
2646	|| (check_more == 4 /* screen width change */	2701	|| (check_more == 4 /* screen width change */
2647	&& (selection.beg.row != selection.end.row	2702	&& (selection.beg.row != selection.end.row
2648	|| selection.end.col > ncol)))	2703	|| selection.end.col > ncol)))
2649	CLEAR_SELECTION ();	2704	CLEAR_ALL_SELECTION ();
2650	}	2705	}
2651		2706
2652	/* ------------------------------------------------------------------------- */	2707	/* ------------------------------------------------------------------------- */
2653	/*	2708	/*
2654	* Paste a selection direct to the command fd	2709	* Paste a selection direct to the command fd
2655	*/	2710	*/
2656	void	2711	void
2657	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2712	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658	{	2713	{
2659	/* convert normal newline chars into common keyboard Return key sequence */	2714	/* convert normal newline chars into common keyboard Return key sequence */
2660	for (unsigned int i = 0; i < len; i++)	2715	for (unsigned int i = 0; i < len; i++)
2661	if (data[i] == C0_LF)	2716	if (data[i] == C0_LF)
2662	data[i] = C0_CR;	2717	data[i] = C0_CR;
…		…
2668		2723
2669	if (priv_modes & PrivMode_BracketPaste)	2724	if (priv_modes & PrivMode_BracketPaste)
2670	tt_printf ("\e[201~");	2725	tt_printf ("\e[201~");
2671	}	2726	}
2672		2727
2673	/* ------------------------------------------------------------------------- */
2674	/*
2675	* Respond to a notification that a primary selection has been sent
2676	* EXT: SelectionNotify
2677	*/
2678	void	2728	void
2679	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2729	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680	{	2730	{
2681	if (prop == None) /* check for failed XConvertSelection */	2731	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;	2732	return;
2856		2733
2857	selection_paste (win, prop, true);	2734	tt_paste (data, len);
2858	}	2735	}
2859		2736
2860	/* ------------------------------------------------------------------------- */	2737	/* ------------------------------------------------------------------------- */
2861	/*	2738	/*
2862	* Request the current selection:	2739	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863	* Order: > internal selection if available	2740	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2741	* 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	2742	* EXT: button 2 release
2869	*/	2743	*/
2870	void	2744	void
2871	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2745	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872	{	2746	{
2873	if (selection.text && selnum == Sel_Primary)	2747	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	}	2748	{
2881	else	2749	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2750	selection_req->run ();
2882	{	2751	}
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	}	2752	}
2924		2753
2925	/* ------------------------------------------------------------------------- */	2754	/* ------------------------------------------------------------------------- */
2926	/*	2755	/*
2927	* Clear all selected text	2756	* Clear all selected text
2928	* EXT: SelectionClear	2757	* EXT: SelectionClear
2929	*/	2758	*/
2930	void	2759	void
2931	rxvt_term::selection_clear () NOTHROW	2760	rxvt_term::selection_clear (bool clipboard) NOTHROW
2932	{	2761	{
		2762	if (!clipboard)
		2763	{
2933	want_refresh = 1;	2764	want_refresh = 1;
2934	free (selection.text);	2765	free (selection.text);
2935	selection.text = NULL;	2766	selection.text = NULL;
2936	selection.len = 0;	2767	selection.len = 0;
2937	CLEAR_SELECTION ();	2768	CLEAR_SELECTION ();
2938		2769
2939	if (display->selection_owner == this)	2770	if (display->selection_owner == this)
2940	display->selection_owner = 0;	2771	display->selection_owner = 0;
		2772	}
		2773	else
		2774	{
		2775	free (selection.clip_text);
		2776	selection.clip_text = NULL;
		2777	selection.clip_len = 0;
		2778
		2779	if (display->clipboard_owner == this)
		2780	display->clipboard_owner = 0;
		2781	}
2941	}	2782	}
2942		2783
2943	/* ------------------------------------------------------------------------- */	2784	/* ------------------------------------------------------------------------- */
2944	/*	2785	/*
2945	* Copy a selection into the cut buffer	2786	* Copy a selection into the cut buffer
2946	* EXT: button 1 or 3 release	2787	* EXT: button 1 or 3 release
2947	*/	2788	*/
2948	void	2789	void
2949	rxvt_term::selection_make (Time tm)	2790	rxvt_term::selection_make (Time tm)
2950	{	2791	{
2951	int i;	2792	int size;
2952	wchar_t *new_selection_text;	2793	wchar_t *new_selection_text;
2953	text_t *t;	2794	text_t *t;
2954		2795
2955	switch (selection.op)	2796	switch (selection.op)
2956	{	2797	{
…		…
2972	return; /* nothing selected, go away */	2813	return; /* nothing selected, go away */
2973		2814
2974	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2815	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975	return;	2816	return;
2976		2817
2977	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2818	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2819	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979		2820
2980	int ofs = 0;	2821	int ofs = 0;
2981	int extra = 0;	2822	int extra = 0;
2982		2823
2983	int col = selection.beg.col;	2824	int col = selection.beg.col;
…		…
2989	{	2830	{
2990	#if !ENABLE_MINIMAL	2831	#if !ENABLE_MINIMAL
2991	if (selection.rect)	2832	if (selection.rect)
2992	{	2833	{
2993	col = selection.beg.col;	2834	col = selection.beg.col;
2994	end_col = ncol + 1;	2835	end_col = selection.end.col;
2995	}	2836	}
2996	else	2837	else
2997	#endif	2838	#endif
2998	end_col = ROW(row).l;	2839	end_col = ROW(row).l;
2999		2840
3000	col = max (col, 0);	2841	col = max (col, 0);
3001		2842
3002	if (row == selection.end.row	2843	if (row == selection.end.row)
3003	#if !ENABLE_MINIMAL
3004	|| selection.rect
3005	#endif
3006	)
3007	min_it (end_col, selection.end.col);	2844	min_it (end_col, selection.end.col);
3008		2845
3009	t = ROW(row).t + col;	2846	t = ROW(row).t + col;
3010		2847
3011	for (; col < end_col; col++)	2848	for (; col < end_col; col++)
…		…
3019		2856
3020	extra -= (len - 1);	2857	extra -= (len - 1);
3021		2858
3022	if (extra < 0)	2859	if (extra < 0)
3023	{	2860	{
3024	extra += i;	2861	extra += size;
3025	i += i;	2862	size += size;
3026	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2863	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027	}	2864	}
3028		2865
3029	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2866	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030	}	2867	}
3031	#endif	2868	#endif
…		…
3043		2880
3044	new_selection_text[ofs++] = C0_LF;	2881	new_selection_text[ofs++] = C0_LF;
3045	}	2882	}
3046	else	2883	else
3047	#endif	2884	#endif
3048	if (!ROW(row).is_longer () && row != selection.end.row)	2885	if (!ROW(row).is_longer ()
		2886	&& (row != selection.end.row || end_col != selection.end.col)
		2887	&& (row != selection.beg.row || selection.beg.col < ncol))
3049	new_selection_text[ofs++] = C0_LF;	2888	new_selection_text[ofs++] = C0_LF;
3050	}	2889	}
3051
3052	if (end_col != selection.end.col)
3053	new_selection_text[ofs++] = C0_LF;
3054		2890
3055	new_selection_text[ofs] = 0;	2891	new_selection_text[ofs] = 0;
3056		2892
3057	if (ofs == 0)	2893	if (ofs == 0)
3058	{	2894	{
…		…
3071		2907
3072	selection_grab (tm);	2908	selection_grab (tm);
3073	}	2909	}
3074		2910
3075	bool	2911	bool
3076	rxvt_term::selection_grab (Time tm) NOTHROW	2912	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077	{	2913	{
		2914	Atom sel;
		2915
		2916	if (!clipboard)
		2917	{
3078	selection_time = tm;	2918	selection_time = tm;
		2919	sel = XA_PRIMARY;
		2920	}
		2921	else
		2922	{
		2923	clipboard_time = tm;
		2924	sel = xa[XA_CLIPBOARD];
		2925	}
3079		2926
3080	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2927	XSetSelectionOwner (dpy, sel, vt, tm);
3081	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2928	if (XGetSelectionOwner (dpy, sel) == vt)
3082	{	2929	{
3083	display->set_selection_owner (this);	2930	display->set_selection_owner (this, clipboard);
3084	return true;	2931	return true;
3085	}	2932	}
3086	else	2933	else
3087	{	2934	{
3088	selection_clear ();	2935	selection_clear (clipboard);
3089	return false;	2936	return false;
3090	}	2937	}
3091		2938
3092	#if 0	2939	#if 0
3093	XTextProperty ct;	2940	XTextProperty ct;
…		…
3553	* EXT: SelectionRequest	3400	* EXT: SelectionRequest
3554	*/	3401	*/
3555	void	3402	void
3556	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3403	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3557	{	3404	{
		3405	Atom property = rq.property == None ? rq.target : rq.property;
3558	XSelectionEvent ev;	3406	XSelectionEvent ev;
3559		3407
3560	ev.type = SelectionNotify;	3408	ev.type = SelectionNotify;
3561	ev.property = None;	3409	ev.property = None;
3562	ev.display = rq.display;	3410	ev.display = rq.display;
…		…
3577	*target++ = xa[XA_COMPOUND_TEXT];	3425	*target++ = xa[XA_COMPOUND_TEXT];
3578	#if X_HAVE_UTF8_STRING	3426	#if X_HAVE_UTF8_STRING
3579	*target++ = xa[XA_UTF8_STRING];	3427	*target++ = xa[XA_UTF8_STRING];
3580	#endif	3428	#endif
3581		3429
3582	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3430	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3583	32, PropModeReplace,	3431	32, PropModeReplace,
3584	(unsigned char *)target_list, target - target_list);	3432	(unsigned char *)target_list, target - target_list);
3585	ev.property = rq.property;	3433	ev.property = property;
3586	}	3434	}
3587	#if TODO // TODO	3435	#if TODO // TODO
3588	else if (rq.target == xa[XA_MULTIPLE])	3436	else if (rq.target == xa[XA_MULTIPLE])
3589	{	3437	{
3590	/* TODO: Handle MULTIPLE */	3438	/* TODO: Handle MULTIPLE */
3591	}	3439	}
3592	#endif	3440	#endif
3593	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3441	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594	{	3442	{
3595	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3443	XChangeProperty (dpy, rq.requestor, property, rq.target,
3596	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3444	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3597	ev.property = rq.property;	3445	ev.property = property;
		3446	}
		3447	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3448	{
		3449	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3450	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3451	ev.property = property;
3598	}	3452	}
3599	else if (rq.target == XA_STRING	3453	else if (rq.target == XA_STRING
3600	|| rq.target == xa[XA_TEXT]	3454	|| rq.target == xa[XA_TEXT]
3601	|| rq.target == xa[XA_COMPOUND_TEXT]	3455	|| rq.target == xa[XA_COMPOUND_TEXT]
3602	|| rq.target == xa[XA_UTF8_STRING]	3456	|| rq.target == xa[XA_UTF8_STRING]
…		…
3634	{	3488	{
3635	target = xa[XA_COMPOUND_TEXT];	3489	target = xa[XA_COMPOUND_TEXT];
3636	style = enc_compound_text;	3490	style = enc_compound_text;
3637	}	3491	}
3638		3492
3639	if (selection.text)	3493	if (rq.selection == XA_PRIMARY && selection.text)
3640	{	3494	{
3641	cl = selection.text;	3495	cl = selection.text;
3642	selectlen = selection.len;	3496	selectlen = selection.len;
		3497	}
		3498	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3499	{
		3500	cl = selection.clip_text;
		3501	selectlen = selection.clip_len;
3643	}	3502	}
3644	else	3503	else
3645	{	3504	{
3646	cl = L"";	3505	cl = L"";
3647	selectlen = 0;	3506	selectlen = 0;
…		…
3668	ct.value = (unsigned char *)cl;	3527	ct.value = (unsigned char *)cl;
3669	ct.nitems = selectlen;	3528	ct.nitems = selectlen;
3670	ct.encoding = target;	3529	ct.encoding = target;
3671	}	3530	}
3672		3531
3673	XChangeProperty (dpy, rq.requestor, rq.property,	3532	XChangeProperty (dpy, rq.requestor, property,
3674	ct.encoding, 8, PropModeReplace,	3533	ct.encoding, 8, PropModeReplace,
3675	ct.value, (int)ct.nitems);	3534	ct.value, (int)ct.nitems);
3676	ev.property = rq.property;	3535	ev.property = property;
3677		3536
3678	if (freect)	3537	if (freect)
3679	XFree (ct.value);	3538	XFree (ct.value);
3680	}	3539	}
3681		3540
…		…
3715	h += 2; min_it (h, nrow);	3574	h += 2; min_it (h, nrow);
3716		3575
3717	x -= 1; clamp_it (x, 0, ncol - w);	3576	x -= 1; clamp_it (x, 0, ncol - w);
3718	y -= 1; clamp_it (y, 0, nrow - h);	3577	y -= 1; clamp_it (y, 0, nrow - h);
3719		3578
3720	ov_x = x; ov_y = y;	3579	ov.x = x; ov.y = y;
3721	ov_w = w; ov_h = h;	3580	ov.w = w; ov.h = h;
3722		3581
3723	ov_text = new text_t *[h];	3582	ov.text = new text_t *[h];
3724	ov_rend = new rend_t *[h];	3583	ov.rend = new rend_t *[h];
3725		3584
3726	for (y = 0; y < h; y++)	3585	for (y = 0; y < h; y++)
3727	{	3586	{
3728	text_t *tp = ov_text[y] = new text_t[w];	3587	text_t *tp = ov.text[y] = new text_t[w];
3729	rend_t *rp = ov_rend[y] = new rend_t[w];	3588	rend_t *rp = ov.rend[y] = new rend_t[w];
3730		3589
3731	text_t t0, t1, t2;	3590	text_t t0, t1, t2;
3732	rend_t r = OVERLAY_RSTYLE;	3591	rend_t r = OVERLAY_RSTYLE;
3733		3592
3734	if (y == 0)	3593	if (y == 0)
…		…
3753	}	3612	}
3754		3613
3755	void	3614	void
3756	rxvt_term::scr_overlay_off () NOTHROW	3615	rxvt_term::scr_overlay_off () NOTHROW
3757	{	3616	{
3758	if (!ov_text)	3617	if (!ov.text)
3759	return;	3618	return;
3760		3619
3761	want_refresh = 1;	3620	want_refresh = 1;
3762		3621
3763	for (int y = 0; y < ov_h; y++)	3622	for (int y = 0; y < ov.h; y++)
3764	{	3623	{
3765	delete [] ov_text[y];	3624	delete [] ov.text[y];
3766	delete [] ov_rend[y];	3625	delete [] ov.rend[y];
3767	}	3626	}
3768		3627
3769	delete [] ov_text; ov_text = 0;	3628	delete [] ov.text; ov.text = 0;
3770	delete [] ov_rend; ov_rend = 0;	3629	delete [] ov.rend; ov.rend = 0;
3771	}	3630	}
3772		3631
3773	void	3632	void
3774	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3633	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775	{	3634	{
3776	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3635	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777	return;	3636	return;
3778		3637
3779	x++, y++;	3638	x++, y++;
3780		3639
3781	ov_text[y][x] = text;	3640	ov.text[y][x] = text;
3782	ov_rend[y][x] = rend;	3641	ov.rend[y][x] = rend;
3783	}	3642	}
3784		3643
3785	void	3644	void
3786	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3645	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787	{	3646	{
…		…
3806	}	3665	}
3807		3666
3808	void	3667	void
3809	rxvt_term::scr_swap_overlay () NOTHROW	3668	rxvt_term::scr_swap_overlay () NOTHROW
3810	{	3669	{
3811	if (!ov_text)	3670	if (!ov.text)
3812	return;	3671	return;
3813		3672
		3673	// hide cursor if it is within the overlay area
		3674	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3675	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3676	screen.flags &= ~Screen_VisibleCursor;
		3677
3814	// swap screen mem with overlay	3678	// swap screen mem with overlay
3815	for (int y = ov_h; y--; )	3679	for (int y = ov.h; y--; )
3816	{	3680	{
3817	text_t *t1 = ov_text[y];	3681	text_t *t1 = ov.text[y];
3818	rend_t *r1 = ov_rend[y];	3682	rend_t *r1 = ov.rend[y];
3819		3683
3820	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3684	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;	3685	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822		3686
3823	for (int x = ov_w; x--; )	3687	for (int x = ov.w; x--; )
3824	{	3688	{
3825	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3689	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3690	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827	}	3691	}
3828	}	3692	}

Diff Legend

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