[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs. Revision 1.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC vs.
Revision 1.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC