ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.158 by root, Sat Feb 19 19:37:34 2005 UTC

…		…
23	/*	23	/*
24	* This file handles _all_ screen updates and selections	24	* This file handles _all_ screen updates and selections
25	*/	25	*/
26		26
27	#include "../config.h" /* NECESSARY */	27	#include "../config.h" /* NECESSARY */
28	#define INTERN_SCREEN
29	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
30		29
31	#include <X11/Xmd.h> /* get the typedef for CARD32 */	30	#include <X11/Xmd.h> /* get the typedef for CARD32 */
32		31
33	#include <inttypes.h>	32	#include <inttypes.h>
34	#include <wchar.h>
35		33
36	#include "salloc.C" // HACK, should be a seperate compile!	34	#include "salloc.C" // HACK, should be a seperate compile!
37		35
38	inline void fill_text (text_t *start, text_t value, int len)	36	inline void fill_text (text_t *start, text_t value, int len)
39	{	37	{
40	while (len--)	38	while (len--)
41	*start++ = value;	39	*start++ = value;
42	}	40	}
43		41
44	/* ------------------------------------------------------------------------- */	42	/* ------------------------------------------------------------------------- */
45	#define PROP_SIZE 16384	43	#define PROP_SIZE 256*1024
		44	#define PASTE_SIZE 32768
46	#define TABSIZE 8 /* default tab size */	45	#define TABSIZE 8 /* default tab size */
47		46
48	/* ------------------------------------------------------------------------- *	47	/* ------------------------------------------------------------------------- *
49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50	* ------------------------------------------------------------------------- */	49	* ------------------------------------------------------------------------- */
…		…
112	(unsigned int)Height2Pixel (num))	111	(unsigned int)Height2Pixel (num))
113		112
114	/* ------------------------------------------------------------------------- *	113	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	114	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	115	* ------------------------------------------------------------------------- */
		116
117	/* Fill part/all of a line with blanks. */	117	/* Fill part/all of a line with blanks. */
118	void	118	void
119	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)	119	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
120	{	120	{
121	efs &= ~RS_baseattrMask;	121	efs &= ~RS_baseattrMask;
122	efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);	122	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123		123
124	while (width--)	124	while (width--)
125	{	125	{
126	*et++ = ' ';	126	*et++ = ' ';
127	*er++ = efs;	127	*er++ = efs;
…		…
293	ralloc->free (drawn_rend[p]);	293	ralloc->free (drawn_rend[p]);
294	}	294	}
295		295
296	/* we have fewer rows so fix up cursor position */	296	/* we have fewer rows so fix up cursor position */
297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298	MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299		298
300	scr_reset_realloc (); /* realloc _last_ */	299	scr_reset_realloc (); /* realloc _last_ */
301	}	300	}
302	else if (nrow > prev_nrow)	301	else if (nrow > prev_nrow)
303	{	302	{
…		…
334	scr_scroll_text (0, (int)nrow - 1, -k, 1);	333	scr_scroll_text (0, (int)nrow - 1, -k, 1);
335	screen.cur.row += k;	334	screen.cur.row += k;
336	screen.s_cur.row += k;	335	screen.s_cur.row += k;
337	TermWin.nscrolled -= k;	336	TermWin.nscrolled -= k;
338	}	337	}
		338
339	#ifdef DEBUG_STRICT	339	#ifdef DEBUG_STRICT
340	assert (screen.cur.row < TermWin.nrow);	340	assert (screen.cur.row < TermWin.nrow);
341	assert (swap.cur.row < TermWin.nrow);
342	#else /* drive with your eyes closed */	341	#else /* drive with your eyes closed */
343
344	MIN_IT (screen.cur.row, nrow - 1);	342	MIN_IT (screen.cur.row, nrow - 1);
345	MIN_IT (swap.cur.row, nrow - 1);
346	#endif	343	#endif
347	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348	}	345	}
349		346
350	/* resize columns */	347	/* resize columns */
…		…
393	}	390	}
394		391
395	}	392	}
396		393
397	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	394	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398	MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399		395
400	delete talloc; talloc = ta;	396	delete talloc; talloc = ta;
401	delete ralloc; ralloc = ra;	397	delete ralloc; ralloc = ra;
402	}	398	}
403		399
…		…
417	}	413	}
418		414
419	void	415	void
420	rxvt_term::scr_reset_realloc ()	416	rxvt_term::scr_reset_realloc ()
421	{	417	{
422	uint16_t total_rows, nrow;	418	unsigned int total_rows, nrow;
423		419
424	nrow = TermWin.nrow;	420	nrow = TermWin.nrow;
425	total_rows = nrow + TermWin.saveLines;	421	total_rows = nrow + TermWin.saveLines;
426	/* *INDENT-OFF* */	422	/* *INDENT-OFF* */
427	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));	423	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
…		…
444	* Free everything. That way malloc debugging can find leakage.	440	* Free everything. That way malloc debugging can find leakage.
445	*/	441	*/
446	void	442	void
447	rxvt_term::scr_release ()	443	rxvt_term::scr_release ()
448	{	444	{
449	uint16_t total_rows;	445	unsigned int total_rows;
450	int i;	446	int i;
451		447
452	total_rows = TermWin.nrow + TermWin.saveLines;	448	total_rows = TermWin.nrow + TermWin.saveLines;
453		449
454	delete talloc; talloc = 0;	450	delete talloc; talloc = 0;
…		…
511	s = &screen;	507	s = &screen;
512		508
513	switch (mode)	509	switch (mode)
514	{	510	{
515	case SAVE:	511	case SAVE:
516	s->s_cur.row = s->cur.row;	512	s->s_cur.row = screen.cur.row;
517	s->s_cur.col = s->cur.col;	513	s->s_cur.col = screen.cur.col;
518	s->s_rstyle = rstyle;	514	s->s_rstyle = rstyle;
519	s->s_charset = s->charset;	515	s->s_charset = screen.charset;
520	s->s_charset_char = charsets[s->charset];	516	s->s_charset_char = charsets[screen.charset];
521	break;	517	break;
522		518
523	case RESTORE:	519	case RESTORE:
524	want_refresh = 1;	520	want_refresh = 1;
525	s->cur.row = s->s_cur.row;	521	screen.cur.row = s->s_cur.row;
526	s->cur.col = s->s_cur.col;	522	screen.cur.col = s->s_cur.col;
527	s->flags &= ~Screen_WrapNext;	523	screen.flags &= ~Screen_WrapNext;
528	rstyle = s->s_rstyle;	524	rstyle = s->s_rstyle;
529	s->charset = s->s_charset;	525	screen.charset = s->s_charset;
530	charsets[s->charset] = s->s_charset_char;	526	charsets[screen.charset] = s->s_charset_char;
531	set_font_style ();	527	set_font_style ();
532	break;	528	break;
533	}	529	}
534		530
535	/* boundary check in case screen size changed between SAVE and RESTORE */	531	/* boundary check in case screen size changed between SAVE and RESTORE */
…		…
565	if (current_screen == scrn)	561	if (current_screen == scrn)
566	return scrn;	562	return scrn;
567		563
568	selection_check (2); /* check for boundary cross */	564	selection_check (2); /* check for boundary cross */
569		565
570	SWAP_IT (current_screen, scrn, int);	566	i = current_screen; current_screen = scrn; scrn = i;
		567
		568	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
		569	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
		570	MAX_IT (screen.cur.row, 0);
		571	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
		572	MAX_IT (screen.cur.col, 0);
		573	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
		574
571	#if NSCREENS	575	#if NSCREENS
572	if (options & Opt_secondaryScreen)	576	if (options & Opt_secondaryScreen)
573	{	577	{
574	num_scr = 0;	578	num_scr = 0;
575	offset = TermWin.saveLines;	579	offset = TermWin.saveLines;
		580
576	for (i = prev_nrow; i--;)	581	for (i = prev_nrow; i--;)
577	{	582	{
578	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);	583	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);	584	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);	585	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581	}	586	}
582	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	587
583	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584	# ifdef DEBUG_STRICT
585	assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586	assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587	# else /* drive with your eyes closed */
588	MAX_IT (screen.cur.row, 0);
589	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590	MAX_IT (screen.cur.col, 0);
591	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592	# endif
593	SWAP_IT (screen.charset, swap.charset, int16_t);	588	SWAP_IT (screen.charset, swap.charset, int16_t);
594	SWAP_IT (screen.flags, swap.flags, int);	589	SWAP_IT (screen.flags, swap.flags, int);
595	screen.flags |= Screen_VisibleCursor;	590	screen.flags |= Screen_VisibleCursor;
596	swap.flags |= Screen_VisibleCursor;	591	swap.flags |= Screen_VisibleCursor;
597	}	592	}
598	else	593	else
599	#endif	594	#endif
600	if (options & Opt_secondaryScroll)	595	if (options & Opt_secondaryScroll)
601	//if (current_screen == PRIMARY)
602	scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);	596	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
		597
