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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.289 by root, Fri Dec 14 05:25:26 2007 UTC vs.
Revision 1.370 by sf-exg, Sun Feb 6 11:42:28 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
1011	* XTERM_SEQ: CTRL-H	1012	* XTERM_SEQ: CTRL-H
1012	*/	1013	*/
1013	void	1014	void
1014	rxvt_term::scr_backspace () NOTHROW	1015	rxvt_term::scr_backspace () NOTHROW
1015	{	1016	{
1016	want_refresh = 1;
1017
1018	if (screen.cur.col == 0)	1017	if (screen.cur.col == 0)
1019	{	1018	{
1020	if (screen.cur.row > 0)	1019	if (screen.cur.row > 0)
1021	{	1020	{
1022	#ifdef TERMCAP_HAS_BW	1021	#ifdef TERMCAP_HAS_BW
1023	screen.cur.col = ncol - 1;	1022	screen.cur.col = ncol - 1;
1024	screen.cur.row--;	1023	--screen.cur.row;
1025	return;	1024
		1025	want_refresh = 1;
1026	#endif	1026	#endif
1027	}	1027	}
1028	}	1028	}
1029	else if (!(screen.flags & Screen_WrapNext))	1029	else if (screen.flags & Screen_WrapNext)
		1030	screen.flags &= ~Screen_WrapNext;
		1031	else
1030	scr_gotorc (0, -1, RELATIVE);	1032	scr_gotorc (0, -1, RELATIVE);
1031
1032	screen.flags &= ~Screen_WrapNext;
1033	}	1033	}
1034		1034
1035	/* ------------------------------------------------------------------------- */	1035	/* ------------------------------------------------------------------------- */
1036	/*	1036	/*
1037	* Process Horizontal Tab	1037	* Process Horizontal Tab
…		…
1230	/*	1230	/*
1231	* Erase part or whole of a line	1231	* Erase part or whole of a line
1232	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1232	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1233	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1233	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1234	* 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
1235	*/	1236	*/
1236	void	1237	void
1237	rxvt_term::scr_erase_line (int mode) NOTHROW	1238	rxvt_term::scr_erase_line (int mode) NOTHROW
1238	{	1239	{
1239	unsigned int col, num;	1240	unsigned int col, num;
…		…
1248	line.touch ();	1249	line.touch ();
1249	line.is_longer (0);	1250	line.is_longer (0);
1250		1251
1251	switch (mode)	1252	switch (mode)
1252	{	1253	{
		1254	case 3:
		1255	if (screen.flags & Screen_WrapNext)
		1256	return;
		1257
		1258	/* fall through */
		1259
1253	case 0: /* erase to end of line */	1260	case 0: /* erase to end of line */
1254	col = screen.cur.col;	1261	col = screen.cur.col;
1255	num = ncol - col;	1262	num = ncol - col;
1256	min_it (line.l, col);	1263	min_it (line.l, col);
		1264
1257	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1265	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1258	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1266	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1259	CLEAR_SELECTION ();	1267	CLEAR_SELECTION ();
1260	break;	1268	break;
		1269
1261	case 1: /* erase to beginning of line */	1270	case 1: /* erase to beginning of line */
1262	col = 0;	1271	col = 0;
1263	num = screen.cur.col + 1;	1272	num = screen.cur.col + 1;
		1273
1264	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1274	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1265	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1275	\|\| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1266	CLEAR_SELECTION ();	1276	CLEAR_SELECTION ();
1267	break;	1277	break;
		1278
1268	case 2: /* erase whole line */	1279	case 2: /* erase whole line */
1269	col = 0;	1280	col = 0;
1270	num = ncol;	1281	num = ncol;
1271	line.l = 0;	1282	line.l = 0;
1272	if (selection.beg.row <= screen.cur.row	1283	if (selection.beg.row <= screen.cur.row
…		…
1330	if (row >= nrow) /* Out Of Bounds */	1341	if (row >= nrow) /* Out Of Bounds */
1331	return;	1342	return;
1332		1343
1333	min_it (num, nrow - row);	1344	min_it (num, nrow - row);
1334		1345
1335	if (rstyle & (RS_RVid \| RS_Uline))	1346	if (rstyle & (RS_Blink \| RS_RVid \| RS_Uline))
1336	ren = (rend_t) ~RS_None;	1347	ren = (rend_t) ~RS_None;
1337	else if (GET_BASEBG (rstyle) == Color_bg)	1348	else if (GET_BASEBG (rstyle) == Color_bg)
1338	{	1349	{
1339	ren = DEFAULT_RSTYLE;	1350	ren = DEFAULT_RSTYLE;
1340	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);
1341	}	1356	}
1342	else	1357	else
1343	{	1358	{
1344	ren = rstyle & (RS_fgMask \| RS_bgMask);	1359	ren = rstyle & (RS_fgMask \| RS_bgMask);
		1360
		1361	if (mapped)
		1362	{
1345	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1363	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1346	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1364	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347	ERASE_ROWS (row, num);	1365	XFillRectangle (dpy, vt, gc,
		1366	0, Row2Pixel (row - view_start),
		1367	(unsigned int)width,
		1368	(unsigned int)Height2Pixel (num));
1348	gcvalue.foreground = pix_colors[Color_fg];	1369	gcvalue.foreground = pix_colors[Color_fg];
1349	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1370	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1371	}
1350	}	1372	}
1351		1373
1352	for (; num--; row++)	1374	for (; num--; row++)
1353	{	1375	{
1354	scr_blank_screen_mem (ROW(row), rstyle);	1376	scr_blank_screen_mem (ROW(row), rstyle);
		1377
		1378	if (row - view_start < nrow)
1355	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1379	scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1356	}	1380	}
1357	}	1381	}
1358		1382
1359	#if !ENABLE_MINIMAL	1383	#if !ENABLE_MINIMAL
1360	void	1384	void
…		…
1434	* Insert/Delete <count> characters from the current position	1458	* Insert/Delete <count> characters from the current position
1435	*/	1459	*/
1436	void	1460	void
1437	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1461	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1438	{	1462	{
1439	int col, row;
1440	rend_t tr;
1441
1442	want_refresh = 1;	1463	want_refresh = 1;
1443	ZERO_SCROLLBACK ();	1464	ZERO_SCROLLBACK ();
1444		1465
1445	if (count <= 0)	1466	if (count <= 0)
1446	return;	1467	return;
…		…
1448	scr_do_wrap ();	1469	scr_do_wrap ();
1449		1470
1450	selection_check (1);	1471	selection_check (1);
1451	min_it (count, ncol - screen.cur.col);	1472	min_it (count, ncol - screen.cur.col);
1452		1473
1453	row = screen.cur.row;	1474	int row = screen.cur.row;
1454		1475
1455	line_t *line = &ROW(row);	1476	line_t *line = &ROW(row);
1456		1477
1457	line->touch ();	1478	line->touch ();
1458	line->is_longer (0);	1479	line->is_longer (0);
1459		1480
		1481	// nuke wide spanning the start
		1482	if (line->t[screen.cur.col] == NOCHAR)
		1483	scr_kill_char (*line, screen.cur.col);
		1484
1460	switch (insdel)	1485	switch (insdel)
1461	{	1486	{
1462	case INSERT:	1487	case INSERT:
1463	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--)
1464	{	1494	{
1465	line->t[col] = line->t[col - count];	1495	line->t[col] = line->t[col - count];
1466	line->r[col] = line->r[col - count];	1496	line->r[col] = line->r[col - count];
1467	}	1497	}
1468
1469	line->l = min (line->l + count, ncol);
1470		1498
1471	if (selection.op && current_screen == selection.screen	1499	if (selection.op && current_screen == selection.screen
1472	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1500	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1473	{	1501	{
1474	if (selection.end.row != screen.cur.row	1502	if (selection.end.row != screen.cur.row
…		…
1489	case ERASE:	1517	case ERASE:
1490	screen.cur.col += count; /* don't worry if > ncol */	1518	screen.cur.col += count; /* don't worry if > ncol */
1491	selection_check (1);	1519	selection_check (1);
1492	screen.cur.col -= count;	1520	screen.cur.col -= count;
1493		1521
1494	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
1495	scr_blank_line (*line, screen.cur.col, count, rstyle);	1526	scr_blank_line (*line, screen.cur.col, count, rstyle);
1496	break;	1527	break;
1497		1528
1498	case DELETE:	1529	case DELETE:
1499	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1530	line->l = max (line->l - count, 0);
1500		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
1501	for (col = screen.cur.col; (col + count) < ncol; col++)	1536	for (int col = screen.cur.col; (col + count) < ncol; col++)
1502	{	1537	{
1503	line->t[col] = line->t[col + count];	1538	line->t[col] = line->t[col + count];
1504	line->r[col] = line->r[col + count];	1539	line->r[col] = line->r[col + count];
1505	}	1540	}
1506		1541
1507	line->l = max (line->l - count, 0);
1508	scr_blank_line (*line, ncol - count, count, tr);	1542	scr_blank_line (*line, ncol - count, count, rstyle);
1509		1543
1510	if (selection.op && current_screen == selection.screen	1544	if (selection.op && current_screen == selection.screen
1511	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1545	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512	{	1546	{
1513	if (selection.end.row != screen.cur.row	1547	if (selection.end.row != screen.cur.row
…		…
1649	{	1683	{
1650	rvideo_state = on;	1684	rvideo_state = on;
1651		1685
1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1686	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653	#ifdef HAVE_BG_PIXMAP	1687	#ifdef HAVE_BG_PIXMAP
1654	if (bgPixmap.pixmap == None)	1688	if (bg_pixmap == None)
1655	#endif	1689	#endif
1656	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1690	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1657		1691
1658	XGCValues gcvalue;	1692	XGCValues gcvalue;
1659	gcvalue.foreground = pix_colors[Color_fg];	1693	gcvalue.foreground = pix_colors[Color_fg];
…		…
1803	for (i = PART_BEG; i < RC_COUNT; i++)	1837	for (i = PART_BEG; i < RC_COUNT; i++)
1804	{	1838	{
1805	min_it (rc[i].col, ncol - 1);	1839	min_it (rc[i].col, ncol - 1);
1806	min_it (rc[i].row, nrow - 1);	1840	min_it (rc[i].row, nrow - 1);
1807	}	1841	}
1808	// TODO: this line somehow causes segfault if scr_expose() is called just after resize	1842
1809	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++)
1810	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);
1811		1845
1812	num_scr_allow = 0;	1846	num_scr_allow = 0;
1813		1847
…		…
1872	void	1906	void
1873	rxvt_term::bell_cb (ev::timer &w, int revents)	1907	rxvt_term::bell_cb (ev::timer &w, int revents)
1874	{	1908	{
1875	rvideo_bell = false;	1909	rvideo_bell = false;
1876	scr_rvideo_mode (rvideo_mode);	1910	scr_rvideo_mode (rvideo_mode);
		1911	refresh_check ();
1877	}	1912	}
1878	#endif	1913	#endif
1879		1914
1880	/* ------------------------------------------------------------------------- */	1915	/* ------------------------------------------------------------------------- */
1881	void	1916	void
…		…
1890	XMapWindow (dpy, parent[0]);	1925	XMapWindow (dpy, parent[0]);
1891	# endif	1926	# endif
1892		1927
1893	# if ENABLE_FRILLS	1928	# if ENABLE_FRILLS
1894	if (option (Opt_urgentOnBell))	1929	if (option (Opt_urgentOnBell))
1895	{	1930	set_urgency (1);
1896	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897	{
1898	h->flags \|= XUrgencyHint;
1899	XSetWMHints (dpy, parent[0], h);
1900	}
1901	}
1902	# endif	1931	# endif
1903		1932
1904	if (option (Opt_visualBell))	1933	if (option (Opt_visualBell))
1905	{	1934	{
1906	rvideo_bell = true;	1935	rvideo_bell = true;
1907	scr_rvideo_mode (rvideo_mode);	1936	scr_rvideo_mode (rvideo_mode);
1908	display->flush ();	1937	flush ();
1909		1938
1910	bell_ev.start (VISUAL_BELL_DURATION);	1939	bell_ev.start (VISUAL_BELL_DURATION);
1911	}	1940	}
1912	else	1941	else
1913	XBell (dpy, 0);	1942	XBell (dpy, 0);
		1943	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914	#endif	1944	#endif
1915	}	1945	}
1916		1946
1917	/* ------------------------------------------------------------------------- */	1947	/* ------------------------------------------------------------------------- */
1918	/* ARGSUSED */	1948	/* ARGSUSED */
1919	void	1949	void
1920	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1950	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921	{	1951	{
1922	#ifdef PRINTPIPE	1952	#ifdef PRINTPIPE
1923	int nrows, row_start;	1953	int nrows, row_start;
1924	FILE *fd;	1954	FILE *fd = popen_printer ();
1925		1955
1926	if ((fd = popen_printer ()) == NULL)	1956	if (!fd)
1927	return;	1957	return;
1928		1958
1929	if (fullhist)	1959	if (fullhist)
1930	{	1960	{
1931	nrows = nrow - top_row;	1961	nrows = nrow - top_row;
…		…
1937	row_start = view_start;	1967	row_start = view_start;
1938	}	1968	}
1939		1969
1940	wctomb (0, 0);	1970	wctomb (0, 0);
1941		1971
1942	for (int r1 = 0; r1 < nrows; r1++)	1972	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943	{	1973	{
1944	text_t *tp = ROW(r1).t;	1974	text_t *tp = ROW(r1).t;
1945	int len = ROW(r1).l;	1975	int len = ROW(r1).l;
1946		1976
1947	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
…		…
1976	* screen.text/screen.rend contain what the screen will change to.	2006	* screen.text/screen.rend contain what the screen will change to.
1977	*/	2007	*/
1978	void	2008	void
1979	rxvt_term::scr_refresh () NOTHROW	2009	rxvt_term::scr_refresh () NOTHROW
1980	{	2010	{
1981	unsigned char have_bg,
1982	showcursor; /* show the cursor */
1983	int16_t col, row, /* column/row we're processing */	2011	int16_t col, row, /* column/row we're processing */
1984	ocrow; /* old cursor row */	2012	ocrow; /* old cursor row */
1985	int i; /* tmp */	2013	int i; /* tmp */
1986	#ifndef NO_CURSORCOLOR	2014	#ifndef NO_CURSORCOLOR
1987	rend_t cc1; /* store colours at cursor position (s) */	2015	rend_t cc1; /* store colours at cursor position (s) */
…		…
1996	return;	2024	return;
1997		2025
1998	/*	2026	/*
1999	* A: set up vars	2027	* A: set up vars
2000	*/	2028	*/
2001	have_bg = 0;
2002	refresh_count = 0;	2029	refresh_count = 0;
2003		2030
		2031	unsigned int old_screen_flags = screen.flags;
		2032	char have_bg = 0;
2004	#ifdef HAVE_BG_PIXMAP	2033	#ifdef HAVE_BG_PIXMAP
2005	have_bg \|= bgPixmap.pixmap != None;	2034	have_bg = bg_pixmap != None;
2006	#endif	2035	#endif
2007	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2036	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008		2037
2009	/*	2038	/*
2010	* B: reverse any characters which are selected	2039	* B: reverse any characters which are selected
2011	*/	2040	*/
2012	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;
2013		2049
2014	/*	2050	/*
2015	* C: set the cursor character (s)	2051	* C: set the cursor character (s)
2016	*/	2052	*/
2017	{	2053	{
2018	unsigned char setoldcursor;	2054	unsigned char setoldcursor;
2019		2055
2020	showcursor = (screen.flags & Screen_VisibleCursor);
2021	#ifdef CURSOR_BLINK	2056	#ifdef CURSOR_BLINK
2022	if (hidden_cursor)	2057	if (hidden_cursor)
2023	showcursor = 0;	2058	showcursor = 0;
2024	#endif	2059	#endif
2025		2060
…		…
2053	ccol2 = bgcolor_of (rstyle);	2088	ccol2 = bgcolor_of (rstyle);
2054	#else	2089	#else
2055	ccol2 = Color_bg;	2090	ccol2 = Color_bg;
2056	#endif	2091	#endif
2057		2092
2058	if (showcursor && focus)	2093	if (focus)
2059	{	2094	{
2060	if (option (Opt_cursorUnderline))	2095	if (option (Opt_cursorUnderline))
2061	*crp ^= RS_Uline;	2096	*crp ^= RS_Uline;
2062	else	2097	else
2063	{	2098	{
…		…
2098	oldcursor.col = screen.cur.col;	2133	oldcursor.col = screen.cur.col;
2099	}	2134	}
2100	}	2135	}
2101	}	2136	}
2102		2137
2103	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2104	#if ENABLE_OVERLAY
2105	scr_swap_overlay ();
2106	#endif
2107
2108	#ifndef NO_SLOW_LINK_SUPPORT	2138	#ifndef NO_SLOW_LINK_SUPPORT
2109	/*	2139	/*
2110	* D: CopyArea pass - very useful for slower links	2140	* D: CopyArea pass - very useful for slower links
2111	* This has been deliberately kept simple.	2141	* This has been deliberately kept simple.
2112	*/	2142	*/
…		…
2201	continue;	2231	continue;
2202		2232
2203	// redraw one or more characters	2233	// redraw one or more characters
2204		2234
2205	// seek to the beginning of wide characters	2235	// seek to the beginning of wide characters
2206	while (stp[col] == NOCHAR && col > 0)	2236	while (expect_false (stp[col] == NOCHAR && col > 0))
2207	--col;	2237	--col;
2208		2238
2209	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2239	rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210	text_t *text = stp + col;	2240	text_t *text = stp + col;
2211	int count = 1;	2241	int count = 1;
2212		2242
2213	dtp[col] = stp[col];	2243	dtp[col] = stp[col];
2214	drp[col] = rend;	2244	drp[col] = rend;
…		…
2218	for (i = 0; ++col < ncol; )	2248	for (i = 0; ++col < ncol; )
2219	{	2249	{
2220	if (stp[col] == NOCHAR)	2250	if (stp[col] == NOCHAR)
2221	{	2251	{
2222	dtp[col] = stp[col];	2252	dtp[col] = stp[col];
2223	drp[col] = rend;	2253	drp[col] = srp[col];
		2254
2224	count++;	2255	count++;
2225	i++;	2256	i++;
2226		2257
2227	continue;	2258	continue;
2228	}	2259	}
…		…
2248		2279
2249	col--; /* went one too far. move back */	2280	col--; /* went one too far. move back */
2250	count -= i; /* dump any matching trailing chars */	2281	count -= i; /* dump any matching trailing chars */
2251		2282
2252	// sometimes we optimize away the trailing NOCHAR's, add them back	2283	// sometimes we optimize away the trailing NOCHAR's, add them back
2253	while (i && text[count] == NOCHAR)	2284	while (expect_false (i && text[count] == NOCHAR))
2254	count++, i--;	2285	count++, i--;
2255		2286
2256	/*	2287	/*
2257	* Determine the attributes for the string	2288	* Determine the attributes for the string
2258	*/	2289	*/
2259	int fore = fgcolor_of (rend); // desired foreground	2290	int fore = fgcolor_of (rend); // desired foreground
2260	int back = bgcolor_of (rend); // desired background	2291	int back = bgcolor_of (rend); // desired background
2261		2292
2262	// 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
2263	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)))
2264	{	2295	{
2265	bool invert = rend & RS_RVid;	2296	bool invert = rend & RS_RVid;
2266		2297
2267	#ifndef NO_BOLD_UNDERLINE_REVERSE	2298	#ifndef NO_BOLD_UNDERLINE_REVERSE
2268	if (rend & RS_Bold
2269	&& fore == Color_fg)	2299	if (rend & RS_Bold && fore == Color_fg)
2270	{	2300	{
2271	if (ISSET_PIXCOLOR (Color_BD))	2301	if (ISSET_PIXCOLOR (Color_BD))
2272	fore = Color_BD;	2302	fore = Color_BD;
2273	# if !ENABLE_STYLES	2303	# if !ENABLE_STYLES
2274	else	2304	else
2275	invert = !invert;	2305	invert = !invert;
2276	# endif	2306	# endif
2277	}	2307	}
2278		2308
2279	if (rend & RS_Italic	2309	if (rend & RS_Italic && fore == Color_fg)
2280	&& fore == Color_fg)
2281	{	2310	{
2282	if (ISSET_PIXCOLOR (Color_IT))	2311	if (ISSET_PIXCOLOR (Color_IT))
2283	fore = Color_IT;	2312	fore = Color_IT;
2284	# if !ENABLE_STYLES	2313	# if !ENABLE_STYLES
2285	else	2314	else
…		…
2289		2318
2290	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))	2319	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291	fore = Color_UL;	2320	fore = Color_UL;
2292	#endif	2321	#endif
2293		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
2294	if (invert)	2343	if (invert)
2295	{	2344	{
2296	#ifdef OPTION_HC
2297	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298	\|\| !ISSET_PIXCOLOR (Color_HC))
2299	#endif
2300	/* invert the column if no highlightColor is set or it is the
2301	* current cursor column */
2302	::swap (fore, back);	2345	::swap (fore, back);
2303	#ifdef OPTION_HC
2304	else if (ISSET_PIXCOLOR (Color_HC))
2305	back = Color_HC;
2306	#endif
2307		2346
2308	#ifndef NO_BOLD_UNDERLINE_REVERSE	2347	#ifndef NO_BOLD_UNDERLINE_REVERSE
2309	# ifndef OPTION_HC
2310	if (ISSET_PIXCOLOR (Color_RV))
2311	back = Color_RV;
2312	# endif
2313	if (fore == back)	2348	if (fore == back)
2314	{	2349	{
2315	fore = Color_bg;	2350	fore = Color_bg;
2316	back = Color_fg;	2351	back = Color_fg;
2317	}	2352	}
…		…
2353	/*	2388	/*
2354	* Actually do the drawing of the string here	2389	* Actually do the drawing of the string here
2355	*/	2390	*/
2356	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2391	rxvt_font font = (fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357		2392
2358	if (have_bg && back == Color_bg)	2393	if (expect_true (have_bg && back == Color_bg))
2359	{	2394	{
2360	// this is very ugly, maybe push it into ->draw?	2395	// this is very ugly, maybe push it into ->draw?
2361		2396
2362	for (i = 0; i < count; i++) /* don't draw empty strings */	2397	for (i = 0; i < count; i++) /* don't draw empty strings */
2363	if (text[i] != ' ')	2398	if (text[i] != ' ')
…		…
2370	did_clear: ;	2405	did_clear: ;
2371	}	2406	}
2372	else	2407	else
2373	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2408	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374		2409
2375	if (rend & RS_Uline && font->descent > 1 && fore != back)	2410	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376	{	2411	{
2377	#if ENABLE_FRILLS	2412	#if ENABLE_FRILLS
2378	if (ISSET_PIXCOLOR (Color_underline))	2413	if (ISSET_PIXCOLOR (Color_underline))
2379	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2414	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380	else	2415	else
2381	#endif	2416	#endif
2382	XSetForeground (dpy, gc, pix_colors[fore]);	2417	XSetForeground (dpy, gc, pix_colors[fore]);
2383		2418
2384	XDrawLine (dpy, drawBuffer, gc,	2419	XDrawLine (dpy, vt, gc,
2385	xpixel, ypixel + font->ascent + 1,	2420	xpixel, ypixel + font->ascent + 1,
2386	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2421	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387	}	2422	}
2388	} /* for (col....) */	2423	} /* for (col....) */
2389	} /* for (row....) */	2424	} /* for (row....) */
2390
2391	#if ENABLE_OVERLAY
2392	scr_swap_overlay ();
2393	#endif
2394	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395		2425
2396	/*	2426	/*
2397	* G: cleanup cursor and display outline cursor if necessary	2427	* G: cleanup cursor and display outline cursor if necessary
2398	*/	2428	*/
2399	if (showcursor)	2429	if (showcursor)
…		…
2427	XSetForeground (dpy, gc, pix_colors[Color_cursor]);	2457	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428	else	2458	else
2429	#endif	2459	#endif
2430	XSetForeground (dpy, gc, pix_colors[ccol1]);	2460	XSetForeground (dpy, gc, pix_colors[ccol1]);
2431		2461
2432	XDrawRectangle (dpy, drawBuffer, gc,	2462	XDrawRectangle (dpy, vt, gc,
2433	Col2Pixel (col),	2463	Col2Pixel (col),
2434	Row2Pixel (oldcursor.row),	2464	Row2Pixel (oldcursor.row),
2435	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2465	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2436	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2466	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437	}	2467	}
2438	}	2468	}
2439		2469
2440	/*	2470	/*
2441	* H: cleanup selection	2471	* H: cleanup selection
2442	*/	2472	*/
		2473	#if ENABLE_OVERLAY
		2474	scr_swap_overlay ();
		2475	#endif
		2476	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2477
2443	scr_reverse_selection ();	2478	scr_reverse_selection ();
2444		2479
		2480	screen.flags = old_screen_flags;
2445	num_scr = 0;	2481	num_scr = 0;
2446	num_scr_allow = 1;	2482	num_scr_allow = 1;
2447	}	2483	}
2448		2484
2449	void	2485	void
…		…
2470	scr_remap_chars (swap_buf [i]);	2506	scr_remap_chars (swap_buf [i]);
2471	}	2507	}
2472	}	2508	}
2473		2509
2474	void	2510	void
2475	rxvt_term::scr_recolour () NOTHROW	2511	rxvt_term::scr_recolour (bool refresh) NOTHROW
2476	{	2512	{
		2513	bool transparent = false;
		2514
2477	#ifdef HAVE_BG_PIXMAP	2515	#ifdef HAVE_BG_PIXMAP
2478	bgPixmap.apply ();	2516	if (bg_pixmap != None)
2479	#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);
		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	{
2480	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
2481	XClearWindow (dpy, parent[0]);	2540	XClearWindow (dpy, parent[0]);
2482	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2541
2483	# if HAVE_SCROLLBARS
2484	if (scrollBar.win)	2542	if (scrollBar.win)
2485	{	2543	{
		2544	if (transparent)
		2545	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2546	else
2486	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2547	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487	scrollBar.setIdle ();	2548	scrollBar.state = STATE_IDLE;
2488	scrollbar_show (0);	2549	scrollBar.show (0);
2489	}	2550	}
2490	# endif	2551
		2552	if (refresh)
		2553	{
2491	scr_clear ();	2554	scr_clear ();
2492	scr_touch (true);	2555	scr_touch (true);
		2556	}
2493	want_refresh = 1;	2557	want_refresh = 1;
2494	#endif
2495
2496	}	2558	}
2497		2559
2498	/* ------------------------------------------------------------------------- */	2560	/* ------------------------------------------------------------------------- */
2499	void	2561	void
2500	rxvt_term::scr_clear (bool really) NOTHROW	2562	rxvt_term::scr_clear (bool really) NOTHROW
…		…
2567	{	2629	{
2568	#if !ENABLE_MINIMAL	2630	#if !ENABLE_MINIMAL
2569	if (selection.rect)	2631	if (selection.rect)
2570	scr_xor_rect (selection.beg.row, selection.beg.col,	2632	scr_xor_rect (selection.beg.row, selection.beg.col,
2571	selection.end.row, selection.end.col,	2633	selection.end.row, selection.end.col,
2572	RS_RVid, RS_RVid \| RS_Uline);	2634	RS_Sel \| RS_RVid, RS_Sel \| RS_RVid \| RS_Uline);
2573	else	2635	else
2574	#endif	2636	#endif
2575	scr_xor_span (selection.beg.row, selection.beg.col,	2637	scr_xor_span (selection.beg.row, selection.beg.col,
2576	selection.end.row, selection.end.col,	2638	selection.end.row, selection.end.col,
2577	RS_RVid);	2639	RS_Sel \| RS_RVid);
2578	}	2640	}
2579	}	2641	}
2580		2642
2581	/* ------------------------------------------------------------------------- */	2643	/* ------------------------------------------------------------------------- */
2582	/*	2644	/*
…		…
2587	void	2649	void
2588	rxvt_term::scr_dump (int fd) NOTHROW	2650	rxvt_term::scr_dump (int fd) NOTHROW
2589	{	2651	{
2590	int row, wrote;	2652	int row, wrote;
2591	unsigned int width, towrite;	2653	unsigned int width, towrite;
2592	char r1[] = "\n";	2654	const char r1[] = "\n";
2593		2655
2594	for (row = saveLines - nsaved;	2656	for (row = saveLines + top_row;
2595	row < saveLines + nrow - 1; row++)	2657	row < saveLines + nrow - 1; row++)
2596	{	2658	{
2597	width = row_buf[row].l >= 0 ? row_buf[row].l	2659	width = row_buf[row].l >= 0 ? row_buf[row].l
2598	: ncol;	2660	: ncol;
2599	for (towrite = width; towrite; towrite -= wrote)	2661	for (towrite = width; towrite; towrite -= wrote)
…		…
2643	/* ------------------------------------------------------------------------- */	2705	/* ------------------------------------------------------------------------- */
2644	/*	2706	/*
2645	* Paste a selection direct to the command fd	2707	* Paste a selection direct to the command fd
2646	*/	2708	*/
2647	void	2709	void
2648	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2710	rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2649	{	2711	{
2650	/* convert normal newline chars into common keyboard Return key sequence */	2712	/* convert normal newline chars into common keyboard Return key sequence */
2651	for (unsigned int i = 0; i < len; i++)	2713	for (unsigned int i = 0; i < len; i++)
2652	if (data[i] == C0_LF)	2714	if (data[i] == C0_LF)
2653	data[i] = C0_CR;	2715	data[i] = C0_CR;
2654		2716
		2717	if (priv_modes & PrivMode_BracketPaste)
		2718	tt_printf ("\e[200~");
		2719
2655	tt_write (data, len);	2720	tt_write (data, len);
		2721
		2722	if (priv_modes & PrivMode_BracketPaste)
		2723	tt_printf ("\e[201~");
		2724	}
		2725
		2726	void
		2727	rxvt_term::paste (char *data, unsigned int len) NOTHROW
		2728	{
		2729	if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
		2730	return;
		2731
		2732	tt_paste (data, len);
2656	}	2733	}
2657		2734
2658	/* ------------------------------------------------------------------------- */	2735	/* ------------------------------------------------------------------------- */
2659	/*	2736	/*
2660	* Respond to a notification that a primary selection has been sent	2737	* Respond to a notification that a primary selection has been sent
…		…
2663	void	2740	void
2664	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW	2741	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2665	{	2742	{
2666	if (prop == None) /* check for failed XConvertSelection */	2743	if (prop == None) /* check for failed XConvertSelection */
2667	{	2744	{
		2745	int selnum = selection_type & Sel_whereMask;
		2746
2668	if ((selection_type & Sel_CompoundText))	2747	if ((selection_type & Sel_CompoundText))
2669	{	2748	{
2670	int selnum = selection_type & Sel_whereMask;
2671
2672	selection_type = 0;	2749	selection_type = 0;
2673	if (selnum != Sel_direct)
2674	selection_request_other (XA_STRING, selnum);	2750	selection_request_other (XA_STRING, selnum);
2675	}	2751	}
2676		2752
2677	if ((selection_type & Sel_UTF8String))	2753	if ((selection_type & Sel_UTF8String))
2678	{	2754	{
2679	int selnum = selection_type & Sel_whereMask;
2680
2681	selection_type = Sel_CompoundText;	2755	selection_type = Sel_CompoundText;
2682	if (selnum != Sel_direct)
2683	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2756	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2684	else
2685	selection_type = 0;
2686	}	2757	}
2687		2758
2688	return;	2759	return;
2689	}	2760	}
2690		2761
2691	unsigned long bytes_after;	2762	unsigned long bytes_after;
2692	XTextProperty ct;	2763	XTextProperty ct;
2693		2764
		2765	// length == (2^31 - 1) / 4, as gdk
2694	if (XGetWindowProperty (dpy, win, prop,	2766	if (XGetWindowProperty (dpy, win, prop,
2695	0, PROP_SIZE / 4,	2767	0, 0x1fffffff,
2696	delete_prop, AnyPropertyType,	2768	delete_prop, AnyPropertyType,
2697	&ct.encoding, &ct.format,	2769	&ct.encoding, &ct.format,
2698	&ct.nitems, &bytes_after,	2770	&ct.nitems, &bytes_after,
2699	&ct.value) != Success)	2771	&ct.value) != Success)
2700	{	2772	{
…		…
2702	goto bailout;	2774	goto bailout;
2703	}	2775	}
2704		2776
2705	if (ct.encoding == None)	2777	if (ct.encoding == None)
2706	goto bailout;	2778	goto bailout;
2707
2708	if (bytes_after)
2709	{
2710	// fetch and append remaining data
2711	XTextProperty ct2;
2712
2713	if (XGetWindowProperty (dpy, win, prop,
2714	ct.nitems / 4, (bytes_after + 3) / 4,
2715	delete_prop, AnyPropertyType,
2716	&ct2.encoding, &ct2.format,
2717	&ct2.nitems, &bytes_after,
2718	&ct2.value) != Success)
2719	goto bailout;
2720
2721	// realloc should be compatible to XFree, here, and elsewhere, too
2722	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2723	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2724	ct.nitems += ct2.nitems;
2725
2726	XFree (ct2.value);
2727	}
2728		2779
2729	if (ct.value == 0)	2780	if (ct.value == 0)
2730	goto bailout;	2781	goto bailout;
2731		2782
2732	if (ct.encoding == xa[XA_INCR])	2783	if (ct.encoding == xa[XA_INCR])
…		…
2763	{	2814	{
2764	/*	2815	/*
2765	* pass through again trying CUT_BUFFER0 if we've come from	2816	* pass through again trying CUT_BUFFER0 if we've come from
2766	* XConvertSelection () but nothing was presented	2817	* XConvertSelection () but nothing was presented
2767	*/	2818	*/
2768	selection_paste (display->root, XA_CUT_BUFFER0, False);	2819	selection_paste (display->root, XA_CUT_BUFFER0, false);
2769	}	2820	}
2770		2821
2771	goto bailout;	2822	goto bailout;
2772	}	2823	}
2773	}	2824	}
…		…
2776	incr_ev.start (10);	2827	incr_ev.start (10);
2777		2828
2778	while (incr_buf_fill + ct.nitems > incr_buf_size)	2829	while (incr_buf_fill + ct.nitems > incr_buf_size)
2779	{	2830	{
2780	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2831	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2832	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2782	}	2833	}
2783		2834
2784	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2835	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2785	incr_buf_fill += ct.nitems;	2836	incr_buf_fill += ct.nitems;
2786		2837
…		…
2869	selection_wait = Sel_normal;	2920	selection_wait = Sel_normal;
2870		2921
2871	#if X_HAVE_UTF8_STRING	2922	#if X_HAVE_UTF8_STRING
2872	selection_type = Sel_UTF8String;	2923	selection_type = Sel_UTF8String;
2873	if (selection_request_other (xa[XA_UTF8_STRING], selnum))	2924	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2874	return;	2925	return;
2875	#else	2926	#else
2876	selection_type = Sel_CompoundText;	2927	selection_type = Sel_CompoundText;
2877	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))	2928	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2878	return;	2929	return;
2879	#endif	2930	#endif
2880	}	2931	}
2881		2932
2882	selection_wait = Sel_none; /* don't loop in selection_paste () */	2933	selection_wait = Sel_none; /* don't loop in selection_paste () */
2883	selection_paste (display->root, XA_CUT_BUFFER0, false);	2934	selection_paste (display->root, XA_CUT_BUFFER0, false);
…		…
2911	/*	2962	/*
2912	* Clear all selected text	2963	* Clear all selected text
2913	* EXT: SelectionClear	2964	* EXT: SelectionClear
2914	*/	2965	*/
2915	void	2966	void
2916	rxvt_term::selection_clear () NOTHROW	2967	rxvt_term::selection_clear (bool clipboard) NOTHROW
2917	{	2968	{
		2969	if (!clipboard)
		2970	{
2918	want_refresh = 1;	2971	want_refresh = 1;
2919	free (selection.text);	2972	free (selection.text);
2920	selection.text = NULL;	2973	selection.text = NULL;
2921	selection.len = 0;	2974	selection.len = 0;
2922	CLEAR_SELECTION ();	2975	CLEAR_SELECTION ();
2923		2976
2924	if (display->selection_owner == this)	2977	if (display->selection_owner == this)
2925	display->selection_owner = 0;	2978	display->selection_owner = 0;
		2979	}
		2980	else
		2981	{
		2982	free (selection.clip_text);
		2983	selection.clip_text = NULL;
		2984	selection.clip_len = 0;
		2985
		2986	if (display->clipboard_owner == this)
		2987	display->clipboard_owner = 0;
		2988	}
2926	}	2989	}
2927		2990
2928	/* ------------------------------------------------------------------------- */	2991	/* ------------------------------------------------------------------------- */
2929	/*	2992	/*
2930	* Copy a selection into the cut buffer	2993	* Copy a selection into the cut buffer
2931	* EXT: button 1 or 3 release	2994	* EXT: button 1 or 3 release
2932	*/	2995	*/
2933	void	2996	void
2934	rxvt_term::selection_make (Time tm)	2997	rxvt_term::selection_make (Time tm)
2935	{	2998	{
2936	int i;	2999	int size;
2937	wchar_t *new_selection_text;	3000	wchar_t *new_selection_text;
2938	text_t *t;	3001	text_t *t;
2939		3002
2940	switch (selection.op)	3003	switch (selection.op)
2941	{	3004	{
…		…
2957	return; /* nothing selected, go away */	3020	return; /* nothing selected, go away */
2958		3021
2959	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3022	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2960	return;	3023	return;
2961		3024
2962	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3025	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2963	new_selection_text = (wchar_t )rxvt_malloc ((i + 4) sizeof (wchar_t));	3026	new_selection_text = (wchar_t )rxvt_malloc ((size + 4) sizeof (wchar_t));
2964		3027
2965	int ofs = 0;	3028	int ofs = 0;
2966	int extra = 0;	3029	int extra = 0;
2967		3030
2968	int col = selection.beg.col;	3031	int col = selection.beg.col;
…		…
2974	{	3037	{
2975	#if !ENABLE_MINIMAL	3038	#if !ENABLE_MINIMAL
2976	if (selection.rect)	3039	if (selection.rect)
2977	{	3040	{
2978	col = selection.beg.col;	3041	col = selection.beg.col;
2979	end_col = ncol + 1;	3042	end_col = selection.end.col;
2980	}	3043	}
2981	else	3044	else
2982	#endif	3045	#endif
2983	end_col = ROW(row).l;	3046	end_col = ROW(row).l;
2984		3047
2985	col = max (col, 0);	3048	col = max (col, 0);
2986		3049
2987	if (row == selection.end.row	3050	if (row == selection.end.row)
2988	#if !ENABLE_MINIMAL
2989	\|\| selection.rect
2990	#endif
2991	)
2992	min_it (end_col, selection.end.col);	3051	min_it (end_col, selection.end.col);
2993		3052
2994	t = ROW(row).t + col;	3053	t = ROW(row).t + col;
2995		3054
2996	for (; col < end_col; col++)	3055	for (; col < end_col; col++)
…		…
3004		3063
3005	extra -= (len - 1);	3064	extra -= (len - 1);
3006		3065
3007	if (extra < 0)	3066	if (extra < 0)
3008	{	3067	{
3009	extra += i;	3068	extra += size;
3010	i += i;	3069	size += size;
3011	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3070	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3012	}	3071	}
3013		3072
3014	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3073	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3015	}	3074	}
3016	#endif	3075	#endif
…		…
3028		3087
3029	new_selection_text[ofs++] = C0_LF;	3088	new_selection_text[ofs++] = C0_LF;
3030	}	3089	}
3031	else	3090	else
3032	#endif	3091	#endif
3033	if (!ROW(row).is_longer () && row != selection.end.row)	3092	if (!ROW(row).is_longer ()
		3093	&& (row != selection.end.row \|\| end_col != selection.end.col)
		3094	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3034	new_selection_text[ofs++] = C0_LF;	3095	new_selection_text[ofs++] = C0_LF;
3035	}	3096	}
3036
3037	if (end_col != selection.end.col)
3038	new_selection_text[ofs++] = C0_LF;
3039		3097
3040	new_selection_text[ofs] = 0;	3098	new_selection_text[ofs] = 0;
3041		3099
3042	if (ofs == 0)	3100	if (ofs == 0)
3043	{	3101	{
…		…
3056		3114
3057	selection_grab (tm);	3115	selection_grab (tm);
3058	}	3116	}
3059		3117
3060	bool	3118	bool
3061	rxvt_term::selection_grab (Time tm) NOTHROW	3119	rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3062	{	3120	{
		3121	Atom sel;
		3122
		3123	if (!clipboard)
		3124	{
3063	selection_time = tm;	3125	selection_time = tm;
		3126	sel = XA_PRIMARY;
		3127	}
		3128	else
		3129	{
		3130	clipboard_time = tm;
		3131	sel = xa[XA_CLIPBOARD];
		3132	}
3064		3133
3065	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);	3134	XSetSelectionOwner (dpy, sel, vt, tm);
3066	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)	3135	if (XGetSelectionOwner (dpy, sel) == vt)
3067	{	3136	{
3068	display->set_selection_owner (this);	3137	display->set_selection_owner (this, clipboard);
3069	return true;	3138	return true;
3070	}	3139	}
3071	else	3140	else
3072	{	3141	{
3073	selection_clear ();	3142	selection_clear (clipboard);
3074	return false;	3143	return false;
3075	}	3144	}
3076		3145
3077	#if 0	3146	#if 0
3078	XTextProperty ct;	3147	XTextProperty ct;
…		…
3573	else if (rq.target == xa[XA_MULTIPLE])	3642	else if (rq.target == xa[XA_MULTIPLE])
3574	{	3643	{
3575	/* TODO: Handle MULTIPLE */	3644	/* TODO: Handle MULTIPLE */
3576	}	3645	}
3577	#endif	3646	#endif
3578	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3647	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3579	{	3648	{
3580	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,	3649	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3581	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3650	32, PropModeReplace, (unsigned char *)&selection_time, 1);
		3651	ev.property = rq.property;
		3652	}
		3653	else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3654	{
		3655	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
		3656	32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3582	ev.property = rq.property;	3657	ev.property = rq.property;
3583	}	3658	}
3584	else if (rq.target == XA_STRING	3659	else if (rq.target == XA_STRING
3585	\|\| rq.target == xa[XA_TEXT]	3660	\|\| rq.target == xa[XA_TEXT]
3586	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3661	\|\| rq.target == xa[XA_COMPOUND_TEXT]
…		…
3619	{	3694	{
3620	target = xa[XA_COMPOUND_TEXT];	3695	target = xa[XA_COMPOUND_TEXT];
3621	style = enc_compound_text;	3696	style = enc_compound_text;
3622	}	3697	}
3623		3698
3624	if (selection.text)	3699	if (rq.selection == XA_PRIMARY && selection.text)
3625	{	3700	{
3626	cl = selection.text;	3701	cl = selection.text;
3627	selectlen = selection.len;	3702	selectlen = selection.len;
		3703	}
		3704	else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
		3705	{
		3706	cl = selection.clip_text;
		3707	selectlen = selection.clip_len;
3628	}	3708	}
3629	else	3709	else
3630	{	3710	{
3631	cl = L"";	3711	cl = L"";
3632	selectlen = 0;	3712	selectlen = 0;
…		…
3700	h += 2; min_it (h, nrow);	3780	h += 2; min_it (h, nrow);
3701		3781
3702	x -= 1; clamp_it (x, 0, ncol - w);	3782	x -= 1; clamp_it (x, 0, ncol - w);
3703	y -= 1; clamp_it (y, 0, nrow - h);	3783	y -= 1; clamp_it (y, 0, nrow - h);
3704		3784
3705	ov_x = x; ov_y = y;	3785	ov.x = x; ov.y = y;
3706	ov_w = w; ov_h = h;	3786	ov.w = w; ov.h = h;
3707		3787
3708	ov_text = new text_t *[h];	3788	ov.text = new text_t *[h];
3709	ov_rend = new rend_t *[h];	3789	ov.rend = new rend_t *[h];
3710		3790
3711	for (y = 0; y < h; y++)	3791	for (y = 0; y < h; y++)
3712	{	3792	{
3713	text_t *tp = ov_text[y] = new text_t[w];	3793	text_t *tp = ov.text[y] = new text_t[w];
3714	rend_t *rp = ov_rend[y] = new rend_t[w];	3794	rend_t *rp = ov.rend[y] = new rend_t[w];
3715		3795
3716	text_t t0, t1, t2;	3796	text_t t0, t1, t2;
3717	rend_t r = OVERLAY_RSTYLE;	3797	rend_t r = OVERLAY_RSTYLE;
3718		3798
3719	if (y == 0)	3799	if (y == 0)
…		…
3738	}	3818	}
3739		3819
3740	void	3820	void
3741	rxvt_term::scr_overlay_off () NOTHROW	3821	rxvt_term::scr_overlay_off () NOTHROW
3742	{	3822	{
3743	if (!ov_text)	3823	if (!ov.text)
3744	return;	3824	return;
3745		3825
3746	want_refresh = 1;	3826	want_refresh = 1;
3747		3827
3748	for (int y = 0; y < ov_h; y++)	3828	for (int y = 0; y < ov.h; y++)
3749	{	3829	{
3750	delete [] ov_text[y];	3830	delete [] ov.text[y];
3751	delete [] ov_rend[y];	3831	delete [] ov.rend[y];
3752	}	3832	}
3753		3833
3754	delete [] ov_text; ov_text = 0;	3834	delete [] ov.text; ov.text = 0;
3755	delete [] ov_rend; ov_rend = 0;	3835	delete [] ov.rend; ov.rend = 0;
3756	}	3836	}
3757		3837
3758	void	3838	void
3759	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3839	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3760	{	3840	{
3761	if (!ov_text \|\| x >= ov_w - 2 \|\| y >= ov_h - 2)	3841	if (!ov.text \|\| x >= ov.w - 2 \|\| y >= ov.h - 2)
3762	return;	3842	return;
3763		3843
3764	x++, y++;	3844	x++, y++;
3765		3845
3766	ov_text[y][x] = text;	3846	ov.text[y][x] = text;
3767	ov_rend[y][x] = rend;	3847	ov.rend[y][x] = rend;
3768	}	3848	}
3769		3849
3770	void	3850	void
3771	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3851	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3772	{	3852	{
…		…
3791	}	3871	}
3792		3872
3793	void	3873	void
3794	rxvt_term::scr_swap_overlay () NOTHROW	3874	rxvt_term::scr_swap_overlay () NOTHROW
3795	{	3875	{
3796	if (!ov_text)	3876	if (!ov.text)
3797	return;	3877	return;
3798		3878
		3879	// hide cursor if it is within the overlay area
		3880	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3881	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3882	screen.flags &= ~Screen_VisibleCursor;
		3883
3799	// swap screen mem with overlay	3884	// swap screen mem with overlay
3800	for (int y = ov_h; y--; )	3885	for (int y = ov.h; y--; )
3801	{	3886	{
3802	text_t *t1 = ov_text[y];	3887	text_t *t1 = ov.text[y];
3803	rend_t *r1 = ov_rend[y];	3888	rend_t *r1 = ov.rend[y];
3804		3889
3805	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3890	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3806	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3891	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3807		3892
3808	for (int x = ov_w; x--; )	3893	for (int x = ov.w; x--; )
3809	{	3894	{
3810	text_t t = t1; t1++ = t2; t2++ = t;	3895	text_t t = t1; t1++ = t2; t2++ = t;
3811	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3896	rend_t r = r1; r1++ = r2; r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3812	}	3897	}
3813	}	3898	}

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.289 by root, Fri Dec 14 05:25:26 2007 UTC vs. Revision 1.370 by sf-exg, Sun Feb 6 11:42:28 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.289 by root, Fri Dec 14 05:25:26 2007 UTC vs.
Revision 1.370 by sf-exg, Sun Feb 6 11:42:28 2011 UTC