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

Diff Legend

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