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.303 by ayin, Sat Feb 16 13:35:45 2008 UTC vs.
Revision 1.384 by sf-exg, Mon May 30 18:39:04 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	* ------------------------------------------------------------------------- */
…		…
83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	82	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	83	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	84	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86		85
87	/*	86	/*
88	* CLEAR_ROWS : clear <num> rows starting from row <row>
89	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	87	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91	*/	88	*/
92	#define CLEAR_ROWS(row, num) \
93	if (mapped) \
94	XClearArea (dpy, vt, 0, \
95	Row2Pixel (row), (unsigned int)width, \
96	(unsigned int)Height2Pixel (num), False)
97
98	#define CLEAR_CHARS(x, y, num) \	89	#define CLEAR_CHARS(x, y, num) \
99	if (mapped) \	90	if (mapped) \
100	XClearArea (dpy, vt, x, y, \	91	XClearArea (dpy, vt, x, y, \
101	(unsigned int)Width2Pixel (num), \	92	(unsigned int)Width2Pixel (num), \
102	(unsigned int)Height2Pixel (1), False)	93	(unsigned int)Height2Pixel (1), False)
103		94
104	#define ERASE_ROWS(row, num) \
105	XFillRectangle (dpy, vt, gc, \
106	0, Row2Pixel (row), \
107	(unsigned int)width, \
108	(unsigned int)Height2Pixel (num))
109
110	/* ------------------------------------------------------------------------- *	95	/* ------------------------------------------------------------------------- *
111	* SCREEN `COMMON' ROUTINES *	96	* SCREEN `COMMON' ROUTINES *
112	* ------------------------------------------------------------------------- */	97	* ------------------------------------------------------------------------- */
113		98
114	/* Fill part/all of a line with blanks. */	99	/* Fill part/all of a line with blanks. */
…		…
146		131
147	l.l = 0;	132	l.l = 0;
148	l.f = 0;	133	l.f = 0;
149	}	134	}
150		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
151	/* ------------------------------------------------------------------------- *	157	/* ------------------------------------------------------------------------- *
152	* SCREEN INITIALISATION *	158	* SCREEN INITIALISATION *
153	* ------------------------------------------------------------------------- */	159	* ------------------------------------------------------------------------- */
154		160
155	void	161	void
…		…
157	{	163	{
158	#if ENABLE_OVERLAY	164	#if ENABLE_OVERLAY
159	scr_overlay_off ();	165	scr_overlay_off ();
160	#endif	166	#endif
161		167
162	rvideo_mode = false;
163	view_start = 0;	168	view_start = 0;
164	num_scr = 0;	169	num_scr = 0;
165		170
166	if (ncol == 0)	171	if (ncol == 0)
167	ncol = 80;	172	ncol = 80;
…		…
169	if (nrow == 0)	174	if (nrow == 0)
170	nrow = 24;	175	nrow = 24;
171		176
172	if (ncol == prev_ncol && nrow == prev_nrow)	177	if (ncol == prev_ncol && nrow == prev_nrow)
173	return;	178	return;
174
175	if (current_screen != PRIMARY)
176	scr_swap_screen ();
177		179
178	// we need at least two lines for wrapping to work correctly	180	// we need at least two lines for wrapping to work correctly
179	while (nrow + saveLines < 2)	181	while (nrow + saveLines < 2)
180	{	182	{
181	//TODO//FIXME	183	//TODO//FIXME
…		…
234	selection.text = NULL;	236	selection.text = NULL;
235	selection.len = 0;	237	selection.len = 0;
236	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
237	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
238	selection.clicks = 0;	240	selection.clicks = 0;
		241	selection.clip_text = NULL;
		242	selection.clip_len = 0;
239	}	243	}
240	else	244	else
241	{	245	{
242	/*	246	/*
243	* add or delete rows as appropriate	247	* add or delete rows as appropriate
…		…
281		285
282	if (top_row)	286	if (top_row)
283	{	287	{
284	// 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
285	// 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
286		291
287	row_col_t ocur = screen.cur;	292	row_col_t ocur = screen.cur;
288	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289		294
290	do	295	do
291	{	296	{
292	p = MOD (p - 1, prev_total_rows);	297	p = MOD (p - 1, prev_total_rows);
293	#ifdef DEBUG_STRICT
294	assert (old_buf [MOD (p, prev_total_rows)].t);	298	assert (old_buf [MOD (p, prev_total_rows)].t);
295	#endif
296	int plines = 1;	299	int plines = 1;
297	int llen = old_buf [MOD (p, prev_total_rows)].l;	300	int llen = old_buf [MOD (p, prev_total_rows)].l;
298		301
299	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 ())
300	{	303	{
…		…
394	delete old_ta;	397	delete old_ta;
395	delete old_ra;	398	delete old_ra;
396		399
397	clamp_it (screen.cur.row, 0, nrow - 1);	400	clamp_it (screen.cur.row, 0, nrow - 1);
398	clamp_it (screen.cur.col, 0, ncol - 1);	401	clamp_it (screen.cur.col, 0, ncol - 1);
		402	}
399		403
400	free (tabs);	404	free (tabs);
401	}	405	tabs = (char *)rxvt_malloc (ncol);
		406
		407	for (int col = ncol; col--; )
		408	tabs [col] = col % TABSIZE == 0;
402		409
403	CLEAR_ALL_SELECTION ();	410	CLEAR_ALL_SELECTION ();
404		411
405	prev_nrow = nrow;	412	prev_nrow = nrow;
406	prev_ncol = ncol;	413	prev_ncol = ncol;
407
408	tabs = (char *)rxvt_malloc (ncol);
409
410	for (int col = ncol; --col; )
411	tabs [col] = col % TABSIZE == 0;
412
413	if (current_screen != PRIMARY)
414	scr_swap_screen ();
415		414
416	tt_winch ();	415	tt_winch ();
417		416
418	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
419	}	418	}
…		…
431	delete ralloc; ralloc = 0;	430	delete ralloc; ralloc = 0;
432		431
433	free (row_buf);	432	free (row_buf);
434	free (swap_buf);	433	free (swap_buf);
435	free (drawn_buf);	434	free (drawn_buf);
		435	row_buf = 0; // signal that we freed all the arrays above
		436
436	free (tabs);	437	free (tabs);
437		438	tabs = 0;
438	row_buf = 0; // signal that we freed all the arrays
439	}	439	}
440	}	440	}
441		441
442	/* ------------------------------------------------------------------------- */	442	/* ------------------------------------------------------------------------- */
443	/*	443	/*
444	* Hard reset	444	* Hard/Soft reset
445	*/	445	*/
446	void	446	void
447	rxvt_term::scr_poweron ()	447	rxvt_term::scr_poweron ()
448	{	448	{
449	scr_release ();	449	scr_release ();
450	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
		451	rvideo_mode = false;
		452	scr_soft_reset ();
451	scr_reset ();	453	scr_reset ();
452		454
453	scr_clear (true);	455	scr_clear (true);
454	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);
455	}	473	}
456		474
457	/* ------------------------------------------------------------------------- *	475	/* ------------------------------------------------------------------------- *
458	* PROCESS SCREEN COMMANDS *	476	* PROCESS SCREEN COMMANDS *
459	* ------------------------------------------------------------------------- */	477	* ------------------------------------------------------------------------- */
…		…
497	}	515	}
498		516
499	/* boundary check in case screen size changed between SAVE and RESTORE */	517	/* boundary check in case screen size changed between SAVE and RESTORE */
500	min_it (s->cur.row, nrow - 1);	518	min_it (s->cur.row, nrow - 1);
501	min_it (s->cur.col, ncol - 1);	519	min_it (s->cur.col, ncol - 1);
502	#ifdef DEBUG_STRICT
503	assert (s->cur.row >= 0);	520	assert (s->cur.row >= 0);
504	assert (s->cur.col >= 0);	521	assert (s->cur.col >= 0);
505	#endif
506	}	522	}
507		523
508	void	524	void
509	rxvt_term::scr_swap_screen ()	525	rxvt_term::scr_swap_screen ()
510	{	526	{
…		…
535	want_refresh = 1;	551	want_refresh = 1;
536	view_start = 0;	552	view_start = 0;
537		553
538	selection_check (2); /* check for boundary cross */	554	selection_check (2); /* check for boundary cross */
539		555
540	int i = current_screen; current_screen = scrn; scrn = i;	556	current_screen = scrn;
541		557
542	#if NSCREENS	558	#if NSCREENS
543	if (option (Opt_secondaryScreen))	559	if (option (Opt_secondaryScreen))
544	{	560	{
545	num_scr = 0;	561	num_scr = 0;
…		…
770	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	786	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
771	screen.cur.row -= minlines;	787	screen.cur.row -= minlines;
772	}	788	}
773	}	789	}
774		790
775	#ifdef DEBUG_STRICT
776	assert (screen.cur.col < ncol);	791	assert (screen.cur.col < ncol);
777	assert (screen.cur.row < nrow	792	assert (screen.cur.row < nrow
778	&& screen.cur.row >= top_row);	793	&& screen.cur.row >= top_row);
779	#endif
780	int row = screen.cur.row;	794	int row = screen.cur.row;
781		795
782	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	796	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
783		797
784	line_t *line = &ROW(row);	798	line_t *line = &ROW(row);
785		799
786	while (str < strend)	800	while (str < strend)
787	{	801	{
788	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	802	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789		803
790	if (c < 0x20)	804	if (ecb_unlikely (c < 0x20))
791	if (c == C0_LF)	805	if (c == C0_LF)
792	{	806	{
793	max_it (line->l, screen.cur.col);	807	max_it (line->l, screen.cur.col);
794		808
795	screen.flags &= ~Screen_WrapNext;	809	screen.flags &= ~Screen_WrapNext;
…		…
814	{	828	{
815	scr_tab (1, true);	829	scr_tab (1, true);
816	continue;	830	continue;
817	}	831	}
818		832
		833	if (ecb_unlikely (
819	if (checksel /* see if we're writing within selection */	834	checksel /* see if we're writing within selection */
820	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	835	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	836	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		837	))
822	{	838	{
823	checksel = 0;	839	checksel = 0;
824	/*	840	/*
825	* If we wrote anywhere in the selected area, kill the selection	841	* If we wrote anywhere in the selected area, kill the selection
826	* XXX: should we kill the mark too? Possibly, but maybe that	842	* XXX: should we kill the mark too? Possibly, but maybe that
827	* should be a similar check.	843	* should be a similar check.
828	*/	844	*/
829	CLEAR_SELECTION ();	845	CLEAR_SELECTION ();
830	}	846	}
831		847
832	if (screen.flags & Screen_WrapNext)	848	if (ecb_unlikely (screen.flags & Screen_WrapNext))
833	{	849	{
834	scr_do_wrap ();	850	scr_do_wrap ();
835		851
836	line->l = ncol;	852	line->l = ncol;
837	line->is_longer (1);	853	line->is_longer (1);
…		…
839	row = screen.cur.row;	855	row = screen.cur.row;
840	line = &ROW(row); /* _must_ refresh */	856	line = &ROW(row); /* _must_ refresh */
841	}	857	}
842		858
843	// some utf-8 decoders "decode" surrogate characters: let's fix this.	859	// some utf-8 decoders "decode" surrogate characters: let's fix this.
844	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	860	if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845	c = 0xfffd;	861	c = 0xfffd;
846		862
847	// rely on wcwidth to tell us the character width, do wcwidth before	863	// rely on wcwidth to tell us the character width, do wcwidth before
848	// further replacements, as wcwidth might return -1 for the line	864	// further replacements, as wcwidth might return -1 for the line
849	// drawing characters below as they might be invalid in the current	865	// drawing characters below as they might be invalid in the current
850	// locale.	866	// locale.
851	int width = WCWIDTH (c);	867	int width = WCWIDTH (c);
852		868
853	if (charsets [screen.charset] == '0') // DEC SPECIAL	869	if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
854	{	870	{
855	// vt100 special graphics and line drawing	871	// vt100 special graphics and line drawing
856	// 5f-7e standard vt100	872	// 5f-7e standard vt100
857	// 40-5e rxvt extension for extra curses acs chars	873	// 40-5e rxvt extension for extra curses acs chars
858	static uint16_t vt100_0[62] = { // 41 .. 7e	874	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
871	c = vt100_0[c - 0x41];	887	c = vt100_0[c - 0x41];
872	width = 1; // vt100 line drawing characters are always single-width	888	width = 1; // vt100 line drawing characters are always single-width
873	}	889	}
874	}	890	}
875		891
876	if (screen.flags & Screen_Insert)	892	if (ecb_unlikely (screen.flags & Screen_Insert))
877	scr_insdel_chars (width, INSERT);	893	scr_insdel_chars (width, INSERT);
878		894
879	if (width != 0)	895	if (width != 0)
880	{	896	{
881	#if !UNICODE_3	897	#if !UNICODE_3
…		…
886	# else	902	# else
887	c = 0xfffd;	903	c = 0xfffd;
888	# endif	904	# endif
889	#endif	905	#endif
890		906
		907	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		908
		909	// if the character doesn't fit into the remaining columns...
		910	if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
		911	{
		912	if (screen.flags & Screen_Autowrap)
		913	{
		914	// ... artificially enlargen the previous one
		915	c = NOCHAR;
		916	// and try the same character next loop iteration
		917	--str;
		918	}
		919	else
		920	screen.cur.col = ncol - width;
		921	}
		922
891	// nuke the character at this position, if required	923	// nuke the character at this position, if required
		924	// due to wonderful coincidences everywhere else in this loop
		925	// we never have to check for overwriting a wide char itself,
		926	// only its tail.
892	if (line->t[screen.cur.col] == NOCHAR	927	if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
893	|| (screen.cur.col < ncol - 1	928	scr_kill_char (*line, screen.cur.col);
894	&& line->t[screen.cur.col + 1] == NOCHAR))
895	{
896	int col = screen.cur.col;
897
898	// find begin
899	while (col > 0 && line->t[col] == NOCHAR)
900	col--;
901
902	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904	// found begin, nuke
905	do {
906	line->t[col] = ' ';
907	line->r[col] = rend;
908	col++;
909	} while (col < ncol && line->t[col] == NOCHAR);
910	}
911
912	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914	// if the character doesn't fit into the remaining columns...
915	if (screen.cur.col > ncol - width && ncol >= width)
916	{
917	// ...output spaces
918	c = ' ';
919	// and try the same character next loop iteration
920	--str;
921	}
922		929
923	line->touch ();	930	line->touch ();
924		931
925	do	932	do
926	{	933	{
927	line->t[screen.cur.col] = c;	934	line->t[screen.cur.col] = c;
928	line->r[screen.cur.col] = rend;	935	line->r[screen.cur.col] = rend;
929		936
930	if (screen.cur.col < ncol - 1)	937	if (ecb_likely (screen.cur.col < ncol - 1))
931	screen.cur.col++;	938	screen.cur.col++;
932	else	939	else
933	{	940	{
934	line->l = ncol;	941	line->l = ncol;
935	if (screen.flags & Screen_Autowrap)	942	if (screen.flags & Screen_Autowrap)
936	screen.flags |= Screen_WrapNext;	943	screen.flags |= Screen_WrapNext;
937	break;	944
		945	goto end_of_line;
938	}	946	}
939		947
940	c = NOCHAR;	948	c = NOCHAR;
941	}	949	}
942	while (--width > 0);	950	while (ecb_unlikely (--width > 0));
943		951
944	// pad with spaces when overwriting wide character with smaller one	952	// pad with spaces when overwriting wide character with smaller one
945	if (!width)	953	for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
946	{	954	{
947	line->touch ();	955	line->t[c] = ' ';
		956	line->r[c] = rend;
		957	}
948		958
949	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	959	end_of_line:
		960	;
		961	}
		962	#if ENABLE_COMBINING
		963	else // width == 0
		964	{
		965	if (c != 0xfeff) // ignore BOM
		966	{
		967	// handle combining characters
		968	// we just tag the accent on the previous on-screen character.
		969	// this is arguably not correct, but also arguably not wrong.
		970	// we don't handle double-width characters nicely yet.
		971	line_t *linep;
		972	text_t *tp;
		973	rend_t *rp;
		974
		975	if (screen.cur.col > 0)
950	{	976	{
951	line->t[c] = ' ';
952	line->r[c] = rend;	977	linep = line;
		978	tp = line->t + screen.cur.col - 1;
		979	rp = line->r + screen.cur.col - 1;
953	}	980	}
		981	else if (screen.cur.row > 0
		982	&& ROW(screen.cur.row - 1).is_longer ())
		983	{
		984	linep = &ROW(screen.cur.row - 1);
		985	tp = line->t + ncol - 1;
		986	rp = line->r + ncol - 1;
		987	}
		988	else
		989	continue;
		990
		991	linep->touch ();
		992
		993	while (*tp == NOCHAR && tp > linep->t)
		994	tp--, rp--;
		995
		996	// first try to find a precomposed character
		997	unicode_t n = rxvt_compose (*tp, c);
		998	if (n == NOCHAR)
		999	n = rxvt_composite.compose (*tp, c);
		1000
		1001	*tp = n;
		1002	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
954	}	1003	}
955	}	1004	}
956	else // width == 0
957	{
958	#if ENABLE_COMBINING
959	// handle combining characters
960	// we just tag the accent on the previous on-screen character.
961	// this is arguably not correct, but also arguably not wrong.
962	// we don't handle double-width characters nicely yet.
963	line_t *linep;
964	text_t *tp;
965	rend_t *rp;
966
967	if (screen.cur.col > 0)
968	{
969	linep = line;
970	tp = line->t + screen.cur.col - 1;
971	rp = line->r + screen.cur.col - 1;
972	}
973	else if (screen.cur.row > 0
974	&& ROW(screen.cur.row - 1).is_longer ())
975	{
976	linep = &ROW(screen.cur.row - 1);
977	tp = line->t + ncol - 1;
978	rp = line->r + ncol - 1;
979	}
980	else
981	continue;
982
983	linep->touch ();
984
985	while (*tp == NOCHAR && tp > linep->t)
986	tp--, rp--;
987
988	// first try to find a precomposed character
989	unicode_t n = rxvt_compose (*tp, c);
990	if (n == NOCHAR)
991	n = rxvt_composite.compose (*tp, c);
992
993	*tp = n;
994	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995	#endif	1005	#endif
996	}
997	}	1006	}
998		1007
999	max_it (line->l, screen.cur.col);	1008	max_it (line->l, screen.cur.col);
1000		1009
1001	#ifdef DEBUG_STRICT
1002	assert (screen.cur.row >= 0);	1010	assert (screen.cur.row >= 0);
1003	#endif
1004	}	1011	}
1005		1012
1006	/* ------------------------------------------------------------------------- */	1013	/* ------------------------------------------------------------------------- */
1007	/*	1014	/*
1008	* Process Backspace. Move back the cursor back a position, wrap if have to	1015	* Process Backspace. Move back the cursor back a position, wrap if have to
…		…
1021		1028
1022	want_refresh = 1;	1029	want_refresh = 1;
1023	#endif	1030	#endif
1024	}	1031	}
1025	}	1032	}
		1033	else if (screen.flags & Screen_WrapNext)
		1034	screen.flags &= ~Screen_WrapNext;
1026	else	1035	else
1027	scr_gotorc (0, -1, RELATIVE);	1036	scr_gotorc (0, -1, RELATIVE);
1028	}	1037	}
1029		1038
1030	/* ------------------------------------------------------------------------- */	1039	/* ------------------------------------------------------------------------- */
…		…
1225	/*	1234	/*
1226	* Erase part or whole of a line	1235	* Erase part or whole of a line
1227	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1236	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1228	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1237	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1229	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1238	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1239	* extension: clear to right unless wrapped: ESC [ 3 K
1230	*/	1240	*/
1231	void	1241	void
1232	rxvt_term::scr_erase_line (int mode) NOTHROW	1242	rxvt_term::scr_erase_line (int mode) NOTHROW
1233	{	1243	{
1234	unsigned int col, num;	1244	unsigned int col, num;
…		…
1243	line.touch ();	1253	line.touch ();
1244	line.is_longer (0);	1254	line.is_longer (0);
1245		1255
1246	switch (mode)	1256	switch (mode)
1247	{	1257	{
		1258	case 3:
		1259	if (screen.flags & Screen_WrapNext)
		1260	return;
		1261
		1262	/* fall through */
		1263
1248	case 0: /* erase to end of line */	1264	case 0: /* erase to end of line */
1249	col = screen.cur.col;	1265	col = screen.cur.col;
1250	num = ncol - col;	1266	num = ncol - col;
1251	min_it (line.l, col);	1267	min_it (line.l, col);
		1268
1252	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1269	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1253	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1270	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1254	CLEAR_SELECTION ();	1271	CLEAR_SELECTION ();
1255	break;	1272	break;
		1273
1256	case 1: /* erase to beginning of line */	1274	case 1: /* erase to beginning of line */
1257	col = 0;	1275	col = 0;
1258	num = screen.cur.col + 1;	1276	num = screen.cur.col + 1;
		1277
1259	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1278	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1260	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1279	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1261	CLEAR_SELECTION ();	1280	CLEAR_SELECTION ();
1262	break;	1281	break;
		1282
1263	case 2: /* erase whole line */	1283	case 2: /* erase whole line */
1264	col = 0;	1284	col = 0;
1265	num = ncol;	1285	num = ncol;
1266	line.l = 0;	1286	line.l = 0;
1267	if (selection.beg.row <= screen.cur.row	1287	if (selection.beg.row <= screen.cur.row
…		…
1325	if (row >= nrow) /* Out Of Bounds */	1345	if (row >= nrow) /* Out Of Bounds */
1326	return;	1346	return;
1327		1347
1328	min_it (num, nrow - row);	1348	min_it (num, nrow - row);
1329		1349
1330	if (rstyle & (RS_RVid | RS_Uline))	1350	if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1331	ren = (rend_t) ~RS_None;	1351	ren = (rend_t) ~RS_None;
1332	else if (GET_BASEBG (rstyle) == Color_bg)	1352	else if (GET_BASEBG (rstyle) == Color_bg)
1333	{	1353	{
1334	ren = DEFAULT_RSTYLE;	1354	ren = DEFAULT_RSTYLE;
1335	CLEAR_ROWS (row, num);	1355
		1356	if (mapped)
		1357	XClearArea (dpy, vt, 0,
		1358	Row2Pixel (row - view_start), (unsigned int)width,
		1359	(unsigned int)Height2Pixel (num), False);
1336	}	1360	}
1337	else	1361	else
1338	{	1362	{
1339	ren = rstyle & (RS_fgMask | RS_bgMask);	1363	ren = rstyle & (RS_fgMask | RS_bgMask);
		1364
		1365	if (mapped)
		1366	{
1340	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1367	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1341	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1368	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1342	ERASE_ROWS (row, num);	1369	XFillRectangle (dpy, vt, gc,
		1370	0, Row2Pixel (row - view_start),
		1371	(unsigned int)width,
		1372	(unsigned int)Height2Pixel (num));
1343	gcvalue.foreground = pix_colors[Color_fg];	1373	gcvalue.foreground = pix_colors[Color_fg];
1344	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1374	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1375	}
1345	}	1376	}
1346		1377
1347	for (; num--; row++)	1378	for (; num--; row++)
1348	{	1379	{
1349	scr_blank_screen_mem (ROW(row), rstyle);	1380	scr_blank_screen_mem (ROW(row), rstyle);
		1381
		1382	if (row - view_start < nrow)
1350	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1383	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1351	}	1384	}
1352	}	1385	}
1353		1386
1354	#if !ENABLE_MINIMAL	1387	#if !ENABLE_MINIMAL
1355	void	1388	void
…		…
1429	* Insert/Delete <count> characters from the current position	1462	* Insert/Delete <count> characters from the current position
1430	*/	1463	*/
1431	void	1464	void
1432	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1465	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1433	{	1466	{
1434	int col, row;
1435	rend_t tr;
1436
1437	want_refresh = 1;	1467	want_refresh = 1;
1438	ZERO_SCROLLBACK ();	1468	ZERO_SCROLLBACK ();
1439		1469
1440	if (count <= 0)	1470	if (count <= 0)
1441	return;	1471	return;
…		…
1443	scr_do_wrap ();	1473	scr_do_wrap ();
1444		1474
1445	selection_check (1);	1475	selection_check (1);
1446	min_it (count, ncol - screen.cur.col);	1476	min_it (count, ncol - screen.cur.col);
1447		1477
1448	row = screen.cur.row;	1478	int row = screen.cur.row;
1449		1479
1450	line_t *line = &ROW(row);	1480	line_t *line = &ROW(row);
1451		1481
1452	line->touch ();	1482	line->touch ();
1453	line->is_longer (0);	1483	line->is_longer (0);
1454		1484
		1485	// nuke wide spanning the start
		1486	if (line->t[screen.cur.col] == NOCHAR)
		1487	scr_kill_char (*line, screen.cur.col);
		1488
1455	switch (insdel)	1489	switch (insdel)
1456	{	1490	{
1457	case INSERT:	1491	case INSERT:
1458	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1492	line->l = min (line->l + count, ncol);
		1493
		1494	if (line->t[screen.cur.col] == NOCHAR)
		1495	scr_kill_char (*line, screen.cur.col);
		1496
		1497	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1459	{	1498	{
1460	line->t[col] = line->t[col - count];	1499	line->t[col] = line->t[col - count];
1461	line->r[col] = line->r[col - count];	1500	line->r[col] = line->r[col - count];
1462	}	1501	}
1463
1464	line->l = min (line->l + count, ncol);
1465		1502
1466	if (selection.op && current_screen == selection.screen	1503	if (selection.op && current_screen == selection.screen
1467	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1504	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468	{	1505	{
1469	if (selection.end.row != screen.cur.row	1506	if (selection.end.row != screen.cur.row
…		…
1484	case ERASE:	1521	case ERASE:
1485	screen.cur.col += count; /* don't worry if > ncol */	1522	screen.cur.col += count; /* don't worry if > ncol */
1486	selection_check (1);	1523	selection_check (1);
1487	screen.cur.col -= count;	1524	screen.cur.col -= count;
1488		1525
1489	line->l = max (line->l - count, 0);	1526	// nuke wide char after the end
		1527	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1528	scr_kill_char (*line, screen.cur.col + count);
		1529
1490	scr_blank_line (*line, screen.cur.col, count, rstyle);	1530	scr_blank_line (*line, screen.cur.col, count, rstyle);
1491	break;	1531	break;
1492		1532
1493	case DELETE:	1533	case DELETE:
1494	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1534	line->l = max (line->l - count, 0);
1495		1535
		1536	// nuke wide char spanning the end
		1537	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1538	scr_kill_char (*line, screen.cur.col + count);
		1539
1496	for (col = screen.cur.col; (col + count) < ncol; col++)	1540	for (int col = screen.cur.col; (col + count) < ncol; col++)
1497	{	1541	{
1498	line->t[col] = line->t[col + count];	1542	line->t[col] = line->t[col + count];
1499	line->r[col] = line->r[col + count];	1543	line->r[col] = line->r[col + count];
1500	}	1544	}
1501		1545
1502	line->l = max (line->l - count, 0);
1503	scr_blank_line (*line, ncol - count, count, tr);	1546	scr_blank_line (*line, ncol - count, count, rstyle);
1504		1547
1505	if (selection.op && current_screen == selection.screen	1548	if (selection.op && current_screen == selection.screen
1506	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1549	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1507	{	1550	{
1508	if (selection.end.row != screen.cur.row	1551	if (selection.end.row != screen.cur.row
…		…
1644	{	1687	{
1645	rvideo_state = on;	1688	rvideo_state = on;
1646		1689
1647	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1690	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648	#ifdef HAVE_BG_PIXMAP	1691	#ifdef HAVE_BG_PIXMAP
1649	if (bgPixmap.pixmap == None)	1692	if (bg_pixmap == None)
1650	#endif	1693	#endif
1651	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1694	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1652		1695
1653	XGCValues gcvalue;	1696	XGCValues gcvalue;
1654	gcvalue.foreground = pix_colors[Color_fg];	1697	gcvalue.foreground = pix_colors[Color_fg];
…		…
1798	for (i = PART_BEG; i < RC_COUNT; i++)	1841	for (i = PART_BEG; i < RC_COUNT; i++)
1799	{	1842	{
1800	min_it (rc[i].col, ncol - 1);	1843	min_it (rc[i].col, ncol - 1);
1801	min_it (rc[i].row, nrow - 1);	1844	min_it (rc[i].row, nrow - 1);
1802	}	1845	}
1803	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1846
1804	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1847	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1805	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1848	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1806		1849
1807	num_scr_allow = 0;	1850	num_scr_allow = 0;
1808		1851
…		…
1881		1924
1882	# ifndef NO_MAPALERT	1925	# ifndef NO_MAPALERT
1883	# ifdef MAPALERT_OPTION	1926	# ifdef MAPALERT_OPTION
1884	if (option (Opt_mapAlert))	1927	if (option (Opt_mapAlert))
1885	# endif	1928	# endif
1886	XMapWindow (dpy, parent[0]);	1929	XMapWindow (dpy, parent);
1887	# endif	1930	# endif
1888		1931
1889	# if ENABLE_FRILLS	1932	# if ENABLE_FRILLS
1890	if (option (Opt_urgentOnBell))	1933	if (option (Opt_urgentOnBell))
1891	{	1934	set_urgency (1);
1892	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893	{
1894	h->flags |= XUrgencyHint;
1895	XSetWMHints (dpy, parent[0], h);
1896	}
1897	}
1898	# endif	1935	# endif
1899		1936
1900	if (option (Opt_visualBell))	1937	if (option (Opt_visualBell))
1901	{	1938	{
1902	rvideo_bell = true;	1939	rvideo_bell = true;
…		…
1905		1942
1906	bell_ev.start (VISUAL_BELL_DURATION);	1943	bell_ev.start (VISUAL_BELL_DURATION);
1907	}	1944	}
1908	else	1945	else
1909	XBell (dpy, 0);	1946	XBell (dpy, 0);
		1947	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1910	#endif	1948	#endif
1911	}	1949	}
1912		1950
1913	/* ------------------------------------------------------------------------- */	1951	/* ------------------------------------------------------------------------- */
1914	/* ARGSUSED */
1915	void	1952	void
1916	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1953	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1917	{	1954	{
1918	#ifdef PRINTPIPE	1955	#ifdef PRINTPIPE
1919	int nrows, row_start;	1956	int nrows, row_start;
1920	FILE *fd;	1957	FILE *fd = popen_printer ();
1921		1958
1922	if ((fd = popen_printer ()) == NULL)	1959	if (!fd)
1923	return;	1960	return;
1924		1961
1925	if (fullhist)	1962	if (fullhist)
1926	{	1963	{
1927	nrows = nrow - top_row;	1964	nrows = nrow - top_row;
…		…
1933	row_start = view_start;	1970	row_start = view_start;
1934	}	1971	}
1935		1972
1936	wctomb (0, 0);	1973	wctomb (0, 0);
1937		1974
1938	for (int r1 = 0; r1 < nrows; r1++)	1975	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1939	{	1976	{
1940	text_t *tp = ROW(r1).t;	1977	text_t *tp = ROW(r1).t;
1941	int len = ROW(r1).l;	1978	int len = ROW(r1).l;
1942		1979
1943	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1980	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1972	* screen.text/screen.rend contain what the screen will change to.	2009	* screen.text/screen.rend contain what the screen will change to.
1973	*/	2010	*/
1974	void	2011	void
1975	rxvt_term::scr_refresh () NOTHROW	2012	rxvt_term::scr_refresh () NOTHROW
1976	{	2013	{
1977	unsigned char have_bg,
1978	showcursor; /* show the cursor */
1979	int16_t col, row, /* column/row we're processing */	2014	int16_t col, row, /* column/row we're processing */
1980	ocrow; /* old cursor row */	2015	ocrow; /* old cursor row */
1981	int i; /* tmp */	2016	int i; /* tmp */
1982	#ifndef NO_CURSORCOLOR	2017	#ifndef NO_CURSORCOLOR
1983	rend_t cc1; /* store colours at cursor position (s) */	2018	rend_t cc1; /* store colours at cursor position (s) */
…		…
1994	/*	2029	/*
1995	* A: set up vars	2030	* A: set up vars
1996	*/	2031	*/
1997	refresh_count = 0;	2032	refresh_count = 0;
1998		2033
		2034	unsigned int old_screen_flags = screen.flags;
1999	have_bg = 0;	2035	char have_bg = 0;
2000	#ifdef HAVE_BG_PIXMAP	2036	#ifdef HAVE_BG_PIXMAP
2001	have_bg = bgPixmap.pixmap != None;	2037	have_bg = bg_pixmap != None;
2002	#endif	2038	#endif
2003	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2039	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004		2040
2005	/*	2041	/*
2006	* B: reverse any characters which are selected	2042	* B: reverse any characters which are selected
2007	*/	2043	*/
2008	scr_reverse_selection ();	2044	scr_reverse_selection ();
		2045
		2046	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2047	#if ENABLE_OVERLAY
		2048	scr_swap_overlay ();
		2049	#endif
		2050
		2051	char showcursor = screen.flags & Screen_VisibleCursor;
2009		2052
2010	/*	2053	/*
2011	* C: set the cursor character (s)	2054	* C: set the cursor character (s)
2012	*/	2055	*/
2013	{	2056	{
2014	unsigned char setoldcursor;	2057	unsigned char setoldcursor;
2015		2058
2016	showcursor = (screen.flags & Screen_VisibleCursor);
2017	#ifdef CURSOR_BLINK	2059	#ifdef CURSOR_BLINK
2018	if (hidden_cursor)	2060	if (hidden_cursor)
2019	showcursor = 0;	2061	showcursor = 0;
2020	#endif	2062	#endif
2021		2063
…		…
2049	ccol2 = bgcolor_of (rstyle);	2091	ccol2 = bgcolor_of (rstyle);
2050	#else	2092	#else
2051	ccol2 = Color_bg;	2093	ccol2 = Color_bg;
2052	#endif	2094	#endif
2053		2095
2054	if (showcursor && focus)	2096	if (focus)
2055	{	2097	{
2056	if (option (Opt_cursorUnderline))	2098	if (option (Opt_cursorUnderline))
2057	*crp ^= RS_Uline;	2099	*crp ^= RS_Uline;
2058	else	2100	else
2059	{	2101	{
…		…
2094	oldcursor.col = screen.cur.col;	2136	oldcursor.col = screen.cur.col;
2095	}	2137	}
2096	}	2138	}
2097	}	2139	}
2098		2140
2099	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2100	#if ENABLE_OVERLAY
2101	scr_swap_overlay ();
2102	#endif
2103
2104	#ifndef NO_SLOW_LINK_SUPPORT	2141	#ifndef NO_SLOW_LINK_SUPPORT
2105	/*	2142	/*
2106	* D: CopyArea pass - very useful for slower links	2143	* D: CopyArea pass - very useful for slower links
2107	* This has been deliberately kept simple.	2144	* This has been deliberately kept simple.
2108	*/	2145	*/
…		…
2197	continue;	2234	continue;
2198		2235
2199	// redraw one or more characters	2236	// redraw one or more characters
2200		2237
2201	// seek to the beginning of wide characters	2238	// seek to the beginning of wide characters
2202	while (stp[col] == NOCHAR && col > 0)	2239	while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2203	--col;	2240	--col;
2204		2241
2205	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2242	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2206	text_t *text = stp + col;	2243	text_t *text = stp + col;
2207	int count = 1;	2244	int count = 1;
2208		2245
2209	dtp[col] = stp[col];	2246	dtp[col] = stp[col];
2210	drp[col] = rend;	2247	drp[col] = rend;
…		…
2214	for (i = 0; ++col < ncol; )	2251	for (i = 0; ++col < ncol; )
2215	{	2252	{
2216	if (stp[col] == NOCHAR)	2253	if (stp[col] == NOCHAR)
2217	{	2254	{
2218	dtp[col] = stp[col];	2255	dtp[col] = stp[col];
2219	drp[col] = rend;	2256	drp[col] = srp[col];
		2257
2220	count++;	2258	count++;
2221	i++;	2259	i++;
2222		2260
2223	continue;	2261	continue;
2224	}	2262	}
…		…
2244		2282
2245	col--; /* went one too far. move back */	2283	col--; /* went one too far. move back */
2246	count -= i; /* dump any matching trailing chars */	2284	count -= i; /* dump any matching trailing chars */
2247		2285
2248	// sometimes we optimize away the trailing NOCHAR's, add them back	2286	// sometimes we optimize away the trailing NOCHAR's, add them back
2249	while (i && text[count] == NOCHAR)	2287	while (ecb_unlikely (i && text[count] == NOCHAR))
2250	count++, i--;	2288	count++, i--;
2251		2289
2252	/*	2290	/*
2253	* Determine the attributes for the string	2291	* Determine the attributes for the string
2254	*/	2292	*/
2255	int fore = fgcolor_of (rend); // desired foreground	2293	int fore = fgcolor_of (rend); // desired foreground
2256	int back = bgcolor_of (rend); // desired background	2294	int back = bgcolor_of (rend); // desired background
2257		2295
2258	// only do special processing if any attributes are set, which is unlikely	2296	// only do special processing if any attributes are set, which is unlikely
2259	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2297	if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2260	{	2298	{
2261	bool invert = rend & RS_RVid;	2299	bool invert = rend & RS_RVid;
2262		2300
2263	#ifndef NO_BOLD_UNDERLINE_REVERSE	2301	#ifndef NO_BOLD_UNDERLINE_REVERSE
2264	if (rend & RS_Bold && fore == Color_fg)	2302	if (rend & RS_Bold && fore == Color_fg)
…		…
2283		2321
2284	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2322	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285	fore = Color_UL;	2323	fore = Color_UL;
2286	#endif	2324	#endif
2287		2325
		2326	#ifdef OPTION_HC
		2327	if (rend & RS_Sel)
		2328	{
		2329	/* invert the column if no highlightColor is set or it is the
		2330	* current cursor column */
		2331	if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2332	&& ISSET_PIXCOLOR (Color_HC))
		2333	{
		2334	if (ISSET_PIXCOLOR (Color_HTC))
		2335	fore = Color_HTC;
		2336	// if invert is 0 reverse video is set so we use bg color as fg color
		2337	else if (!invert)
		2338	fore = back;
		2339
		2340	back = Color_HC;
		2341	invert = 0;
		2342	}
		2343	}
		2344	#endif
		2345
2288	if (invert)	2346	if (invert)
2289	{	2347	{
2290	#ifdef OPTION_HC
2291	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292	|| !ISSET_PIXCOLOR (Color_HC))
2293	#endif
2294	/* invert the column if no highlightColor is set or it is the
2295	* current cursor column */
2296	::swap (fore, back);	2348	::swap (fore, back);
2297	#ifdef OPTION_HC
2298	else if (ISSET_PIXCOLOR (Color_HC))
2299	back = Color_HC;
2300	#endif
2301		2349
2302	#ifndef NO_BOLD_UNDERLINE_REVERSE	2350	#ifndef NO_BOLD_UNDERLINE_REVERSE
2303	# ifndef OPTION_HC
2304	if (ISSET_PIXCOLOR (Color_RV))
2305	back = Color_RV;
2306	# endif
2307	if (fore == back)	2351	if (fore == back)
2308	{	2352	{
2309	fore = Color_bg;	2353	fore = Color_bg;
2310	back = Color_fg;	2354	back = Color_fg;
2311	}	2355	}
…		…
2347	/*	2391	/*
2348	* Actually do the drawing of the string here	2392	* Actually do the drawing of the string here
2349	*/	2393	*/
2350	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2394	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2351		2395
2352	if (have_bg && back == Color_bg)	2396	if (ecb_likely (have_bg && back == Color_bg))
2353	{	2397	{
2354	// this is very ugly, maybe push it into ->draw?	2398	// this is very ugly, maybe push it into ->draw?
2355		2399
2356	for (i = 0; i < count; i++) /* don't draw empty strings */	2400	for (i = 0; i < count; i++) /* don't draw empty strings */
2357	if (text[i] != ' ')	2401	if (text[i] != ' ')
…		…
2364	did_clear: ;	2408	did_clear: ;
2365	}	2409	}
2366	else	2410	else
2367	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2411	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2368		2412
2369	if (rend & RS_Uline && font->descent > 1 && fore != back)	2413	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2370	{	2414	{
2371	#if ENABLE_FRILLS	2415	#if ENABLE_FRILLS
2372	if (ISSET_PIXCOLOR (Color_underline))	2416	if (ISSET_PIXCOLOR (Color_underline))
2373	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2417	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2374	else	2418	else
…		…
2379	xpixel, ypixel + font->ascent + 1,	2423	xpixel, ypixel + font->ascent + 1,
2380	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2424	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2381	}	2425	}
2382	} /* for (col....) */	2426	} /* for (col....) */
2383	} /* for (row....) */	2427	} /* for (row....) */
2384
2385	#if ENABLE_OVERLAY
2386	scr_swap_overlay ();
2387	#endif
2388	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2389		2428
2390	/*	2429	/*
2391	* G: cleanup cursor and display outline cursor if necessary	2430	* G: cleanup cursor and display outline cursor if necessary
2392	*/	2431	*/
2393	if (showcursor)	2432	if (showcursor)
…		…
2432	}	2471	}
2433		2472
2434	/*	2473	/*
2435	* H: cleanup selection	2474	* H: cleanup selection
2436	*/	2475	*/
		2476	#if ENABLE_OVERLAY
		2477	scr_swap_overlay ();
		2478	#endif
		2479	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2480
2437	scr_reverse_selection ();	2481	scr_reverse_selection ();
2438		2482
		2483	screen.flags = old_screen_flags;
2439	num_scr = 0;	2484	num_scr = 0;
2440	num_scr_allow = 1;	2485	num_scr_allow = 1;
2441	}	2486	}
2442		2487
2443	void	2488	void
…		…
2464	scr_remap_chars (swap_buf [i]);	2509	scr_remap_chars (swap_buf [i]);
2465	}	2510	}
2466	}	2511	}
2467		2512
2468	void	2513	void
2469	rxvt_term::scr_recolour () NOTHROW	2514	rxvt_term::scr_recolour (bool refresh) NOTHROW
2470	{	2515	{
		2516	bool transparent = false;
		2517
2471	#ifdef HAVE_BG_PIXMAP	2518	#ifdef HAVE_BG_PIXMAP
2472	bgPixmap.apply ();	2519	if (bg_pixmap != None)
2473	#else	2520	{
		2521	# ifdef ENABLE_TRANSPARENCY
		2522	if (bg_flags & BG_IS_TRANSPARENT)
		2523	{
		2524	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
		2525	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2474		2526
		2527	transparent = true;
		2528	}
		2529	else
		2530	# endif
		2531	{
		2532	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
		2533	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2534	}
		2535	}
		2536	else
		2537	#endif
		2538	{
2475	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2539	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2476	XClearWindow (dpy, parent[0]);
2477	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2540	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2541	}
		2542
		2543	XClearWindow (dpy, parent);
2478		2544
2479	if (scrollBar.win)	2545	if (scrollBar.win)
2480	{	2546	{
		2547	if (transparent)
		2548	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2549	else
2481	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2550	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2482	scrollBar.state = STATE_IDLE;	2551	scrollBar.state = STATE_IDLE;
2483	scrollbar_show (0);	2552	scrollBar.show (0);
2484	}	2553	}
2485		2554
2486	#endif	2555	if (refresh)
2487		2556	{
2488	/* bgPixmap.apply () does not do the following : */
2489	scr_clear ();	2557	scr_clear ();
2490	scr_touch (true);	2558	scr_touch (true);
		2559	}
2491	want_refresh = 1;	2560	want_refresh = 1;
2492	}	2561	}
2493		2562
2494	/* ------------------------------------------------------------------------- */	2563	/* ------------------------------------------------------------------------- */
2495	void	2564	void
…		…
2563	{	2632	{
2564	#if !ENABLE_MINIMAL	2633	#if !ENABLE_MINIMAL
2565	if (selection.rect)	2634	if (selection.rect)
2566	scr_xor_rect (selection.beg.row, selection.beg.col,	2635	scr_xor_rect (selection.beg.row, selection.beg.col,
2567	selection.end.row, selection.end.col,	2636	selection.end.row, selection.end.col,
2568	RS_RVid, RS_RVid | RS_Uline);	2637	RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2569	else	2638	else
2570	#endif	2639	#endif
2571	scr_xor_span (selection.beg.row, selection.beg.col,	2640	scr_xor_span (selection.beg.row, selection.beg.col,
2572	selection.end.row, selection.end.col,	2641	selection.end.row, selection.end.col,
2573	RS_RVid);	2642	RS_Sel | RS_RVid);
2574	}	2643	}
2575	}	2644	}
2576		2645
2577	/* ------------------------------------------------------------------------- */	2646	/* ------------------------------------------------------------------------- */
2578	/*	2647	/*
…		…
2583	void	2652	void
2584	rxvt_term::scr_dump (int fd) NOTHROW	2653	rxvt_term::scr_dump (int fd) NOTHROW
2585	{	2654	{
2586	int row, wrote;	2655	int row, wrote;
2587	unsigned int width, towrite;	2656	unsigned int width, towrite;
2588	char r1[] = "\n";	2657	const char r1[] = "\n";
2589		2658
2590	for (row = saveLines - nsaved;	2659	for (row = saveLines + top_row;
2591	row < saveLines + nrow - 1; row++)	2660	row < saveLines + nrow - 1; row++)
2592	{	2661	{
2593	width = row_buf[row].l >= 0 ? row_buf[row].l	2662	width = row_buf[row].l >= 0 ? row_buf[row].l
2594	: ncol;	2663	: ncol;
2595	for (towrite = width; towrite; towrite -= wrote)	2664	for (towrite = width; towrite; towrite -= wrote)
…		…
2639	/* ------------------------------------------------------------------------- */	2708	/* ------------------------------------------------------------------------- */
2640	/*	2709	/*
2641	* Paste a selection direct to the command fd	2710	* Paste a selection direct to the command fd
2642	*/	2711	*/
2643	void	2712	void
2644	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2713	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2645	{	2714	{
2646	/* convert normal newline chars into common keyboard Return key sequence */	2715	/* convert normal newline chars into common keyboard Return key sequence */
2647	for (unsigned int i = 0; i < len; i++)	2716	for (unsigned int i = 0; i < len; i++)
2648	if (data[i] == C0_LF)	2717	if (data[i] == C0_LF)
2649	data[i] = C0_CR;	2718	data[i] = C0_CR;
…		…
2655		2724
2656	if (priv_modes & PrivMode_BracketPaste)	2725	if (priv_modes & PrivMode_BracketPaste)
2657	tt_printf ("\e[201~");	2726	tt_printf ("\e[201~");
2658	}	2727	}
2659		2728
2660	/* ------------------------------------------------------------------------- */
2661	/*
2662	* Respond to a notification that a primary selection has been sent
2663	* EXT: SelectionNotify
2664	*/
2665	void	2729	void
2666	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2730	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2667	{	2731	{
2668	if (prop == None) /* check for failed XConvertSelection */	2732	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2669	{
2670	if ((selection_type & Sel_CompoundText))
2671	{
2672	int selnum = selection_type & Sel_whereMask;
2673
2674	selection_type = 0;
2675	if (selnum != Sel_direct)
2676	selection_request_other (XA_STRING, selnum);
2677	}
2678
2679	if ((selection_type & Sel_UTF8String))
2680	{
2681	int selnum = selection_type & Sel_whereMask;
2682
2683	selection_type = Sel_CompoundText;
2684	if (selnum != Sel_direct)
2685	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2686	else
2687	selection_type = 0;
2688	}
2689
2690	return;
2691	}
2692
2693	unsigned long bytes_after;
2694	XTextProperty ct;
2695
2696	if (XGetWindowProperty (dpy, win, prop,
2697	0, PROP_SIZE / 4,
2698	delete_prop, AnyPropertyType,
2699	&ct.encoding, &ct.format,
2700	&ct.nitems, &bytes_after,
2701	&ct.value) != Success)
2702	{
2703	ct.value = 0;
2704	goto bailout;
2705	}
2706
2707	if (ct.encoding == None)
2708	goto bailout;
2709
2710	if (bytes_after)
2711	{
2712	// fetch and append remaining data
2713	XTextProperty ct2;
2714
2715	if (XGetWindowProperty (dpy, win, prop,
2716	ct.nitems / 4, (bytes_after + 3) / 4,
2717	delete_prop, AnyPropertyType,
2718	&ct2.encoding, &ct2.format,
2719	&ct2.nitems, &bytes_after,
2720	&ct2.value) != Success)
2721	goto bailout;
2722
2723	// realloc should be compatible to XFree, here, and elsewhere, too
2724	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2725	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2726	ct.nitems += ct2.nitems;
2727
2728	XFree (ct2.value);
2729	}
2730
2731	if (ct.value == 0)
2732	goto bailout;
2733
2734	if (ct.encoding == xa[XA_INCR])
2735	{
2736	// INCR selection, start handshake
2737	if (!delete_prop)
2738	XDeleteProperty (dpy, win, prop);
2739
2740	selection_wait = Sel_incr;
2741	incr_buf_fill = 0;
2742	incr_ev.start (10);
2743
2744	goto bailout;
2745	}
2746
2747	if (ct.nitems == 0)
2748	{
2749	if (selection_wait == Sel_incr)
2750	{
2751	XFree (ct.value);
2752
2753	// finally complete, now paste the whole thing
2754	selection_wait = Sel_normal;
2755	ct.value = (unsigned char *)incr_buf;
2756	ct.nitems = incr_buf_fill;
2757	incr_buf = 0;
2758	incr_buf_size = 0;
2759	incr_ev.stop ();
2760	}
2761	else
2762	{
2763	if (selection_wait == Sel_normal
2764	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2765	{
2766	/*
2767	* pass through again trying CUT_BUFFER0 if we've come from
2768	* XConvertSelection () but nothing was presented
2769	*/
2770	selection_paste (display->root, XA_CUT_BUFFER0, False);
2771	}
2772
2773	goto bailout;
2774	}
2775	}
2776	else if (selection_wait == Sel_incr)
2777	{
2778	incr_ev.start (10);
2779
2780	while (incr_buf_fill + ct.nitems > incr_buf_size)
2781	{
2782	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2783	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2784	}
2785
2786	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2787	incr_buf_fill += ct.nitems;
2788
2789	goto bailout;
2790	}
2791
2792	char **cl;
2793	int cr;
2794
2795	#if !ENABLE_MINIMAL
2796	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2797	// so recode it manually
2798	if (ct.encoding == xa[XA_UTF8_STRING])
2799	{
2800	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2801	char *s = rxvt_wcstombs (w);
2802	free (w);
2803	// TODO: strlen == only the first element will be converted. well...
2804	paste (s, strlen (s));
2805	free (s);
2806	}
2807	else
2808	#endif
2809	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2810	&& cl)
2811	{
2812	for (int i = 0; i < cr; i++)
2813	paste (cl[i], strlen (cl[i]));
2814
2815	XFreeStringList (cl);
2816	}
2817	else
2818	paste ((char *)ct.value, ct.nitems); // paste raw
2819
2820	bailout:
2821	XFree (ct.value);
2822
2823	if (selection_wait == Sel_normal)
2824	selection_wait = Sel_none;
2825	}
2826
2827	void
2828	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2829	{
2830	selection_wait = Sel_none;
2831
2832	incr_buf_size = 0;
2833	free (incr_buf);
2834
2835	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2836	}
2837
2838	void
2839	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2840	{
2841	if (prop == None || selection_wait != Sel_incr)
2842	return;	2733	return;
2843		2734
2844	selection_paste (win, prop, true);	2735	tt_paste (data, len);
2845	}	2736	}
2846		2737
2847	/* ------------------------------------------------------------------------- */	2738	/* ------------------------------------------------------------------------- */
2848	/*	2739	/*
2849	* Request the current selection:	2740	* Request PRIMARY, SECONDARY or CLIPBOARD selection.
2850	* Order: > internal selection if available	2741	* if the requested selection has no owner or is empty CUT_BUFFER0 is used
2851	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2742	* as fallback
2852	* > CUT_BUFFER0
2853	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2854	* will auto fallback to CUT_BUFFER0
2855	* EXT: button 2 release	2743	* EXT: button 2 release
2856	*/	2744	*/
2857	void	2745	void
2858	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2746	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2859	{	2747	{
2860	if (selection.text && selnum == Sel_Primary)	2748	if (!selection_req)
2861	{
2862	/* internal selection */
2863	char *str = rxvt_wcstombs (selection.text, selection.len);
2864	paste (str, strlen (str));
2865	free (str);
2866	return;
2867	}	2749	{
2868	else	2750	selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
		2751	selection_req->run ();
2869	{	2752	}
2870	selection_request_time = tm;
2871	selection_wait = Sel_normal;
2872
2873	#if X_HAVE_UTF8_STRING
2874	selection_type = Sel_UTF8String;
2875	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2876	return;
2877	#else
2878	selection_type = Sel_CompoundText;
2879	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2880	return;
2881	#endif
2882	}
2883
2884	selection_wait = Sel_none; /* don't loop in selection_paste () */
2885	selection_paste (display->root, XA_CUT_BUFFER0, false);
2886	}
2887
2888	int
2889	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2890	{
2891	Atom sel;
2892
2893	selection_type |= selnum;
2894
2895	if (selnum == Sel_Primary)
2896	sel = XA_PRIMARY;
2897	else if (selnum == Sel_Secondary)
2898	sel = XA_SECONDARY;
2899	else
2900	sel = xa[XA_CLIPBOARD];
2901
2902	if (XGetSelectionOwner (dpy, sel) != None)
2903	{
2904	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2905	vt, selection_request_time);
2906	return 1;
2907	}
2908
2909	return 0;
2910	}	2753	}
2911		2754
2912	/* ------------------------------------------------------------------------- */	2755	/* ------------------------------------------------------------------------- */
2913	/*	2756	/*
2914	* Clear all selected text	2757	* Clear all selected text
2915	* EXT: SelectionClear	2758	* EXT: SelectionClear
2916	*/	2759	*/
2917	void	2760	void
2918	rxvt_term::selection_clear () NOTHROW	2761	rxvt_term::selection_clear (bool clipboard) NOTHROW
2919	{	2762	{
		2763	if (!clipboard)
		2764	{
2920	want_refresh = 1;	2765	want_refresh = 1;
2921	free (selection.text);	2766	free (selection.text);
2922	selection.text = NULL;	2767	selection.text = NULL;
2923	selection.len = 0;	2768	selection.len = 0;
2924	CLEAR_SELECTION ();	2769	CLEAR_SELECTION ();
2925		2770
2926	if (display->selection_owner == this)	2771	if (display->selection_owner == this)
2927	display->selection_owner = 0;	2772	display->selection_owner = 0;
		2773	}
		2774	else
		2775	{
		2776	free (selection.clip_text);
		2777	selection.clip_text = NULL;
		2778	selection.clip_len = 0;
		2779
		2780	if (display->clipboard_owner == this)
		2781	display->clipboard_owner = 0;
		2782	}
2928	}	2783	}
2929		2784
2930	/* ------------------------------------------------------------------------- */	2785	/* ------------------------------------------------------------------------- */
2931	/*	2786	/*
2932	* Copy a selection into the cut buffer	2787	* Copy a selection into the cut buffer
2933	* EXT: button 1 or 3 release	2788	* EXT: button 1 or 3 release
2934	*/	2789	*/
2935	void	2790	void
2936	rxvt_term::selection_make (Time tm)	2791	rxvt_term::selection_make (Time tm)
2937	{	2792	{
2938	int i;	2793	int size;
2939	wchar_t *new_selection_text;	2794	wchar_t *new_selection_text;
2940	text_t *t;	2795	text_t *t;
2941		2796
2942	switch (selection.op)	2797	switch (selection.op)
2943	{	2798	{
…		…
2959	return; /* nothing selected, go away */	2814	return; /* nothing selected, go away */
2960		2815
2961	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2816	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2962	return;	2817	return;
2963		2818
2964	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2819	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2965	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2820	new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2966		2821
2967	int ofs = 0;	2822	int ofs = 0;
2968	int extra = 0;	2823	int extra = 0;
2969		2824
2970	int col = selection.beg.col;	2825	int col = selection.beg.col;
…		…
2976	{	2831	{
2977	#if !ENABLE_MINIMAL	2832	#if !ENABLE_MINIMAL
2978	if (selection.rect)	2833	if (selection.rect)
2979	{	2834	{
2980	col = selection.beg.col;	2835	col = selection.beg.col;
2981	end_col = ncol + 1;	2836	end_col = selection.end.col;
2982	}	2837	}
2983	else	2838	else
2984	#endif	2839	#endif
2985	end_col = ROW(row).l;	2840	end_col = ROW(row).l;
2986		2841
2987	col = max (col, 0);	2842	col = max (col, 0);
2988		2843
2989	if (row == selection.end.row	2844	if (row == selection.end.row)
2990	#if !ENABLE_MINIMAL
2991	|| selection.rect
2992	#endif
2993	)
2994	min_it (end_col, selection.end.col);	2845	min_it (end_col, selection.end.col);
2995		2846
2996	t = ROW(row).t + col;	2847	t = ROW(row).t + col;
2997		2848
2998	for (; col < end_col; col++)	2849	for (; col < end_col; col++)
…		…
3006		2857
3007	extra -= (len - 1);	2858	extra -= (len - 1);
3008		2859
3009	if (extra < 0)	2860	if (extra < 0)
3010	{	2861	{
3011	extra += i;	2862	extra += size;
3012	i += i;	2863	size += size;
3013	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));	2864	new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3014	}	2865	}
3015		2866
3016	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	2867	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3017	}	2868	}
3018	#endif	2869	#endif
…		…
3030		2881
3031	new_selection_text[ofs++] = C0_LF;	2882	new_selection_text[ofs++] = C0_LF;
3032	}	2883	}
3033	else	2884	else
3034	#endif	2885	#endif
3035	if (!ROW(row).is_longer () && row != selection.end.row)	2886	if (!ROW(row).is_longer ()
		2887	&& (row != selection.end.row || end_col != selection.end.col)
		2888	&& (row != selection.beg.row || selection.beg.col < ncol))
3036	new_selection_text[ofs++] = C0_LF;	2889	new_selection_text[ofs++] = C0_LF;
3037	}	2890	}
3038
3039	if (end_col != selection.end.col)
3040	new_selection_text[ofs++] = C0_LF;
3041		2891
3042	new_selection_text[ofs] = 0;	2892	new_selection_text[ofs] = 0;
3043		2893
3044	if (ofs == 0)	2894	if (ofs == 0)
3045	{	2895	{
…		…
3058		2908
3059	selection_grab (tm);	2909	selection_grab (tm);
3060	}	2910	}
3061		2911
3062	bool	2912	bool
3063	rxvt_term::selection_grab (Time tm) NOTHROW	2913	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3064	{	2914	{
		2915	Atom sel;
		2916
		2917	if (!clipboard)
		2918	{
3065	selection_time = tm;	2919	selection_time = tm;
		2920	sel = XA_PRIMARY;
		2921	}
		2922	else
		2923	{
		2924	clipboard_time = tm;
		2925	sel = xa[XA_CLIPBOARD];
		2926	}
3066		2927
3067	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	2928	XSetSelectionOwner (dpy, sel, vt, tm);
3068	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	2929	if (XGetSelectionOwner (dpy, sel) == vt)
3069	{	2930	{
3070	display->set_selection_owner (this);	2931	display->set_selection_owner (this, clipboard);
3071	return true;	2932	return true;
3072	}	2933	}
3073	else	2934	else
3074	{	2935	{
3075	selection_clear ();	2936	selection_clear (clipboard);
3076	return false;	2937	return false;
3077	}	2938	}
3078		2939
3079	#if 0	2940	#if 0
3080	XTextProperty ct;	2941	XTextProperty ct;
…		…
3540	* EXT: SelectionRequest	3401	* EXT: SelectionRequest
3541	*/	3402	*/
3542	void	3403	void
3543	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3404	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3544	{	3405	{
		3406	Atom property = rq.property == None ? rq.target : rq.property;
3545	XSelectionEvent ev;	3407	XSelectionEvent ev;
3546		3408
3547	ev.type = SelectionNotify;	3409	ev.type = SelectionNotify;
3548	ev.property = None;	3410	ev.property = None;
3549	ev.display = rq.display;	3411	ev.display = rq.display;
…		…
3564	*target++ = xa[XA_COMPOUND_TEXT];	3426	*target++ = xa[XA_COMPOUND_TEXT];
3565	#if X_HAVE_UTF8_STRING	3427	#if X_HAVE_UTF8_STRING
3566	*target++ = xa[XA_UTF8_STRING];	3428	*target++ = xa[XA_UTF8_STRING];
3567	#endif	3429	#endif
3568		3430
3569	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,	3431	XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3570	32, PropModeReplace,	3432	32, PropModeReplace,
3571	(unsigned char *)target_list, target - target_list);	3433	(unsigned char *)target_list, target - target_list);
3572	ev.property = rq.property;	3434	ev.property = property;
3573	}	3435	}
3574	#if TODO // TODO	3436	#if TODO // TODO
3575	else if (rq.target == xa[XA_MULTIPLE])	3437	else if (rq.target == xa[XA_MULTIPLE])
3576	{	3438	{
3577	/* TODO: Handle MULTIPLE */	3439	/* TODO: Handle MULTIPLE */
3578	}	3440	}
3579	#endif	3441	#endif
3580	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3442	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3581	{	3443	{
3582	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3444	XChangeProperty (dpy, rq.requestor, property, rq.target,
3583	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3445	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3584	ev.property = rq.property;	3446	ev.property = property;
		3447	}
		3448	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3449	{
		3450	XChangeProperty (dpy, rq.requestor, property, rq.target,
		3451	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
		3452	ev.property = property;
3585	}	3453	}
3586	else if (rq.target == XA_STRING	3454	else if (rq.target == XA_STRING
3587	|| rq.target == xa[XA_TEXT]	3455	|| rq.target == xa[XA_TEXT]
3588	|| rq.target == xa[XA_COMPOUND_TEXT]	3456	|| rq.target == xa[XA_COMPOUND_TEXT]
3589	|| rq.target == xa[XA_UTF8_STRING]	3457	|| rq.target == xa[XA_UTF8_STRING]
…		…
3621	{	3489	{
3622	target = xa[XA_COMPOUND_TEXT];	3490	target = xa[XA_COMPOUND_TEXT];
3623	style = enc_compound_text;	3491	style = enc_compound_text;
3624	}	3492	}
3625		3493
3626	if (selection.text)	3494	if (rq.selection == XA_PRIMARY && selection.text)
3627	{	3495	{
3628	cl = selection.text;	3496	cl = selection.text;
3629	selectlen = selection.len;	3497	selectlen = selection.len;
		3498	}
		3499	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3500	{
		3501	cl = selection.clip_text;
		3502	selectlen = selection.clip_len;
3630	}	3503	}
3631	else	3504	else
3632	{	3505	{
3633	cl = L"";	3506	cl = L"";
3634	selectlen = 0;	3507	selectlen = 0;
…		…
3655	ct.value = (unsigned char *)cl;	3528	ct.value = (unsigned char *)cl;
3656	ct.nitems = selectlen;	3529	ct.nitems = selectlen;
3657	ct.encoding = target;	3530	ct.encoding = target;
3658	}	3531	}
3659		3532
3660	XChangeProperty (dpy, rq.requestor, rq.property,	3533	XChangeProperty (dpy, rq.requestor, property,
3661	ct.encoding, 8, PropModeReplace,	3534	ct.encoding, 8, PropModeReplace,
3662	ct.value, (int)ct.nitems);	3535	ct.value, (int)ct.nitems);
3663	ev.property = rq.property;	3536	ev.property = property;
3664		3537
3665	if (freect)	3538	if (freect)
3666	XFree (ct.value);	3539	XFree (ct.value);
3667	}	3540	}
3668		3541
…		…
3702	h += 2; min_it (h, nrow);	3575	h += 2; min_it (h, nrow);
3703		3576
3704	x -= 1; clamp_it (x, 0, ncol - w);	3577	x -= 1; clamp_it (x, 0, ncol - w);
3705	y -= 1; clamp_it (y, 0, nrow - h);	3578	y -= 1; clamp_it (y, 0, nrow - h);
3706		3579
3707	ov_x = x; ov_y = y;	3580	ov.x = x; ov.y = y;
3708	ov_w = w; ov_h = h;	3581	ov.w = w; ov.h = h;
3709		3582
3710	ov_text = new text_t *[h];	3583	ov.text = new text_t *[h];
3711	ov_rend = new rend_t *[h];	3584	ov.rend = new rend_t *[h];
3712		3585
3713	for (y = 0; y < h; y++)	3586	for (y = 0; y < h; y++)
3714	{	3587	{
3715	text_t *tp = ov_text[y] = new text_t[w];	3588	text_t *tp = ov.text[y] = new text_t[w];
3716	rend_t *rp = ov_rend[y] = new rend_t[w];	3589	rend_t *rp = ov.rend[y] = new rend_t[w];
3717		3590
3718	text_t t0, t1, t2;	3591	text_t t0, t1, t2;
3719	rend_t r = OVERLAY_RSTYLE;	3592	rend_t r = OVERLAY_RSTYLE;
3720		3593
3721	if (y == 0)	3594	if (y == 0)
…		…
3740	}	3613	}
3741		3614
3742	void	3615	void
3743	rxvt_term::scr_overlay_off () NOTHROW	3616	rxvt_term::scr_overlay_off () NOTHROW
3744	{	3617	{
3745	if (!ov_text)	3618	if (!ov.text)
3746	return;	3619	return;
3747		3620
3748	want_refresh = 1;	3621	want_refresh = 1;
3749		3622
3750	for (int y = 0; y < ov_h; y++)	3623	for (int y = 0; y < ov.h; y++)
3751	{	3624	{
3752	delete [] ov_text[y];	3625	delete [] ov.text[y];
3753	delete [] ov_rend[y];	3626	delete [] ov.rend[y];
3754	}	3627	}
3755		3628
3756	delete [] ov_text; ov_text = 0;	3629	delete [] ov.text; ov.text = 0;
3757	delete [] ov_rend; ov_rend = 0;	3630	delete [] ov.rend; ov.rend = 0;
3758	}	3631	}
3759		3632
3760	void	3633	void
3761	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3634	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3762	{	3635	{
3763	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3636	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3764	return;	3637	return;
3765		3638
3766	x++, y++;	3639	x++, y++;
3767		3640
3768	ov_text[y][x] = text;	3641	ov.text[y][x] = text;
3769	ov_rend[y][x] = rend;	3642	ov.rend[y][x] = rend;
3770	}	3643	}
3771		3644
3772	void	3645	void
3773	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3646	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3774	{	3647	{
…		…
3793	}	3666	}
3794		3667
3795	void	3668	void
3796	rxvt_term::scr_swap_overlay () NOTHROW	3669	rxvt_term::scr_swap_overlay () NOTHROW
3797	{	3670	{
3798	if (!ov_text)	3671	if (!ov.text)
3799	return;	3672	return;
3800		3673
		3674	// hide cursor if it is within the overlay area
		3675	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3676	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3677	screen.flags &= ~Screen_VisibleCursor;
		3678
3801	// swap screen mem with overlay	3679	// swap screen mem with overlay
3802	for (int y = ov_h; y--; )	3680	for (int y = ov.h; y--; )
3803	{	3681	{
3804	text_t *t1 = ov_text[y];	3682	text_t *t1 = ov.text[y];
3805	rend_t *r1 = ov_rend[y];	3683	rend_t *r1 = ov.rend[y];
3806		3684
3807	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3685	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3808	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3686	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3809		3687
3810	for (int x = ov_w; x--; )	3688	for (int x = ov.w; x--; )
3811	{	3689	{
3812	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3690	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3813	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3691	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3814	}	3692	}
3815	}	3693	}

Diff Legend

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