603	return scrn;	598	return scrn;
604	}	599	}
605		600
606	// clear WrapNext indicator, solidifying position on next line	601	// clear WrapNext indicator, solidifying position on next line
607	void	602	void
…		…
625	* Change the colour for following text	620	* Change the colour for following text
626	*/	621	*/
627	void	622	void
628	rxvt_term::scr_color (unsigned int color, int fgbg)	623	rxvt_term::scr_color (unsigned int color, int fgbg)
629	{	624	{
630	color &= RS_fgMask;	625	if (color > maxTermCOLOR)
		626	color = fgbg;
		627
631	if (fgbg == Color_fg)	628	if (fgbg == Color_fg)
632	rstyle = SET_FGCOLOR (rstyle, color);	629	rstyle = SET_FGCOLOR (rstyle, color);
633	else	630	else
634	rstyle = SET_BGCOLOR (rstyle, color);	631	rstyle = SET_BGCOLOR (rstyle, color);
635	}	632	}
…		…
673	nscrolled = (long)TermWin.nscrolled + (long)count;	670	nscrolled = (long)TermWin.nscrolled + (long)count;
674		671
675	if (nscrolled > (long)TermWin.saveLines)	672	if (nscrolled > (long)TermWin.saveLines)
676	TermWin.nscrolled = TermWin.saveLines;	673	TermWin.nscrolled = TermWin.saveLines;
677	else	674	else
678	TermWin.nscrolled = (uint16_t)nscrolled;	675	TermWin.nscrolled = (unsigned int)nscrolled;
679		676
680	if ((options & Opt_scrollWithBuffer)	677	if ((options & Opt_scrollWithBuffer)
681	&& TermWin.view_start != 0	678	&& TermWin.view_start != 0
682	&& TermWin.view_start != TermWin.saveLines)	679	&& TermWin.view_start != TermWin.saveLines)
683	scr_page (UP, count);	680	scr_page (UP, count);
…		…
826		823
827	if (c < 0x20)	824	if (c < 0x20)
828	switch (c)	825	switch (c)
829	{	826	{
830	case C0_HT:	827	case C0_HT:
831	scr_tab (1);	828	scr_tab (1, true);
832	continue;	829	continue;
833		830
834	case C0_LF:	831	case C0_LF:
835	if (screen.tlen[row] != -1) /* XXX: think about this */	832	if (screen.tlen[row] != -1) /* XXX: think about this */
836	MAX_IT (screen.tlen[row], screen.cur.col);	833	MAX_IT (screen.tlen[row], screen.cur.col);
…		…
876		873
877	stp = screen.text[row]; /* _must_ refresh */	874	stp = screen.text[row]; /* _must_ refresh */
878	srp = screen.rend[row]; /* _must_ refresh */	875	srp = screen.rend[row]; /* _must_ refresh */
879	}	876	}
880		877
881	if (screen.flags & Screen_Insert)
882	scr_insdel_chars (1, INSERT);
883
884	// rely on wcwidth to tell us the character width, at least for non-latin1	878	// rely on wcwidth to tell us the character width, at least for non-latin1
885	// do wcwidth before further replacements, as wcwidth says that line-drawing	879	// do wcwidth before further replacements, as wcwidth says that line-drawing
886	// characters have width -1 (DOH!) on GNU/Linux sometimes.	880	// characters have width -1 (DOH!) on GNU/Linux sometimes.
887	int width = c < 0x100 ? 1 : wcwidth (c);	881	int width = c < 0x100 ? 1 : wcwidth (c);
888		882
889	if (charsets[screen.charset] == '0') // DEC SPECIAL	883	if (charsets[screen.charset] == '0') // DEC SPECIAL
890	{	884	{
891	// vt100 special graphics and line drawing	885	// vt100 special graphics and line drawing
		886	// 5f-7e standard vt100
		887	// 40-5e rxvt extension for extra curses acs chars
892	static uint16_t vt100_0[32] = { // 5f .. 7e	888	static uint16_t vt100_0[63] = { // 40 .. 7e
		889	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
		890	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
		891	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
		892	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
893	0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,	893	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894	0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,	894	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895	0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,	895	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896	0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,	896	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897	};	897	};
898		898
899	if (c >= 0x5f && c <= 0x7e)	899	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
900	{	900	{
901	c = vt100_0[c - 0x5f];	901	c = vt100_0[c - 0x40];
902	width = 1;	902	width = 1;
903	}	903	}
904	}	904	}
905		905
		906	if (screen.flags & Screen_Insert)
		907	scr_insdel_chars (width, INSERT);
		908
906	if (width != 0)	909	if (width != 0)
907	{	910	{
		911	// some utf-8 decoders decode surrogate characters.
		912	if (0xd800 <= c && c <= 0xdfff)
		913	c = 0xfffd;
		914
908	#if !UNICODE_3	915	#if !UNICODE_3
909	// trim characters we can't store directly :(	916	// trim characters we can't store directly :(
910	if (c >= 0x10000)	917	if (c >= 0x10000)
911	# if ENABLE_COMBINING	918	# if ENABLE_COMBINING
912	c = rxvt_composite.compose (c); // map to lower 16 bits	919	c = rxvt_composite.compose (c); // map to lower 16 bits
913	# else	920	# else
914	c = 0xfffd;	921	c = 0xfffd;
915	# endif	922	# endif
916	#endif	923	#endif
917	bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);	924
918	rend_t rend = SET_FONT (rstyle,	925	// nuke the character at this position, if required
919	c > 0x7f || bold || c < 0x20	926	if (stp[screen.cur.col] == NOCHAR
920	? TermWin.fontset->find_font (c, bold)	927	|| (screen.cur.col < TermWin.ncol - 1
921	: TermWin.ascii_map [c - 0x20]);	928	&& stp[screen.cur.col + 1] == NOCHAR))
		929	{
		930	int col = screen.cur.col;
		931
		932	// find begin
		933	while (col > 0 && stp[col] == NOCHAR)
		934	col--;
		935
		936	rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
		937
		938	// found begin, nuke
		939	do {
		940	stp[col] = ' ';
		941	srp[col] = rend;
		942	col++;
		943	} while (col < TermWin.ncol && stp[col] == NOCHAR);
		944	}
		945
		946	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922		947
923	do	948	do
924	{	949	{
925	stp[screen.cur.col] = c;	950	stp[screen.cur.col] = c;
926	srp[screen.cur.col] = rend;	951	srp[screen.cur.col] = rend;
…		…
938	c = NOCHAR;	963	c = NOCHAR;
939	}	964	}
940	while (--width > 0);	965	while (--width > 0);
941		966
942	// pad with spaces when overwriting wide character with smaller one	967	// pad with spaces when overwriting wide character with smaller one
		968	if (!width)
943	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)	969	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944	{	970	{
945	stp[c] = ' ';	971	stp[c] = ' ';
946	srp[c] = rend;	972	srp[c] = rend;
947	}	973	}
948	}	974	}
949	else if (width == 0)	975	else if (width == 0)
950	{	976	{
951	#if ENABLE_COMBINING	977	#if ENABLE_COMBINING
952	// handle combining characters	978	// handle combining characters
…		…
959		985
960	if (screen.cur.col > 0)	986	if (screen.cur.col > 0)
961	{	987	{
962	tp = stp + screen.cur.col - 1;	988	tp = stp + screen.cur.col - 1;
963	rp = srp + screen.cur.col - 1;	989	rp = srp + screen.cur.col - 1;
		990
		991	while (*tp == NOCHAR && tp > stp)
		992	tp--, rp--;
964	}	993	}
965	else if (screen.cur.row > 0	994	else if (screen.cur.row > 0
966	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)	995	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967	{	996	{
968	tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;	997	int line = screen.cur.row - 1 + TermWin.saveLines;
969	rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;	998
		999	tp = screen.text[line] + last_col - 1;
		1000	rp = screen.rend[line] + last_col - 1;
		1001
		1002	while (*tp == NOCHAR && tp > screen.text[line])
		1003	tp--, rp--;
970	}	1004	}
971	else	1005	else
972	continue;	1006	continue;
973
974	// handle double-width-chars by making them look extremely ugly
975	if (*tp == NOCHAR)
976	*tp = ' '; // hack //D //TODO //--tp, --rp;
977		1007
978	// first try to find a precomposed character	1008	// first try to find a precomposed character
979	unicode_t n = rxvt_compose (*tp, c);	1009	unicode_t n = rxvt_compose (*tp, c);
980	if (n == NOCHAR)	1010	if (n == NOCHAR)
981	n = rxvt_composite.compose (*tp, c);	1011	n = rxvt_composite.compose (*tp, c);
982		1012
983	*tp = n;	1013	*tp = n;
984	*rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));	1014	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985	#endif	1015	#endif
986	}	1016	}
987	}	1017	}
988		1018
989	if (screen.tlen[row] != -1) /* XXX: think about this */	1019	if (screen.tlen[row] != -1) /* XXX: think about this */
…		…
1028	* Process Horizontal Tab	1058	* Process Horizontal Tab
1029	* count: +ve = forward; -ve = backwards	1059	* count: +ve = forward; -ve = backwards
1030	* XTERM_SEQ: CTRL-I	1060	* XTERM_SEQ: CTRL-I
1031	*/	1061	*/
1032	void	1062	void
1033	rxvt_term::scr_tab (int count)	1063	rxvt_term::scr_tab (int count, bool ht)
1034	{	1064	{
1035	int i, x;	1065	int i, x;
1036		1066
1037	want_refresh = 1;	1067	want_refresh = 1;
1038	i = x = screen.cur.col;	1068	i = x = screen.cur.col;
1039		1069
1040	if (count == 0)	1070	if (count == 0)
1041	return;	1071	return;
1042	else if (count > 0)	1072	else if (count > 0)
1043	{	1073	{
		1074	int row = TermWin.saveLines + screen.cur.row;
		1075	text_t *tp = screen.text[row];
		1076	rend_t *rp = screen.rend[row];
		1077	rend_t base_rend = rp[i];
		1078	ht &= tp[i] == ' ';
		1079
1044	for (; ++i < TermWin.ncol; )	1080	for (; ++i < TermWin.ncol; )
1045	if (tabs[i])	1081	if (tabs[i])
1046	{	1082	{
1047	x = i;	1083	x = i;
1048	if (!--count)	1084	if (!--count)
1049	break;	1085	break;
1050	}	1086	}
		1087	else
		1088	ht &= tp[i] == ' '
		1089	&& RS_SAME (rp[i], base_rend);
1051		1090
1052	if (count)	1091	if (count)
1053	x = TermWin.ncol - 1;	1092	x = TermWin.ncol - 1;
		1093
		1094	// store horizontal tab commands as characters inside the text
		1095	// buffer so they can be selected and pasted.
		1096	if (ht && options & Opt_pastableTabs)
		1097	{
		1098	base_rend = SET_FONT (base_rend, 0);
		1099
		1100	if (screen.tlen[row] != -1) /* XXX: think about this */
		1101	MAX_IT (screen.tlen[row], x);
		1102
		1103	i = screen.cur.col;
		1104
		1105	tp[i] = '\t';
		1106	rp[i] = base_rend;
		1107
		1108	while (++i < x)
		1109	{
		1110	tp[i] = NOCHAR;
		1111	rp[i] = base_rend;
		1112	}
		1113	}
1054	}	1114	}
1055	else /* if (count < 0) */	1115	else /* if (count < 0) */
1056	{	1116	{
1057	for (; --i >= 0; )	1117	for (; --i >= 0; )
1058	if (tabs[i])	1118	if (tabs[i])
…		…
1314	ren = DEFAULT_RSTYLE;	1374	ren = DEFAULT_RSTYLE;
1315	CLEAR_ROWS (row, num);	1375	CLEAR_ROWS (row, num);
1316	}	1376	}
1317	else	1377	else
1318	{	1378	{
1319	ren = (rstyle & (RS_fgMask | RS_bgMask));	1379	ren = rstyle & (RS_fgMask | RS_bgMask);
1320	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1380	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1321	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1381	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322	ERASE_ROWS (row, num);	1382	ERASE_ROWS (row, num);
1323	gcvalue.foreground = pix_colors[Color_fg];	1383	gcvalue.foreground = pix_colors[Color_fg];
1324	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1384	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1325	}	1385	}
1326		1386
1327	for (; num--; row++)	1387	for (; num--; row++)
1328	{	1388	{
1329	scr_blank_screen_mem (screen.text, screen.rend,	1389	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1330	(unsigned int) (row + row_offset), rstyle);
1331	screen.tlen[row + row_offset] = 0;	1390	screen.tlen[row + row_offset] = 0;
1332	scr_blank_line (drawn_text[row], drawn_rend[row],	1391	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1333	(unsigned int)TermWin.ncol, ren);
1334	}	1392	}
1335	}	1393	}
1336		1394
1337	/* ------------------------------------------------------------------------- */	1395	/* ------------------------------------------------------------------------- */
1338	/*	1396	/*
…		…
1349	ZERO_SCROLLBACK ();	1407	ZERO_SCROLLBACK ();
1350		1408
1351	num_scr_allow = 0;	1409	num_scr_allow = 0;
1352	selection_check (3);	1410	selection_check (3);
1353		1411
1354	fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));	1412	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1355	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)	1413	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1356	{	1414	{
1357	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */	1415	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1358	fill_text (screen.text[k], 'E', TermWin.ncol);	1416	fill_text (screen.text[k], 'E', TermWin.ncol);
1359	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )	1417	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
…		…
1422	slp = &screen.tlen[row];	1480	slp = &screen.tlen[row];
1423		1481
1424	switch (insdel)	1482	switch (insdel)
1425	{	1483	{
1426	case INSERT:	1484	case INSERT:
1427	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;	1485	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1428	col--)
1429	{	1486	{
1430	stp[col] = stp[col - count];	1487	stp[col] = stp[col - count];
1431	srp[col] = srp[col - count];	1488	srp[col] = srp[col - count];
1432	}	1489	}
1433		1490
…		…
1443	if (selection.end.row != screen.cur.row	1500	if (selection.end.row != screen.cur.row
1444	|| (selection.end.col + count >= TermWin.ncol))	1501	|| (selection.end.col + count >= TermWin.ncol))
1445	CLEAR_SELECTION ();	1502	CLEAR_SELECTION ();
1446	else	1503	else
1447	{ /* shift selection */	1504	{ /* shift selection */
1448	selection.beg.col += count;	1505	selection.beg.col += count;
1449	selection.mark.col += count; /* XXX: yes? */	1506	selection.mark.col += count; /* XXX: yes? */
1450	selection.end.col += count;	1507	selection.end.col += count;
1451	}	1508	}
1452	}	1509	}
1453		1510
1454	scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),	1511	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1455	(unsigned int)count, rstyle);	1512	(unsigned int)count, rstyle);
1456	break;	1513	break;
1457		1514
1458	case ERASE:	1515	case ERASE:
1459	screen.cur.col += count; /* don't worry if > TermWin.ncol */	1516	screen.cur.col += count; /* don't worry if > TermWin.ncol */
1460	selection_check (1);	1517	selection_check (1);
1461	screen.cur.col -= count;	1518	screen.cur.col -= count;
1462	scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),	1519	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1463	(unsigned int)count, rstyle);	1520	(unsigned int)count, rstyle);
1464	break;	1521	break;
1465		1522
1466	case DELETE:	1523	case DELETE:
1467	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1524	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1470	{	1527	{
1471	stp[col] = stp[col + count];	1528	stp[col] = stp[col + count];
1472	srp[col] = srp[col + count];	1529	srp[col] = srp[col + count];
1473	}	1530	}
1474		1531
1475	scr_blank_line (& (stp[TermWin.ncol - count]),	1532	scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1476	& (srp[TermWin.ncol - count]),
1477	(unsigned int)count, tr);	1533	(unsigned int)count, tr);
1478		1534
1479	if (*slp == -1) /* break line continuation */	1535	if (*slp == -1) /* break line continuation */
1480	*slp = TermWin.ncol;	1536	*slp = TermWin.ncol;
1481		1537
…		…
1490	|| selection.end.col >= TermWin.ncol)	1546	|| selection.end.col >= TermWin.ncol)
1491	CLEAR_SELECTION ();	1547	CLEAR_SELECTION ();
1492	else	1548	else
1493	{	1549	{
1494	/* shift selection */	1550	/* shift selection */
1495	selection.beg.col -= count;	1551	selection.beg.col -= count;
1496	selection.mark.col -= count; /* XXX: yes? */	1552	selection.mark.col -= count; /* XXX: yes? */
1497	selection.end.col -= count;	1553	selection.end.col -= count;
1498	}	1554	}
1499	}	1555	}
1500		1556
1501	break;	1557	break;
1502	}	1558	}
…		…
1568	{	1624	{
1569	if (mode)	1625	if (mode)
1570	screen.flags |= Screen_Relative;	1626	screen.flags |= Screen_Relative;
1571	else	1627	else
1572	screen.flags &= ~Screen_Relative;	1628	screen.flags &= ~Screen_Relative;
		1629
1573	scr_gotorc (0, 0, 0);	1630	scr_gotorc (0, 0, 0);
1574	}	1631	}
1575		1632
1576	/* ------------------------------------------------------------------------- */	1633	/* ------------------------------------------------------------------------- */
1577	/*	1634	/*
…		…
1617		1674
1618	if (rvideo != mode)	1675	if (rvideo != mode)
1619	{	1676	{
1620	rvideo = mode;	1677	rvideo = mode;
1621	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1678	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1622	#if defined(XPM_BACKGROUND)	1679	#if XPM_BACKGROUND
1623	if (bgPixmap.pixmap == None)	1680	if (bgPixmap.pixmap == None)
1624	#endif	1681	#endif
1625	#if defined(TRANSPARENT)	1682	#if TRANSPARENT
1626	if (! (options & Opt_transparent) || am_transparent == 0)	1683	if (! (options & Opt_transparent) || am_transparent == 0)
1627	#endif	1684	#endif
1628	XSetWindowBackground (display->display, TermWin.vt,	1685	XSetWindowBackground (display->display, TermWin.vt,
1629	pix_colors[Color_bg]);	1686	pix_colors[Color_bg]);
1630		1687
…		…
1685	* XTERM_SEQ: Invoke G2 character set: ESC N	1742	* XTERM_SEQ: Invoke G2 character set: ESC N
1686	* XTERM_SEQ: Invoke G3 character set: ESC O	1743	* XTERM_SEQ: Invoke G3 character set: ESC O
1687	*/	1744	*/
1688	void	1745	void
1689	rxvt_term::scr_charset_choose (int set)	1746	rxvt_term::scr_charset_choose (int set)
1690	{	1747	{
1691	screen.charset = set;	1748	screen.charset = set;
1692	set_font_style ();	1749	set_font_style ();
1693	}	1750	}
1694		1751
1695	/* ------------------------------------------------------------------------- */	1752	/* ------------------------------------------------------------------------- */
1696	/*	1753	/*
1697	* Set a font	1754	* Set a font
1698	* XTERM_SEQ: Set G0 character set: ESC ( <C>	1755	* XTERM_SEQ: Set G0 character set: ESC ( <C>
…		…
1701	* XTERM_SEQ: Set G3 character set: ESC + <C>	1758	* XTERM_SEQ: Set G3 character set: ESC + <C>
1702	* See set_font_style for possible values for <C>	1759	* See set_font_style for possible values for <C>
1703	*/	1760	*/
1704	void	1761	void
1705	rxvt_term::scr_charset_set (int set, unsigned int ch)	1762	rxvt_term::scr_charset_set (int set, unsigned int ch)
1706	{	1763	{
1707	charsets[set] = (unsigned char)ch;	1764	charsets[set] = (unsigned char)ch;
1708	set_font_style ();	1765	set_font_style ();
1709	}	1766	}
1710		1767
1711		1768
1712	/* ------------------------------------------------------------------------- *	1769	/* ------------------------------------------------------------------------- *
1713	* MAJOR SCREEN MANIPULATION *	1770	* MAJOR SCREEN MANIPULATION *
1714	* ------------------------------------------------------------------------- */	1771	* ------------------------------------------------------------------------- */
…		…
1808	*/	1865	*/
1809	int	1866	int
1810	rxvt_term::scr_move_to (int y, int len)	1867	rxvt_term::scr_move_to (int y, int len)
1811	{	1868	{
1812	long p = 0;	1869	long p = 0;
1813	uint16_t oldviewstart;	1870	unsigned int oldviewstart;
1814		1871
1815	oldviewstart = TermWin.view_start;	1872	oldviewstart = TermWin.view_start;
1816		1873
1817	if (y < len)	1874	if (y < len)
1818	{	1875	{
1819	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;	1876	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1820	p -= (long) (TermWin.nrow - 1);	1877	p -= (long) (TermWin.nrow - 1);
1821	p = max (p, 0);	1878	p = max (p, 0);
1822	}	1879	}
1823		1880
1824	TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);	1881	TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1825		1882
1826	return scr_changeview (oldviewstart);	1883	return scr_changeview (oldviewstart);
1827	}	1884	}
1828		1885
1829	/* ------------------------------------------------------------------------- */	1886	/* ------------------------------------------------------------------------- */
…		…
1833	*/	1890	*/
1834	int	1891	int
1835	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1892	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1836	{	1893	{
1837	int n;	1894	int n;
1838	uint16_t oldviewstart;	1895	unsigned int oldviewstart;
1839		1896
1840	#ifdef DEBUG_STRICT
1841	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1842	#endif
1843	oldviewstart = TermWin.view_start;	1897	oldviewstart = TermWin.view_start;
		1898
1844	if (direction == UP)	1899	if (direction == UP)
1845	{	1900	{
1846	n = TermWin.view_start + nlines;	1901	n = TermWin.view_start + nlines;
1847	TermWin.view_start = min (n, TermWin.nscrolled);	1902	TermWin.view_start = min (n, TermWin.nscrolled);
1848	}	1903	}
1849	else	1904	else
1850	{	1905	{
1851	n = TermWin.view_start - nlines;	1906	n = TermWin.view_start - nlines;
1852	TermWin.view_start = max (n, 0);	1907	TermWin.view_start = max (n, 0);
1853	}	1908	}
		1909
1854	return scr_changeview (oldviewstart);	1910	return scr_changeview (oldviewstart);
1855	}	1911	}
1856		1912
1857	int	1913	int
1858	rxvt_term::scr_changeview (uint16_t oldviewstart)	1914	rxvt_term::scr_changeview (unsigned int oldviewstart)
1859	{	1915	{
1860	if (TermWin.view_start != oldviewstart)	1916	if (TermWin.view_start != oldviewstart)
1861	{	1917	{
1862	want_refresh = 1;	1918	want_refresh = 1;
1863	num_scr -= (TermWin.view_start - oldviewstart);	1919	num_scr -= (TermWin.view_start - oldviewstart);
…		…
1960		2016
1961	void	2017	void
1962	rxvt_term::scr_refresh (unsigned char refresh_type)	2018	rxvt_term::scr_refresh (unsigned char refresh_type)
1963	{	2019	{
1964	unsigned char must_clear, /* use draw_string not draw_image_string */	2020	unsigned char must_clear, /* use draw_string not draw_image_string */
1965	rvid, /* reverse video this position */
1966	showcursor; /* show the cursor */	2021	showcursor; /* show the cursor */
1967	int16_t col, row, /* column/row we're processing */	2022	int16_t col, row, /* column/row we're processing */
1968	ocrow; /* old cursor row */	2023	ocrow; /* old cursor row */
1969	int i, /* tmp */	2024	int i, /* tmp */
1970	row_offset; /* basic offset in screen structure */	2025	row_offset; /* basic offset in screen structure */
1971	#ifndef NO_CURSORCOLOR	2026	#ifndef NO_CURSORCOLOR
1972	rend_t cc1; /* store colours at cursor position (s) */	2027	rend_t cc1; /* store colours at cursor position (s) */
1973	#endif	2028	#endif
1974	rend_t *crp; // cursor rendition pointer	2029	rend_t *crp; // cursor rendition pointer
1975		2030
		2031	want_refresh = 0; /* screen is current */
		2032
1976	if (refresh_type == NO_REFRESH || !TermWin.mapped)	2033	if (refresh_type == NO_REFRESH || !TermWin.mapped)
1977	return;	2034	return;
1978		2035
1979	/*	2036	/*
1980	* A: set up vars	2037	* A: set up vars
…		…
1982	must_clear = 0;	2039	must_clear = 0;
1983	refresh_count = 0;	2040	refresh_count = 0;
1984		2041
1985	row_offset = TermWin.saveLines - TermWin.view_start;	2042	row_offset = TermWin.saveLines - TermWin.view_start;
1986		2043
1987	#ifdef XPM_BACKGROUND	2044	#if XPM_BACKGROUND
1988	must_clear |= (bgPixmap.pixmap != None);	2045	must_clear |= (bgPixmap.pixmap != None);
1989	#endif	2046	#endif
1990	#ifdef TRANSPARENT	2047	#if TRANSPARENT
1991	must_clear |= ((options & Opt_transparent) && am_transparent);	2048	must_clear |= ((options & Opt_transparent) && am_transparent);
1992	#endif	2049	#endif
1993	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2050	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1994		2051
1995	/*	2052	/*
1996	* B: reverse any characters which are selected	2053	* B: reverse any characters which are selected
1997	*/	2054	*/
1998	scr_reverse_selection ();	2055	scr_reverse_selection ();
1999	#if ENABLE_OVERLAY
2000	scr_swap_overlay ();
2001	#endif
2002		2056
2003	/*	2057	/*
2004	* C: set the cursor character (s)	2058	* C: set the cursor character (s)
2005	*/	2059	*/
2006	{	2060	{
…		…
2080	oldcursor.col = screen.cur.col;	2134	oldcursor.col = screen.cur.col;
2081	}	2135	}
2082	}	2136	}
2083	}	2137	}
2084		2138
		2139	#if ENABLE_OVERLAY
		2140	scr_swap_overlay ();
		2141	#endif
		2142
2085	rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */	2143	rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086	text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */	2144	text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
		2145
2087	#ifndef NO_SLOW_LINK_SUPPORT	2146	#ifndef NO_SLOW_LINK_SUPPORT
2088	/*	2147	/*
2089	* D: CopyArea pass - very useful for slower links	2148	* D: CopyArea pass - very useful for slower links
2090	* This has been deliberately kept simple.	2149	* This has been deliberately kept simple.
2091	*/	2150	*/
…		…
2168		2227
2169	for (col = 0; col < TermWin.ncol; col++)	2228	for (col = 0; col < TermWin.ncol; col++)
2170	{	2229	{
2171	/* compare new text with old - if exactly the same then continue */	2230	/* compare new text with old - if exactly the same then continue */
2172	if (stp[col] == dtp[col] /* Must match characters to skip. */	2231	if (stp[col] == dtp[col] /* Must match characters to skip. */
2173	&& (srp[col] == drp[col] /* Either rendition the same or */	2232	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2174	|| (stp[col] == ' ' /* space w/ no background change */	2233	|| (stp[col] == ' ' /* space w/ no background change */
2175	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))	2234	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176	continue;	2235	continue;
2177		2236
2178	// redraw one or more characters	2237	// redraw one or more characters
2179		2238
2180	// seek to the beginning if wide characters	2239	// seek to the beginning of wide characters
2181	while (stp[col] == NOCHAR && col > 0)	2240	while (stp[col] == NOCHAR && col > 0)
2182	--col;	2241	--col;
2183		2242
2184	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2243	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2185	text_t *text = stp + col;	2244	text_t *text = stp + col;
…		…
2188	dtp[col] = stp[col];	2247	dtp[col] = stp[col];
2189	drp[col] = rend;	2248	drp[col] = rend;
2190		2249
2191	int xpixel = Col2Pixel (col);	2250	int xpixel = Col2Pixel (col);
2192		2251
2193	// this loop looks very messy, it can probably be optimized
2194	// and cleaned a bit by you?
2195	for (i = 0; ++col < TermWin.ncol; )	2252	for (i = 0; ++col < TermWin.ncol; )
2196	{	2253	{
2197	if (stp[col] == NOCHAR)	2254	if (stp[col] == NOCHAR)
2198	{	2255	{
2199	dtp[col] = stp[col];	2256	dtp[col] = stp[col];
…		…
2202	i++;	2259	i++;
2203		2260
2204	continue;	2261	continue;
2205	}	2262	}
2206		2263
2207	if (rend != srp[col])	2264	if (!RS_SAME (rend, srp[col]))
2208	break;	2265	break;
2209		2266
2210	count++;	2267	count++;
2211		2268
2212	if (stp[col] != dtp[col]	2269	if (stp[col] != dtp[col]
2213	|| srp[col] != drp[col])	2270	|| !RS_SAME (srp[col], drp[col]))
2214	{	2271	{
2215	if (must_clear && (i++ > count / 2))	2272	if (must_clear && (i++ > count / 2))
2216	break;	2273	break;
2217		2274
2218	dtp[col] = stp[col];	2275	dtp[col] = stp[col];
…		…
2228		2285
2229	// sometimes we optimize away the trailing NOCHAR's, add them back	2286	// sometimes we optimize away the trailing NOCHAR's, add them back
2230	while (i && text[count] == NOCHAR)	2287	while (i && text[count] == NOCHAR)
2231	count++, i--;	2288	count++, i--;
2232		2289
		2290	#if ENABLE_STYLES
		2291	// force redraw after "careful" characters to avoid pixel droppings
		2292	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
		2293	drp[col + 1] = ~srp[col + 1];
		2294
		2295	// include previous careful character(s) if possible, looks nicer (best effort...)
		2296	while (text > stp
		2297	&& srp[text - stp - 1] & RS_Careful
		2298	&& RS_SAME (rend, srp[text - stp - 1]))
		2299	text--, count++, xpixel -= TermWin.fwidth;
		2300	#endif
		2301
2233	/*	2302	/*
2234	* Determine the attributes for the string	2303	* Determine the attributes for the string
2235	*/	2304	*/
2236	int fid = GET_FONT (rend);
2237	int fore = GET_FGCOLOR (rend); // desired foreground	2305	int fore = GET_FGCOLOR (rend); // desired foreground
2238	int back = GET_BGCOLOR (rend); // desired background	2306	int back = GET_BGCOLOR (rend); // desired background
2239		2307
2240	rend = GET_ATTR (rend);	2308	// only do special processing if ana attributes are set, which is rare
2241		2309	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2242	rvid = !!(rend & RS_RVid);	2310	{
		2311	bool invert = rend & RS_RVid;
2243		2312
2244	#ifndef NO_BOLD_UNDERLINE_REVERSE	2313	#ifndef NO_BOLD_UNDERLINE_REVERSE
2245	if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))	2314	if (rend & RS_Bold
		2315	&& fore == Color_fg)
2246	{	2316	{
2247	if (ISSET_PIXCOLOR (Color_BD))	2317	if (ISSET_PIXCOLOR (Color_BD))
2248	fore = Color_BD;	2318	fore = Color_BD;
		2319	# if !ENABLE_STYLES
2249	else	2320	else
2250	rvid = !rvid;	2321	invert = !invert;
		2322	# endif
		2323	}
		2324
		2325	if (rend & RS_Italic
		2326	&& fore == Color_fg)
		2327	{
		2328	if (ISSET_PIXCOLOR (Color_IT))
		2329	fore = Color_IT;
		2330	# if !ENABLE_STYLES
		2331	else
		2332	invert = !invert;
		2333	# endif
		2334	}
		2335
		2336	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
		2337	fore = Color_UL;
		2338	#endif
		2339
		2340	if (invert)
		2341	{
		2342	SWAP_IT (fore, back, int);
		2343
		2344	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2345	if (ISSET_PIXCOLOR (Color_RV))
		2346	back = Color_RV;
		2347	#endif
		2348	}
		2349
		2350	#ifdef TEXT_BLINK
		2351	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
		2352	{
		2353	if (!text_blink_ev.active)
		2354	{
		2355	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		2356	hidden_text = 0;
		2357	}
		2358	else if (hidden_text)
		2359	fore = back;
		2360	}
		2361	#endif
2251	}	2362	}
2252
2253	if (rend & RS_Uline)
2254	if (ISSET_PIXCOLOR (Color_UL))
2255	fore = Color_UL;
2256	#endif
2257
2258	if (rvid)
2259	{
2260	SWAP_IT (fore, back, int);
2261
2262	#ifndef NO_BOLD_UNDERLINE_REVERSE
2263	if (ISSET_PIXCOLOR (Color_RV)
2264	# ifndef NO_CURSORCOLOR
2265	&& !ISSET_PIXCOLOR (Color_cursor)
2266	# endif
2267	)
2268	back = Color_RV;
2269	#endif
2270	}
2271
2272	#ifdef TEXT_BLINK
2273	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2274	{
2275	if (!text_blink_ev.active)
2276	{
2277	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2278	hidden_text = 0;
2279	}
2280	else if (hidden_text)
2281	fore = back;
2282	}
2283	#endif
2284		2363
2285	/*	2364	/*
2286	* Actually do the drawing of the string here	2365	* Actually do the drawing of the string here
2287	*/	2366	*/
2288	rxvt_font *font = (*TermWin.fontset)[fid];	2367	rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2289		2368
2290	if (back == fore)	2369	if (back == fore)
2291	font->clear_rect (*TermWin.drawable, xpixel, ypixel,	2370	font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2292	TermWin.fwidth * count, TermWin.fheight,	2371	TermWin.fwidth * count, TermWin.fheight,
2293	back);	2372	back);
…		…
2309	}	2388	}
2310	else	2389	else
2311	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2390	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2312		2391
2313	if (rend & RS_Uline && font->descent > 1 && fore != back)	2392	if (rend & RS_Uline && font->descent > 1 && fore != back)
		2393	{
		2394	#if ENABLE_FRILLS
		2395	if (ISSET_PIXCOLOR (Color_underline))
		2396	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
		2397	else
		2398	#endif
		2399	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
		2400
2314	XDrawLine (display->display, drawBuffer, TermWin.gc,	2401	XDrawLine (display->display, drawBuffer, TermWin.gc,
2315	xpixel, ypixel + font->ascent + 1,	2402	xpixel, ypixel + font->ascent + 1,
2316	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2403	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
		2404	}
2317	} /* for (col....) */	2405	} /* for (col....) */
2318	} /* for (row....) */	2406	} /* for (row....) */
		2407
		2408	#if ENABLE_OVERLAY
		2409	scr_swap_overlay ();
		2410	#endif
2319		2411
2320	/*	2412	/*
2321	* G: cleanup cursor and display outline cursor if necessary	2413	* G: cleanup cursor and display outline cursor if necessary
2322	*/	2414	*/
2323	if (showcursor)	2415	if (showcursor)
…		…
2349	}	2441	}
2350		2442
2351	/*	2443	/*
2352	* H: cleanup selection	2444	* H: cleanup selection
2353	*/	2445	*/
2354	#if ENABLE_OVERLAY
2355	scr_swap_overlay ();
2356	#endif
2357	scr_reverse_selection ();	2446	scr_reverse_selection ();
2358		2447
2359	if (refresh_type & SMOOTH_REFRESH)	2448	if (refresh_type & SMOOTH_REFRESH)
2360	XFlush (display->display);	2449	XFlush (display->display);
2361		2450
2362	num_scr = 0;	2451	num_scr = 0;
2363	num_scr_allow = 1;	2452	num_scr_allow = 1;
2364	want_refresh = 0; /* screen is current */
2365	}	2453	}
2366		2454
2367	void	2455	void
2368	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)	2456	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2369	{	2457	{
2370	if (!rp || !tp)	2458	if (!rp || !tp)
2371	return;	2459	return;
2372		2460
2373	for (int i = TermWin.ncol; i; i--, rp++, tp++)	2461	for (int i = TermWin.ncol; i; i--, rp++, tp++)
2374	*rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));	2462	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2375	}	2463	}
2376		2464
2377	void	2465	void
2378	rxvt_term::scr_remap_chars ()	2466	rxvt_term::scr_remap_chars ()
2379	{	2467	{
…		…
2385	scr_remap_chars (drawn_text[i], drawn_rend[i]);	2473	scr_remap_chars (drawn_text[i], drawn_rend[i]);
2386	scr_remap_chars (swap.text[i], swap.rend[i]);	2474	scr_remap_chars (swap.text[i], swap.rend[i]);
2387	}	2475	}
2388	}	2476	}
2389		2477
		2478	void
		2479	rxvt_term::scr_recolour ()
		2480	{
		2481	if (1
		2482	#if TRANSPARENT
		2483	&& !am_transparent
		2484	#endif
		2485	#if XPM_BACKGROUND
		2486	&& !bgPixmap.pixmap
		2487	#endif
		2488	)
		2489	{
		2490	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
		2491	XClearWindow (display->display, TermWin.parent[0]);
		2492	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
		2493	#if HAVE_SCROLLBARS
		2494	if (scrollBar.win)
		2495	{
		2496	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
		2497	scrollBar.setIdle ();
		2498	scrollbar_show (0);
		2499	}
		2500	#endif
		2501	}
		2502
		2503	scr_clear ();
		2504	scr_touch (true);
		2505	want_refresh = 1;
		2506	}
		2507
2390	/* ------------------------------------------------------------------------- */	2508	/* ------------------------------------------------------------------------- */
2391	void	2509	void
2392	rxvt_term::scr_clear (bool really)	2510	rxvt_term::scr_clear (bool really)
2393	{	2511	{
2394	if (!TermWin.mapped)	2512	if (!TermWin.mapped)
2395	return;	2513	return;
2396		2514
2397	num_scr_allow = 0;	2515	num_scr_allow = 0;
2398	want_refresh = 1;	2516	want_refresh = 1;
2399		2517
2400	#ifdef TRANSPARENT	2518	#if TRANSPARENT
2401	if ((options & Opt_transparent) && (am_pixmap_trans == 0))	2519	if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2402	{	2520	{
2403	int i;	2521	int i;
2404		2522
2405	if (! (options & Opt_transparent_all))	2523	if (!(options & Opt_transparent_all))
2406	i = 0;	2524	i = 0;
2407	else	2525	else
2408	i = (int) (sizeof (TermWin.parent) / sizeof (Window));	2526	i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2409		2527
2410	while (i--)	2528	while (i--)
…		…
2426	int end_row = TermWin.saveLines - TermWin.view_start;	2544	int end_row = TermWin.saveLines - TermWin.view_start;
2427	int i = selection.beg.row + TermWin.saveLines;	2545	int i = selection.beg.row + TermWin.saveLines;
2428	int col, row = selection.end.row + TermWin.saveLines;	2546	int col, row = selection.end.row + TermWin.saveLines;
2429	rend_t *srp;	2547	rend_t *srp;
2430		2548
2431	if (i >= end_row)	2549	#if ENABLE_FRILLS
2432	col = selection.beg.col;	2550	if (selection.rect)
		2551	{
		2552	end_row += TermWin.nrow;
		2553
		2554	for (; i <= row && i <= end_row; i++)
		2555	for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
		2556	srp[col] ^= RS_RVid;
		2557	}
2433	else	2558	else
		2559	#endif
		2560	{
		2561	if (i >= end_row)
		2562	col = selection.beg.col;
		2563	else
2434	{	2564	{
2435	col = 0;	2565	col = 0;
2436	i = end_row;	2566	i = end_row;
2437	}	2567	}
2438		2568
2439	end_row += TermWin.nrow;	2569	end_row += TermWin.nrow;
		2570
2440	for (; i < row && i < end_row; i++, col = 0)	2571	for (; i < row && i < end_row; i++, col = 0)
2441	for (srp = screen.rend[i]; col < TermWin.ncol; col++)	2572	for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2442	srp[col] ^= RS_RVid;	2573	srp[col] ^= RS_RVid;
2443		2574
2444	if (i == row && i < end_row)	2575	if (i == row && i < end_row)
2445	for (srp = screen.rend[i]; col < selection.end.col; col++)	2576	for (srp = screen.rend[i]; col < selection.end.col; col++)
2446	srp[col] ^= RS_RVid;	2577	srp[col] ^= RS_RVid;
		2578	}
2447	}	2579	}
2448	}	2580	}
2449		2581
2450	/* ------------------------------------------------------------------------- */	2582	/* ------------------------------------------------------------------------- */
2451	/*	2583	/*
…		…
2519	/* ------------------------------------------------------------------------- */	2651	/* ------------------------------------------------------------------------- */
2520	/*	2652	/*
2521	* Paste a selection direct to the command fd	2653	* Paste a selection direct to the command fd
2522	*/	2654	*/
2523	void	2655	void
2524	rxvt_term::paste (const unsigned char *data, unsigned int len)	2656	rxvt_term::paste (unsigned char *data, unsigned int len)
2525	{	2657	{
2526	unsigned int i, j, n;
2527	unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2528
2529	/* convert normal newline chars into common keyboard Return key sequence */	2658	/* convert normal newline chars into common keyboard Return key sequence */
2530	for (i = 0; i < len; i += PROP_SIZE)	2659	for (unsigned int i = 0; i < len; i++)
2531	{
2532	n = min (len - i, PROP_SIZE);
2533	memcpy (ds, data + i, n);
2534
2535	for (j = 0; j < n; j++)
2536	if (ds[j] == C0_LF)	2660	if (data[i] == C0_LF)
2537	ds[j] = C0_CR;	2661	data[i] = C0_CR;
2538		2662
2539	tt_write (ds, (int)n);	2663	tt_write (data, len);
2540	}
2541
2542	free (ds);
2543	}	2664	}
2544		2665
2545	/* ------------------------------------------------------------------------- */	2666	/* ------------------------------------------------------------------------- */
2546	/*	2667	/*
2547	* Respond to a notification that a primary selection has been sent	2668	* Respond to a notification that a primary selection has been sent
2548	* EXT: SelectionNotify	2669	* EXT: SelectionNotify
2549	*/	2670	*/
2550	int	2671	void
2551	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2672	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2552	{	2673	{
2553	long nread = 0;
2554	unsigned long bytes_after;
2555	XTextProperty ct;
2556
2557	if (prop == None) /* check for failed XConvertSelection */	2674	if (prop == None) /* check for failed XConvertSelection */
2558	{	2675	{
2559	if ((selection_type & Sel_CompoundText))	2676	if ((selection_type & Sel_CompoundText))
2560	{	2677	{
2561	int selnum = selection_type & Sel_whereMask;	2678	int selnum = selection_type & Sel_whereMask;
…		…
2574	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2691	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2575	else	2692	else
2576	selection_type = 0;	2693	selection_type = 0;
2577	}	2694	}
2578		2695
2579	return 0;	2696	return;
2580	}
2581
2582	for (;;)
2583	{	2697	}
		2698
		2699	unsigned long bytes_after;
		2700	XTextProperty ct;
		2701
		2702	if (XGetWindowProperty (display->display, win, prop,
		2703	0, PROP_SIZE / 4,
		2704	delete_prop, AnyPropertyType,
		2705	&ct.encoding, &ct.format,
		2706	&ct.nitems, &bytes_after,
		2707	&ct.value) != Success)
		2708	{
		2709	ct.value = 0;
		2710	goto bailout;
		2711	}
		2712
		2713	if (ct.encoding == None)
		2714	goto bailout;
		2715
		2716	if (bytes_after)
		2717	{
		2718	// fetch and append remaining data
		2719	XTextProperty ct2;
		2720
2584	if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),	2721	if (XGetWindowProperty (display->display, win, prop,
2585	(long) (PROP_SIZE / 4), delete_prop,	2722	ct.nitems / 4, (bytes_after + 3) / 4,
		2723	delete_prop, AnyPropertyType,
2586	AnyPropertyType, &ct.encoding, &ct.format,	2724	&ct2.encoding, &ct2.format,
2587	&ct.nitems, &bytes_after,	2725	&ct2.nitems, &bytes_after,
2588	&ct.value) != Success)	2726	&ct2.value) != Success)
2589	break;	2727	goto bailout;
2590		2728
2591	if (ct.encoding == 0)	2729	// realloc should be compatible to XFree, here, and elsewhere, too
2592	break;	2730	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
		2731	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
		2732	ct.nitems += ct2.nitems;
2593		2733
		2734	XFree (ct2.value);
		2735	}
		2736
		2737	if (ct.value == 0)
		2738	goto bailout;
		2739
2594	if (ct.encoding == xa[XA_INCR])	2740	if (ct.encoding == xa[XA_INCR])
2595	{	2741	{
2596	// INCR selection, start handshake	2742	// INCR selection, start handshake
		2743	if (!delete_prop)
2597	XDeleteProperty (display->display, win, prop);	2744	XDeleteProperty (display->display, win, prop);
		2745
2598	selection_wait = Sel_incr;	2746	selection_wait = Sel_incr;
		2747	incr_buf_fill = 0;
2599	incr_ev.start (NOW + 10);	2748	incr_ev.start (NOW + 10);
2600	break;
2601	}
2602		2749
2603	if (ct.value == NULL)	2750	goto bailout;
2604	continue;	2751	}
2605		2752
2606	if (ct.nitems == 0)	2753	if (ct.nitems == 0)
		2754	{
		2755	if (selection_wait == Sel_incr)
		2756	{
		2757	XFree (ct.value);
		2758
		2759	// finally complete, now paste the whole thing
		2760	selection_wait = Sel_normal;
		2761	ct.value = (unsigned char *)incr_buf;
		2762	ct.nitems = incr_buf_fill;
		2763	incr_buf = 0;
		2764	incr_buf_size = 0;
		2765	incr_ev.stop ();
2607	{	2766	}
		2767	else
		2768	{
2608	if (selection_wait == Sel_normal && nread == 0	2769	if (selection_wait == Sel_normal
2609	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2770	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2610	{	2771	{
2611	/*	2772	/*
2612	* pass through again trying CUT_BUFFER0 if we've come from	2773	* pass through again trying CUT_BUFFER0 if we've come from
2613	* XConvertSelection () but nothing was presented	2774	* XConvertSelection () but nothing was presented
2614	*/	2775	*/
2615	selection_paste (display->root, XA_CUT_BUFFER0, False);	2776	selection_paste (display->root, XA_CUT_BUFFER0, False);
2616	}	2777	}
2617		2778
2618	nread = -1; /* discount any previous stuff */	2779	goto bailout;
2619	break;	2780	}
		2781	}
		2782	else if (selection_wait == Sel_incr)
		2783	{
		2784	incr_ev.start (NOW + 10);
		2785
		2786	while (incr_buf_fill + ct.nitems > incr_buf_size)
2620	}	2787	{
		2788	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
		2789	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
		2790	}
2621		2791
		2792	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2622	nread += ct.nitems;	2793	incr_buf_fill += ct.nitems;
2623		2794
		2795	goto bailout;
		2796	}
		2797
2624	char **cl;	2798	char **cl;
2625	int cr;	2799	int cr;
		2800
		2801	#if ENABLE_FRILLS
		2802	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		2803	// so recode it manually
		2804	if (ct.encoding == xa[XA_UTF8_STRING])
		2805	{
		2806	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
		2807	char *s = rxvt_wcstombs (w);
		2808	free (w);
		2809	// TODO: strlen == only the first element will be converted. well...
		2810	paste ((unsigned char *)s, strlen (s));
		2811	free (s);
		2812	}
		2813	else
		2814	#endif
2626	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)	2815	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2627	{	2816	&& cl)
		2817	{
2628	for (int i = 0; i < cr; i++)	2818	for (int i = 0; i < cr; i++)
2629	paste ((unsigned char *)cl[i], strlen (cl[i]));	2819	paste ((unsigned char *)cl[i], strlen (cl[i]));
2630		2820
2631	XFreeStringList (cl);	2821	XFreeStringList (cl);
2632	}	2822	}
2633	else	2823	else
2634	paste (ct.value, ct.nitems);	2824	paste (ct.value, ct.nitems); // paste raw
2635		2825
2636	if (bytes_after == 0)	2826	bailout:
2637	break;
2638
2639	XFree (ct.value);
2640	}
2641
2642	if (ct.value)
2643	XFree (ct.value);	2827	XFree (ct.value);
2644		2828
2645	if (selection_wait == Sel_normal)	2829	if (selection_wait == Sel_normal)
2646	selection_wait = Sel_none;	2830	selection_wait = Sel_none;
2647
2648	return (int)nread;
2649	}	2831	}
2650		2832
2651	void	2833	void
2652	rxvt_term::incr_cb (time_watcher &w)	2834	rxvt_term::incr_cb (time_watcher &w)
2653	{	2835	{
2654	selection_wait = Sel_none;	2836	selection_wait = Sel_none;
2655		2837
		2838	incr_buf_size = 0;
		2839	free (incr_buf);
		2840
2656	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2841	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2657	}	2842	}
2658		2843
2659	/*
2660	* INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2661	*/
2662	void	2844	void
2663	rxvt_term::selection_property (Window win, Atom prop)	2845	rxvt_term::selection_property (Window win, Atom prop)
2664	{	2846	{
2665	if (prop == None || selection_wait != Sel_incr)	2847	if (prop == None || selection_wait != Sel_incr)
2666	return;	2848	return;
2667		2849
2668	if (selection_paste (win, prop, 1) > 0)	2850	selection_paste (win, prop, true);
2669	incr_ev.start (NOW + 10);
2670	else
2671	{
2672	selection_wait = Sel_none;
2673	incr_ev.stop ();
2674	}
2675	}	2851	}
2676		2852
2677	/* ------------------------------------------------------------------------- */	2853	/* ------------------------------------------------------------------------- */
2678	/*	2854	/*
2679	* Request the current selection:	2855	* Request the current selection:
…		…
2713	#else	2889	#else
2714	selection_type = Sel_CompoundText;	2890	selection_type = Sel_CompoundText;
2715	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2891	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2716	return;	2892	return;
2717	#endif	2893	#endif
2718
2719	}	2894	}
2720	}	2895	}
2721		2896
2722	selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */	2897	selection_wait = Sel_none; /* don't loop in selection_paste () */
2723	selection_paste (display->root, XA_CUT_BUFFER0, False);	2898	selection_paste (display->root, XA_CUT_BUFFER0, false);
2724	}	2899	}
2725		2900
2726	int	2901	int
2727	rxvt_term::selection_request_other (Atom target, int selnum)	2902	rxvt_term::selection_request_other (Atom target, int selnum)
2728	{	2903	{
…		…
2801		2976
2802	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);	2977	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2803	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2978	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2804		2979
2805	col = selection.beg.col;	2980	col = selection.beg.col;
2806	MAX_IT (col, 0);
2807	row = selection.beg.row + TermWin.saveLines;	2981	row = selection.beg.row + TermWin.saveLines;
2808	end_row = selection.end.row + TermWin.saveLines;	2982	end_row = selection.end.row + TermWin.saveLines;
2809	int ofs = 0;	2983	int ofs = 0;
2810	int extra = 0;	2984	int extra = 0;
2811		2985
2812	for (; row <= end_row; row++, col = 0)	2986	for (; row <= end_row; row++, col = 0)
2813	{	2987	{
2814	t = &screen.text[row][col];
2815
2816	end_col = screen.tlen[row];	2988	end_col = screen.tlen[row];
		2989
		2990	#if ENABLE_FRILLS
		2991	if (selection.rect)
		2992	{
		2993	col = selection.beg.col;
		2994	end_col = TermWin.ncol + 1;
		2995	}
		2996	#endif
		2997
		2998	MAX_IT (col, 0);
2817		2999
2818	if (end_col == -1)	3000	if (end_col == -1)
2819	end_col = TermWin.ncol;	3001	end_col = TermWin.ncol;
2820		3002
2821	if (row == end_row)	3003	if (row == end_row || selection.rect)
2822	MIN_IT (end_col, selection.end.col);	3004	MIN_IT (end_col, selection.end.col);
2823		3005
		3006	t = &screen.text[row][col];
2824	for (; col < end_col; col++)	3007	for (; col < end_col; col++)
2825	{	3008	{
2826	if (*t == NOCHAR)	3009	if (*t == NOCHAR)
2827	t++;	3010	t++;
2828	#if ENABLE_COMBINING	3011	#if ENABLE_COMBINING
…		…
2876	#if 0	3059	#if 0
2877	XTextProperty ct;	3060	XTextProperty ct;
2878		3061
2879	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3062	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2880	{	3063	{
2881	XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,	3064	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2882	PropModeReplace, ct.value, ct.nitems);
2883	XFree (ct.value);	3065	XFree (ct.value);
2884	}	3066	}
2885	#endif	3067	#endif
2886		3068
2887	selection_time = tm;	3069	selection_time = tm;
…		…
3088	enum {	3270	enum {
3089	LEFT, RIGHT	3271	LEFT, RIGHT
3090	} closeto = RIGHT;	3272	} closeto = RIGHT;
3091		3273
3092	want_refresh = 1;	3274	want_refresh = 1;
		3275
3093	switch (selection.op)	3276	switch (selection.op)
3094	{	3277	{
3095	case SELECTION_INIT:	3278	case SELECTION_INIT:
3096	CLEAR_SELECTION ();	3279	CLEAR_SELECTION ();
3097	selection.op = SELECTION_BEGIN;	3280	selection.op = SELECTION_BEGIN;
…		…
3110	selection_start_colrow (col, row);	3293	selection_start_colrow (col, row);
3111	/* FALLTHROUGH */	3294	/* FALLTHROUGH */
3112	default:	3295	default:
3113	return;	3296	return;
3114	}	3297	}
		3298
3115	if (selection.beg.col == selection.end.col	3299	if (selection.beg.col == selection.end.col
3116	&& selection.beg.col != selection.mark.col	3300	&& selection.beg.col != selection.mark.col
3117	&& selection.beg.row == selection.end.row	3301	&& selection.beg.row == selection.end.row
3118	&& selection.beg.row != selection.mark.row)	3302	&& selection.beg.row != selection.mark.row)
3119	{	3303	{
…		…
3169	}	3353	}
3170	else	3354	else
3171	{ /* button1 drag or button3 drag */	3355	{ /* button1 drag or button3 drag */
3172	if (ROWCOL_IS_AFTER (selection.mark, pos))	3356	if (ROWCOL_IS_AFTER (selection.mark, pos))
3173	{	3357	{
3174	if ((selection.mark.row == selection.end.row)	3358	if (selection.mark.row == selection.end.row
3175	&& (selection.mark.col == selection.end.col)	3359	&& selection.mark.col == selection.end.col
		3360	&& clickchange
3176	&& clickchange && selection.clicks == 2)	3361	&& selection.clicks == 2)
3177	selection.mark.col--;	3362	selection.mark.col--;
3178		3363
3179	selection.beg.row = pos.row;	3364	selection.beg.row = pos.row;
3180	selection.beg.col = pos.col;	3365	selection.beg.col = pos.col;
3181	selection.end.row = selection.mark.row;	3366	selection.end.row = selection.mark.row;
…		…
3192		3377
3193	if (selection.clicks == 1)	3378	if (selection.clicks == 1)
3194	{	3379	{
3195	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];	3380	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196		3381
3197	if (end_col != -1 && selection.beg.col > end_col)	3382	if (selection.beg.col > end_col
		3383	&& end_col != -1
		3384	#if ENABLE_FRILLS
		3385	&& !selection.rect
		3386	#endif
3198	{	3387	)
3199	#if 1
3200	selection.beg.col = ncol;	3388	selection.beg.col = ncol;
3201	#else
3202	if (selection.beg.row != selection.end.row)
3203	selection.beg.col = ncol;
3204	else
3205	selection.beg.col = selection.mark.col;
3206	#endif
3207	}
3208		3389
3209	end_col = screen.tlen[selection.end.row + TermWin.saveLines];	3390	end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210		3391
3211	if (end_col != -1 && selection.end.col > end_col)	3392	if (
		3393	selection.end.col > end_col
		3394	&& end_col != -1
		3395	#if ENABLE_FRILLS
		3396	&& !selection.rect
		3397	#endif
		3398	)
3212	selection.end.col = ncol;	3399	selection.end.col = ncol;
3213	}	3400	}
3214	else if (selection.clicks == 2)	3401	else if (selection.clicks == 2)
3215	{	3402	{
3216	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3403	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3217	selection.end.col--;	3404	selection.end.col--;
3218		3405
3219	selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220	selection_delimit_word (DN, & (selection.end), & (selection.end));	3406	selection_delimit_word (UP, &selection.beg, &selection.beg);
		3407	selection_delimit_word (DN, &selection.end, &selection.end);
3221	}	3408	}
3222	else if (selection.clicks == 3)	3409	else if (selection.clicks == 3)
3223	{	3410	{
3224	#if ENABLE_FRILLS	3411	#if ENABLE_FRILLS
3225	if ((options & Opt_tripleclickwords))	3412	if (options & Opt_tripleclickwords)
3226	{	3413	{
3227	int end_row;	3414	int end_row;
3228		3415
3229	selection_delimit_word (UP, & (selection.beg), & (selection.beg));	3416	selection_delimit_word (UP, &selection.beg, &selection.beg);
3230	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3417	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3231		3418
3232	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)	3419	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3233	{	3420	{
3234	end_col = screen.tlen[end_row + TermWin.saveLines];	3421	end_col = screen.tlen[end_row + TermWin.saveLines];
…		…
3245	else	3432	else
3246	#endif	3433	#endif
3247	{	3434	{
3248	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3435	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3249	selection.mark.col++;	3436	selection.mark.col++;
		3437
3250	selection.beg.col = 0;	3438	selection.beg.col = 0;
3251	selection.end.col = ncol;	3439	selection.end.col = ncol;
		3440
		3441	// select a complete logical line
		3442	while (selection.beg.row > -TermWin.saveLines
		3443	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3444	selection.beg.row--;
		3445
		3446	while (selection.end.row < TermWin.nrow
		3447	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3448	selection.end.row++;
3252	}	3449	}
3253	}	3450	}
3254		3451
3255	if (button3 && buttonpress)	3452	if (button3 && buttonpress)
3256	{ /* mark may need to be changed */	3453	{ /* mark may need to be changed */
…		…
3263	{	3460	{
3264	selection.mark.row = selection.beg.row;	3461	selection.mark.row = selection.beg.row;
3265	selection.mark.col = selection.beg.col;	3462	selection.mark.col = selection.beg.col;
3266	}	3463	}
3267	}	3464	}
3268	}
3269		3465
3270	#if ENABLE_FRILLS	3466	#if ENABLE_FRILLS
		3467	if (selection.rect && selection.beg.col > selection.end.col)
		3468	SWAP_IT (selection.beg.col, selection.end.col, int);
		3469	#endif
		3470	}
		3471
		3472	#if ENABLE_FRILLS
3271	void	3473	void
3272	rxvt_term::selection_remove_trailing_spaces ()	3474	rxvt_term::selection_remove_trailing_spaces ()
3273	{	3475	{
3274	int32_t end_col, end_row;	3476	int32_t end_col, end_row;
3275	text_t *stp;	3477	text_t *stp;
3276		3478
3277	end_col = selection.end.col;	3479	end_col = selection.end.col;
3278	end_row = selection.end.row;	3480	end_row = selection.end.row;
		3481
3279	for ( ; end_row >= selection.beg.row; )	3482	for ( ; end_row >= selection.beg.row; )
3280	{	3483	{
3281	stp = screen.text[end_row + TermWin.saveLines];	3484	stp = screen.text[end_row + TermWin.saveLines];
		3485
3282	while (--end_col >= 0)	3486	while (--end_col >= 0)
3283	{	3487	{
3284	if (stp[end_col] != ' ' && stp[end_col] != '\t')	3488	if (stp[end_col] != ' '
		3489	&& stp[end_col] != '\t'
		3490	&& stp[end_col] != NOCHAR)
3285	break;	3491	break;
3286	}	3492	}
		3493
3287	if (end_col >= 0	3494	if (end_col >= 0
3288	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)	3495	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3289	{	3496	{
3290	selection.end.col = end_col + 1;	3497	selection.end.col = end_col + 1;
3291	selection.end.row = end_row;	3498	selection.end.row = end_row;
3292	break;	3499	break;
3293	}	3500	}
		3501
3294	end_row--;	3502	end_row--;
3295	end_col = TermWin.ncol;	3503	end_col = TermWin.ncol;
3296	}	3504	}
		3505
3297	if (selection.mark.row > selection.end.row)	3506	if (selection.mark.row > selection.end.row)
3298	{	3507	{
3299	selection.mark.row = selection.end.row;	3508	selection.mark.row = selection.end.row;
3300	selection.mark.col = selection.end.col;	3509	selection.mark.col = selection.end.col;
3301	}	3510	}
…		…
3317	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3526	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3318	}	3527	}
3319		3528
3320	/* ------------------------------------------------------------------------- */	3529	/* ------------------------------------------------------------------------- */
3321	/*	3530	/*
3322	* On some systems, the Atom typedef is 64 bits wide. We need to have a type
3323	* that is exactly 32 bits wide, because a format of 64 is not allowed by
3324	* the X11 protocol.
3325	*/
3326	typedef CARD32 Atom32;
3327
3328	/* ------------------------------------------------------------------------- */
3329	/*
3330	* Respond to a request for our current selection	3531	* Respond to a request for our current selection
3331	* EXT: SelectionRequest	3532	* EXT: SelectionRequest
3332	*/	3533	*/
3333	void	3534	void
3334	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3535	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3335	{	3536	{
3336	XSelectionEvent ev;	3537	XSelectionEvent ev;
3337	XTextProperty ct;	3538	dDisp;
3338	XICCEncodingStyle style;
3339	Atom target;
3340		3539
3341	ev.type = SelectionNotify;	3540	ev.type = SelectionNotify;
3342	ev.property = None;	3541	ev.property = None;
3343	ev.display = rq.display;	3542	ev.display = rq.display;
3344	ev.requestor = rq.requestor;	3543	ev.requestor = rq.requestor;
…		…
3346	ev.target = rq.target;	3545	ev.target = rq.target;
3347	ev.time = rq.time;	3546	ev.time = rq.time;
3348		3547
3349	if (rq.target == xa[XA_TARGETS])	3548	if (rq.target == xa[XA_TARGETS])
3350	{	3549	{
3351	Atom32 target_list[6];	3550	Atom target_list[6];
3352	Atom32 *target = target_list;	3551	Atom *target = target_list;
3353		3552
3354	*target++ = (Atom32) xa[XA_TARGETS];	3553	*target++ = xa[XA_TARGETS];
3355	*target++ = (Atom32) xa[XA_TIMESTAMP];	3554	*target++ = xa[XA_TIMESTAMP];
3356	*target++ = (Atom32) XA_STRING;	3555	*target++ = XA_STRING;
3357	*target++ = (Atom32) xa[XA_TEXT];	3556	*target++ = xa[XA_TEXT];
3358	*target++ = (Atom32) xa[XA_COMPOUND_TEXT];	3557	*target++ = xa[XA_COMPOUND_TEXT];
3359	#if X_HAVE_UTF8_STRING	3558	#if X_HAVE_UTF8_STRING
3360	*target++ = (Atom32) xa[XA_UTF8_STRING];	3559	*target++ = xa[XA_UTF8_STRING];
3361	#endif	3560	#endif
3362		3561
3363	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3562	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3364	(8 * sizeof (target_list[0])), PropModeReplace,	3563	32, PropModeReplace,
3365	(unsigned char *)target_list,	3564	(unsigned char *)target_list, target - target_list);
3366	target - target_list);
3367	ev.property = rq.property;	3565	ev.property = rq.property;
3368	}	3566	}
3369	#if TODO // TODO	3567	#if TODO // TODO
3370	else if (rq.target == xa[XA_MULTIPLE])	3568	else if (rq.target == xa[XA_MULTIPLE])
3371	{	3569	{
3372	/* TODO: Handle MULTIPLE */	3570	/* TODO: Handle MULTIPLE */
3373	}	3571	}
3374	#endif	3572	#endif
3375	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3573	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3376	{	3574	{
3377	XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,	3575	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3378	(8 * sizeof (Time)), PropModeReplace,
3379	(unsigned char *)&selection_time, 1);	3576	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3380	ev.property = rq.property;	3577	ev.property = rq.property;
3381	}	3578	}
3382	else if (rq.target == XA_STRING	3579	else if (rq.target == XA_STRING
3383	|| rq.target == xa[XA_TEXT]	3580	|| rq.target == xa[XA_TEXT]
3384	|| rq.target == xa[XA_COMPOUND_TEXT]	3581	|| rq.target == xa[XA_COMPOUND_TEXT]
3385	|| rq.target == xa[XA_UTF8_STRING]	3582	|| rq.target == xa[XA_UTF8_STRING]
3386	)	3583	)
3387	{	3584	{
		3585	XTextProperty ct;
		3586	Atom target = rq.target;
3388	short freect = 0;	3587	short freect = 0;
3389	int selectlen;	3588	int selectlen;
3390	wchar_t *cl;	3589	wchar_t *cl;
3391		3590	enum {
3392	target = rq.target;	3591	enc_string = XStringStyle,
		3592	enc_text = XStdICCTextStyle,
		3593	enc_compound_text = XCompoundTextStyle,
		3594	#ifdef X_HAVE_UTF8_STRING
		3595	enc_utf8 = XUTF8StringStyle,
		3596	#else
		3597	enc_utf8 = -1,
		3598	#endif
		3599	} style;
3393		3600
3394	if (target == XA_STRING)	3601	if (target == XA_STRING)
3395	// we actually don't do XA_STRING, but who cares, as i18n clients	3602	// we actually don't do XA_STRING, but who cares, as i18n clients
3396	// will ask for another format anyways.	3603	// will ask for another format anyways.
3397	style = XStringStyle;	3604	style = enc_string;
3398	else if (target == xa[XA_TEXT])	3605	else if (target == xa[XA_TEXT])
3399	style = XStdICCTextStyle;	3606	style = enc_text;
3400	else if (target == xa[XA_COMPOUND_TEXT])	3607	else if (target == xa[XA_COMPOUND_TEXT])
3401	style = XCompoundTextStyle;	3608	style = enc_compound_text;
3402	#if X_HAVE_UTF8_STRING	3609	#if ENABLE_FRILLS
3403	else if (target == xa[XA_UTF8_STRING])	3610	else if (target == xa[XA_UTF8_STRING])
3404	style = XUTF8StringStyle;	3611	style = enc_utf8;
3405	#endif	3612	#endif
3406	else	3613	else
3407	{	3614	{
3408	target = xa[XA_COMPOUND_TEXT];	3615	target = xa[XA_COMPOUND_TEXT];
3409	style = XCompoundTextStyle;	3616	style = enc_compound_text;
3410	}	3617	}
3411		3618
3412	if (selection.text)	3619	if (selection.text)
3413	{	3620	{
3414	cl = selection.text;	3621	cl = selection.text;
…		…
3418	{	3625	{
3419	cl = L"";	3626	cl = L"";
3420	selectlen = 0;	3627	selectlen = 0;
3421	}	3628	}
3422		3629
3423	// Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it	3630	#if ENABLE_FRILLS
3424	// manually for XUTF8StringStyle.	3631	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		3632	// so recode it manually
		3633	if (style == enc_utf8)
		3634	{
		3635	freect = 1;
		3636	ct.encoding = target;
		3637	ct.format = 8;
		3638	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
		3639	ct.nitems = strlen ((char *)ct.value);
		3640	}
		3641	else
		3642	#endif
3425	if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)	3643	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426	freect = 1;	3644	freect = 1;
3427	else	3645	else
3428	{	3646	{
3429	/* if we failed to convert then send it raw */	3647	/* if we failed to convert then send it raw */
3430	ct.value = (unsigned char *)cl;	3648	ct.value = (unsigned char *)cl;
3431	ct.nitems = selectlen;	3649	ct.nitems = selectlen;
		3650	ct.encoding = target;
3432	}	3651	}
3433		3652
3434	XChangeProperty (display->display, rq.requestor, rq.property,	3653	XChangeProperty (disp, rq.requestor, rq.property,
3435	target, 8, PropModeReplace,	3654	ct.encoding, 8, PropModeReplace,
3436	ct.value, (int)ct.nitems);	3655	ct.value, (int)ct.nitems);
3437	ev.property = rq.property;	3656	ev.property = rq.property;
3438		3657
3439	if (freect)	3658	if (freect)
3440	XFree (ct.value);	3659	XFree (ct.value);
3441	}	3660	}
3442		3661
3443	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3662	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3444	}	3663	}
3445		3664
3446	/* ------------------------------------------------------------------------- *	3665	/* ------------------------------------------------------------------------- *
3447	* MOUSE ROUTINES *	3666	* MOUSE ROUTINES *
3448	* ------------------------------------------------------------------------- */	3667	* ------------------------------------------------------------------------- */
…		…
3507	{	3726	{
3508	text_t *tp = ov_text[y] = new text_t[w];	3727	text_t *tp = ov_text[y] = new text_t[w];
3509	rend_t *rp = ov_rend[y] = new rend_t[w];	3728	rend_t *rp = ov_rend[y] = new rend_t[w];
3510		3729
3511	text_t t0, t1, t2;	3730	text_t t0, t1, t2;
3512	rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);	3731	rend_t r = OVERLAY_RSTYLE;
3513		3732
3514	if (y == 0)	3733	if (y == 0)
3515	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;	3734	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516	else if (y < h - 1)	3735	else if (y < h - 1)
3517	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;	3736	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
…		…
3551	}	3770	}
3552		3771
3553	void	3772	void
3554	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3773	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555	{	3774	{
3556	if (!ov_text || x >= ov_w - 2 || y >= ov_h)	3775	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3557	return;	3776	return;
3558		3777
3559	x++, y++;	3778	x++, y++;
3560		3779
3561	ov_text[y][x] = text;	3780	ov_text[y][x] = text;
…		…
3587	rend_t *r2 = screen.rend[y + row_offset] + ov_x;	3806	rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588		3807
3589	for (int x = ov_w; x--; )	3808	for (int x = ov_w; x--; )
3590	{	3809	{
3591	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3810	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));	3811	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3593	}	3812	}
3594	}	3813	}
3595	}	3814	}
3596		3815
3597	#endif	3816	#endif

Diff Legend

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