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.149 by root, Mon Dec 13 06:44:18 2004 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>
…		…
40	while (len--)	39	while (len--)
41	*start++ = value;	40	*start++ = value;
42	}	41	}
43		42
44	/* ------------------------------------------------------------------------- */	43	/* ------------------------------------------------------------------------- */
45	#define PROP_SIZE 16384	44	#define PROP_SIZE 256*1024
		45	#define PASTE_SIZE 32768
46	#define TABSIZE 8 /* default tab size */	46	#define TABSIZE 8 /* default tab size */
47		47
48	/* ------------------------------------------------------------------------- *	48	/* ------------------------------------------------------------------------- *
49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50	* ------------------------------------------------------------------------- */	50	* ------------------------------------------------------------------------- */
…		…
112	(unsigned int)Height2Pixel (num))	112	(unsigned int)Height2Pixel (num))
113		113
114	/* ------------------------------------------------------------------------- *	114	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	115	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	116	* ------------------------------------------------------------------------- */
		117
117	/* Fill part/all of a line with blanks. */	118	/* Fill part/all of a line with blanks. */
118	void	119	void
119	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)	120	rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
120	{	121	{
121	efs &= ~RS_baseattrMask;	122	efs &= ~RS_baseattrMask;
122	efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);	123	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123		124
124	while (width--)	125	while (width--)
125	{	126	{
126	*et++ = ' ';	127	*et++ = ' ';
127	*er++ = efs;	128	*er++ = efs;
…		…
417	}	418	}
418		419
419	void	420	void
420	rxvt_term::scr_reset_realloc ()	421	rxvt_term::scr_reset_realloc ()
421	{	422	{
422	uint16_t total_rows, nrow;	423	unsigned int total_rows, nrow;
423		424
424	nrow = TermWin.nrow;	425	nrow = TermWin.nrow;
425	total_rows = nrow + TermWin.saveLines;	426	total_rows = nrow + TermWin.saveLines;
426	/* *INDENT-OFF* */	427	/* *INDENT-OFF* */
427	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));	428	screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
…		…
444	* Free everything. That way malloc debugging can find leakage.	445	* Free everything. That way malloc debugging can find leakage.
445	*/	446	*/
446	void	447	void
447	rxvt_term::scr_release ()	448	rxvt_term::scr_release ()
448	{	449	{
449	uint16_t total_rows;	450	unsigned int total_rows;
450	int i;	451	int i;
451		452
452	total_rows = TermWin.nrow + TermWin.saveLines;	453	total_rows = TermWin.nrow + TermWin.saveLines;
453		454
454	delete talloc; talloc = 0;	455	delete talloc; talloc = 0;
…		…
511	s = &screen;	512	s = &screen;
512		513
513	switch (mode)	514	switch (mode)
514	{	515	{
515	case SAVE:	516	case SAVE:
516	s->s_cur.row = s->cur.row;	517	s->s_cur.row = screen.cur.row;
517	s->s_cur.col = s->cur.col;	518	s->s_cur.col = screen.cur.col;
518	s->s_rstyle = rstyle;	519	s->s_rstyle = rstyle;
519	s->s_charset = s->charset;	520	s->s_charset = screen.charset;
520	s->s_charset_char = charsets[s->charset];	521	s->s_charset_char = charsets[screen.charset];
521	break;	522	break;
522		523
523	case RESTORE:	524	case RESTORE:
524	want_refresh = 1;	525	want_refresh = 1;
525	s->cur.row = s->s_cur.row;	526	screen.cur.row = s->s_cur.row;
526	s->cur.col = s->s_cur.col;	527	screen.cur.col = s->s_cur.col;
527	s->flags &= ~Screen_WrapNext;	528	screen.flags &= ~Screen_WrapNext;
528	rstyle = s->s_rstyle;	529	rstyle = s->s_rstyle;
529	s->charset = s->s_charset;	530	screen.charset = s->s_charset;
530	charsets[s->charset] = s->s_charset_char;	531	charsets[screen.charset] = s->s_charset_char;
531	set_font_style ();	532	set_font_style ();
532	break;	533	break;
533	}	534	}
534		535
535	/* boundary check in case screen size changed between SAVE and RESTORE */	536	/* boundary check in case screen size changed between SAVE and RESTORE */
…		…
566	return scrn;	567	return scrn;
567		568
568	selection_check (2); /* check for boundary cross */	569	selection_check (2); /* check for boundary cross */
569		570
570	SWAP_IT (current_screen, scrn, int);	571	SWAP_IT (current_screen, scrn, int);
		572
		573	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
		574	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
		575	# ifdef DEBUG_STRICT
		576	assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
		577	assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
		578	# else /* drive with your eyes closed */
		579	MAX_IT (screen.cur.row, 0);
		580	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
		581	MAX_IT (screen.cur.col, 0);
		582	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
		583	# endif
		584
571	#if NSCREENS	585	#if NSCREENS
572	if (options & Opt_secondaryScreen)	586	if (options & Opt_secondaryScreen)
573	{	587	{
574	num_scr = 0;	588	num_scr = 0;
575	offset = TermWin.saveLines;	589	offset = TermWin.saveLines;
		590
576	for (i = prev_nrow; i--;)	591	for (i = prev_nrow; i--;)
577	{	592	{
578	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);	593	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);	594	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);	595	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581	}	596	}
582	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	597
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);	598	SWAP_IT (screen.charset, swap.charset, int16_t);
594	SWAP_IT (screen.flags, swap.flags, int);	599	SWAP_IT (screen.flags, swap.flags, int);
595	screen.flags |= Screen_VisibleCursor;	600	screen.flags |= Screen_VisibleCursor;
596	swap.flags |= Screen_VisibleCursor;	601	swap.flags |= Screen_VisibleCursor;
597	}	602	}
598	else	603	else
599	#endif	604	#endif
600	if (options & Opt_secondaryScroll)	605	if (options & Opt_secondaryScroll)
601	//if (current_screen == PRIMARY)
602	scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);	606	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
		607
603	return scrn;	608	return scrn;
604	}	609	}
605		610
606	// clear WrapNext indicator, solidifying position on next line	611	// clear WrapNext indicator, solidifying position on next line
607	void	612	void
…		…
625	* Change the colour for following text	630	* Change the colour for following text
626	*/	631	*/
627	void	632	void
628	rxvt_term::scr_color (unsigned int color, int fgbg)	633	rxvt_term::scr_color (unsigned int color, int fgbg)
629	{	634	{
630	color &= RS_fgMask;	635	if (color > maxTermCOLOR)
		636	color = fgbg;
		637
631	if (fgbg == Color_fg)	638	if (fgbg == Color_fg)
632	rstyle = SET_FGCOLOR (rstyle, color);	639	rstyle = SET_FGCOLOR (rstyle, color);
633	else	640	else
634	rstyle = SET_BGCOLOR (rstyle, color);	641	rstyle = SET_BGCOLOR (rstyle, color);
635	}	642	}
…		…
673	nscrolled = (long)TermWin.nscrolled + (long)count;	680	nscrolled = (long)TermWin.nscrolled + (long)count;
674		681
675	if (nscrolled > (long)TermWin.saveLines)	682	if (nscrolled > (long)TermWin.saveLines)
676	TermWin.nscrolled = TermWin.saveLines;	683	TermWin.nscrolled = TermWin.saveLines;
677	else	684	else
678	TermWin.nscrolled = (uint16_t)nscrolled;	685	TermWin.nscrolled = (unsigned int)nscrolled;
679		686
680	if ((options & Opt_scrollWithBuffer)	687	if ((options & Opt_scrollWithBuffer)
681	&& TermWin.view_start != 0	688	&& TermWin.view_start != 0
682	&& TermWin.view_start != TermWin.saveLines)	689	&& TermWin.view_start != TermWin.saveLines)
683	scr_page (UP, count);	690	scr_page (UP, count);
…		…
826		833
827	if (c < 0x20)	834	if (c < 0x20)
828	switch (c)	835	switch (c)
829	{	836	{
830	case C0_HT:	837	case C0_HT:
831	scr_tab (1);	838	scr_tab (1, true);
832	continue;	839	continue;
833		840
834	case C0_LF:	841	case C0_LF:
835	if (screen.tlen[row] != -1) /* XXX: think about this */	842	if (screen.tlen[row] != -1) /* XXX: think about this */
836	MAX_IT (screen.tlen[row], screen.cur.col);	843	MAX_IT (screen.tlen[row], screen.cur.col);
…		…
876		883
877	stp = screen.text[row]; /* _must_ refresh */	884	stp = screen.text[row]; /* _must_ refresh */
878	srp = screen.rend[row]; /* _must_ refresh */	885	srp = screen.rend[row]; /* _must_ refresh */
879	}	886	}
880		887
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	888	// 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	889	// do wcwidth before further replacements, as wcwidth says that line-drawing
886	// characters have width -1 (DOH!) on GNU/Linux sometimes.	890	// characters have width -1 (DOH!) on GNU/Linux sometimes.
887	int width = c < 0x100 ? 1 : wcwidth (c);	891	int width = c < 0x100 ? 1 : wcwidth (c);
888		892
889	if (charsets[screen.charset] == '0') // DEC SPECIAL	893	if (charsets[screen.charset] == '0') // DEC SPECIAL
890	{	894	{
891	// vt100 special graphics and line drawing	895	// vt100 special graphics and line drawing
		896	// 5f-7e standard vt100
		897	// 40-5e rxvt extension for extra curses acs chars
892	static uint16_t vt100_0[32] = { // 5f .. 7e	898	static uint16_t vt100_0[63] = { // 40 .. 7e
		899	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
		900	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
		901	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
		902	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
893	0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,	903	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894	0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,	904	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895	0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,	905	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896	0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,	906	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897	};	907	};
898		908
899	if (c >= 0x5f && c <= 0x7e)	909	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
900	{	910	{
901	c = vt100_0[c - 0x5f];	911	c = vt100_0[c - 0x40];
902	width = 1;	912	width = 1;
903	}	913	}
904	}	914	}
905		915
		916	if (screen.flags & Screen_Insert)
		917	scr_insdel_chars (width, INSERT);
		918
906	if (width != 0)	919	if (width != 0)
907	{	920	{
		921	// some utf-8 decoders decode surrogate characters.
		922	if (0xd800 <= c && c <= 0xdfff)
		923	c = 0xfffd;
		924
908	#if !UNICODE_3	925	#if !UNICODE_3
909	// trim characters we can't store directly :(	926	// trim characters we can't store directly :(
910	if (c >= 0x10000)	927	if (c >= 0x10000)
911	# if ENABLE_COMBINING	928	# if ENABLE_COMBINING
912	c = rxvt_composite.compose (c); // map to lower 16 bits	929	c = rxvt_composite.compose (c); // map to lower 16 bits
913	# else	930	# else
914	c = 0xfffd;	931	c = 0xfffd;
915	# endif	932	# endif
916	#endif	933	#endif
917	bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);	934
918	rend_t rend = SET_FONT (rstyle,	935	// nuke the character at this position, if required
919	c > 0x7f || bold || c < 0x20	936	if (stp[screen.cur.col] == NOCHAR
920	? TermWin.fontset->find_font (c, bold)	937	|| (screen.cur.col < TermWin.ncol - 1
921	: TermWin.ascii_map [c - 0x20]);	938	&& stp[screen.cur.col + 1] == NOCHAR))
		939	{
		940	int col = screen.cur.col;
		941
		942	// find begin
		943	while (col > 0 && stp[col] == NOCHAR)
		944	col--;
		945
		946	rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
		947
		948	// found begin, nuke
		949	do {
		950	stp[col] = ' ';
		951	srp[col] = rend;
		952	col++;
		953	} while (col < TermWin.ncol && stp[col] == NOCHAR);
		954	}
		955
		956	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922		957
923	do	958	do
924	{	959	{
925	stp[screen.cur.col] = c;	960	stp[screen.cur.col] = c;
926	srp[screen.cur.col] = rend;	961	srp[screen.cur.col] = rend;
…		…
938	c = NOCHAR;	973	c = NOCHAR;
939	}	974	}
940	while (--width > 0);	975	while (--width > 0);
941		976
942	// pad with spaces when overwriting wide character with smaller one	977	// pad with spaces when overwriting wide character with smaller one
		978	if (!width)
943	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)	979	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944	{	980	{
945	stp[c] = ' ';	981	stp[c] = ' ';
946	srp[c] = rend;	982	srp[c] = rend;
947	}	983	}
948	}	984	}
949	else if (width == 0)	985	else if (width == 0)
950	{	986	{
951	#if ENABLE_COMBINING	987	#if ENABLE_COMBINING
952	// handle combining characters	988	// handle combining characters
…		…
959		995
960	if (screen.cur.col > 0)	996	if (screen.cur.col > 0)
961	{	997	{
962	tp = stp + screen.cur.col - 1;	998	tp = stp + screen.cur.col - 1;
963	rp = srp + screen.cur.col - 1;	999	rp = srp + screen.cur.col - 1;
		1000
		1001	while (*tp == NOCHAR && tp > stp)
		1002	tp--, rp--;
964	}	1003	}
965	else if (screen.cur.row > 0	1004	else if (screen.cur.row > 0
966	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)	1005	&& screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967	{	1006	{
968	tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;	1007	int line = screen.cur.row - 1 + TermWin.saveLines;
969	rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;	1008
		1009	tp = screen.text[line] + last_col - 1;
		1010	rp = screen.rend[line] + last_col - 1;
		1011
		1012	while (*tp == NOCHAR && tp > screen.text[line])
		1013	tp--, rp--;
970	}	1014	}
971	else	1015	else
972	continue;	1016	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		1017
978	// first try to find a precomposed character	1018	// first try to find a precomposed character
979	unicode_t n = rxvt_compose (*tp, c);	1019	unicode_t n = rxvt_compose (*tp, c);
980	if (n == NOCHAR)	1020	if (n == NOCHAR)
981	n = rxvt_composite.compose (*tp, c);	1021	n = rxvt_composite.compose (*tp, c);
982		1022
983	*tp = n;	1023	*tp = n;
984	*rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));	1024	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985	#endif	1025	#endif
986	}	1026	}
987	}	1027	}
988		1028
989	if (screen.tlen[row] != -1) /* XXX: think about this */	1029	if (screen.tlen[row] != -1) /* XXX: think about this */
…		…
1028	* Process Horizontal Tab	1068	* Process Horizontal Tab
1029	* count: +ve = forward; -ve = backwards	1069	* count: +ve = forward; -ve = backwards
1030	* XTERM_SEQ: CTRL-I	1070	* XTERM_SEQ: CTRL-I
1031	*/	1071	*/
1032	void	1072	void
1033	rxvt_term::scr_tab (int count)	1073	rxvt_term::scr_tab (int count, bool ht)
1034	{	1074	{
1035	int i, x;	1075	int i, x;
1036		1076
1037	want_refresh = 1;	1077	want_refresh = 1;
1038	i = x = screen.cur.col;	1078	i = x = screen.cur.col;
1039		1079
1040	if (count == 0)	1080	if (count == 0)
1041	return;	1081	return;
1042	else if (count > 0)	1082	else if (count > 0)
1043	{	1083	{
		1084	int row = TermWin.saveLines + screen.cur.row;
		1085	text_t *tp = screen.text[row];
		1086	rend_t *rp = screen.rend[row];
		1087	rend_t base_rend = rp[i];
		1088	ht &= tp[i] == ' ';
		1089
1044	for (; ++i < TermWin.ncol; )	1090	for (; ++i < TermWin.ncol; )
1045	if (tabs[i])	1091	if (tabs[i])
1046	{	1092	{
1047	x = i;	1093	x = i;
1048	if (!--count)	1094	if (!--count)
1049	break;	1095	break;
1050	}	1096	}
		1097	else
		1098	ht &= tp[i] == ' '
		1099	&& RS_SAME (rp[i], base_rend);
1051		1100
1052	if (count)	1101	if (count)
1053	x = TermWin.ncol - 1;	1102	x = TermWin.ncol - 1;
		1103
		1104	// store horizontal tab commands as characters inside the text
		1105	// buffer so they can be selected and pasted.
		1106	if (ht && options & Opt_pastableTabs)
		1107	{
		1108	base_rend = SET_FONT (base_rend, 0);
		1109
		1110	if (screen.tlen[row] != -1) /* XXX: think about this */
		1111	MAX_IT (screen.tlen[row], x);
		1112
		1113	i = screen.cur.col;
		1114
		1115	tp[i] = '\t';
		1116	rp[i] = base_rend;
		1117
		1118	while (++i < x)
		1119	{
		1120	tp[i] = NOCHAR;
		1121	rp[i] = base_rend;
		1122	}
		1123	}
1054	}	1124	}
1055	else /* if (count < 0) */	1125	else /* if (count < 0) */
1056	{	1126	{
1057	for (; --i >= 0; )	1127	for (; --i >= 0; )
1058	if (tabs[i])	1128	if (tabs[i])
…		…
1314	ren = DEFAULT_RSTYLE;	1384	ren = DEFAULT_RSTYLE;
1315	CLEAR_ROWS (row, num);	1385	CLEAR_ROWS (row, num);
1316	}	1386	}
1317	else	1387	else
1318	{	1388	{
1319	ren = (rstyle & (RS_fgMask | RS_bgMask));	1389	ren = rstyle & (RS_fgMask | RS_bgMask);
1320	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1390	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1321	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1391	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322	ERASE_ROWS (row, num);	1392	ERASE_ROWS (row, num);
1323	gcvalue.foreground = pix_colors[Color_fg];	1393	gcvalue.foreground = pix_colors[Color_fg];
1324	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1394	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1325	}	1395	}
1326		1396
1327	for (; num--; row++)	1397	for (; num--; row++)
1328	{	1398	{
1329	scr_blank_screen_mem (screen.text, screen.rend,	1399	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;	1400	screen.tlen[row + row_offset] = 0;
1332	scr_blank_line (drawn_text[row], drawn_rend[row],	1401	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1333	(unsigned int)TermWin.ncol, ren);
1334	}	1402	}
1335	}	1403	}
1336		1404
1337	/* ------------------------------------------------------------------------- */	1405	/* ------------------------------------------------------------------------- */
1338	/*	1406	/*
…		…
1349	ZERO_SCROLLBACK ();	1417	ZERO_SCROLLBACK ();
1350		1418
1351	num_scr_allow = 0;	1419	num_scr_allow = 0;
1352	selection_check (3);	1420	selection_check (3);
1353		1421
1354	fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));	1422	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1355	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)	1423	for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1356	{	1424	{
1357	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */	1425	screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1358	fill_text (screen.text[k], 'E', TermWin.ncol);	1426	fill_text (screen.text[k], 'E', TermWin.ncol);
1359	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )	1427	for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
…		…
1422	slp = &screen.tlen[row];	1490	slp = &screen.tlen[row];
1423		1491
1424	switch (insdel)	1492	switch (insdel)
1425	{	1493	{
1426	case INSERT:	1494	case INSERT:
1427	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;	1495	for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1428	col--)
1429	{	1496	{
1430	stp[col] = stp[col - count];	1497	stp[col] = stp[col - count];
1431	srp[col] = srp[col - count];	1498	srp[col] = srp[col - count];
1432	}	1499	}
1433		1500
…		…
1443	if (selection.end.row != screen.cur.row	1510	if (selection.end.row != screen.cur.row
1444	|| (selection.end.col + count >= TermWin.ncol))	1511	|| (selection.end.col + count >= TermWin.ncol))
1445	CLEAR_SELECTION ();	1512	CLEAR_SELECTION ();
1446	else	1513	else
1447	{ /* shift selection */	1514	{ /* shift selection */
1448	selection.beg.col += count;	1515	selection.beg.col += count;
1449	selection.mark.col += count; /* XXX: yes? */	1516	selection.mark.col += count; /* XXX: yes? */
1450	selection.end.col += count;	1517	selection.end.col += count;
1451	}	1518	}
1452	}	1519	}
1453		1520
1454	scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),	1521	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1455	(unsigned int)count, rstyle);	1522	(unsigned int)count, rstyle);
1456	break;	1523	break;
1457		1524
1458	case ERASE:	1525	case ERASE:
1459	screen.cur.col += count; /* don't worry if > TermWin.ncol */	1526	screen.cur.col += count; /* don't worry if > TermWin.ncol */
1460	selection_check (1);	1527	selection_check (1);
1461	screen.cur.col -= count;	1528	screen.cur.col -= count;
1462	scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),	1529	scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1463	(unsigned int)count, rstyle);	1530	(unsigned int)count, rstyle);
1464	break;	1531	break;
1465		1532
1466	case DELETE:	1533	case DELETE:
1467	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1534	tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1470	{	1537	{
1471	stp[col] = stp[col + count];	1538	stp[col] = stp[col + count];
1472	srp[col] = srp[col + count];	1539	srp[col] = srp[col + count];
1473	}	1540	}
1474		1541
1475	scr_blank_line (& (stp[TermWin.ncol - count]),	1542	scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1476	& (srp[TermWin.ncol - count]),
1477	(unsigned int)count, tr);	1543	(unsigned int)count, tr);
1478		1544
1479	if (*slp == -1) /* break line continuation */	1545	if (*slp == -1) /* break line continuation */
1480	*slp = TermWin.ncol;	1546	*slp = TermWin.ncol;
1481		1547
…		…
1490	|| selection.end.col >= TermWin.ncol)	1556	|| selection.end.col >= TermWin.ncol)
1491	CLEAR_SELECTION ();	1557	CLEAR_SELECTION ();
1492	else	1558	else
1493	{	1559	{
1494	/* shift selection */	1560	/* shift selection */
1495	selection.beg.col -= count;	1561	selection.beg.col -= count;
1496	selection.mark.col -= count; /* XXX: yes? */	1562	selection.mark.col -= count; /* XXX: yes? */
1497	selection.end.col -= count;	1563	selection.end.col -= count;
1498	}	1564	}
1499	}	1565	}
1500		1566
1501	break;	1567	break;
1502	}	1568	}
…		…
1568	{	1634	{
1569	if (mode)	1635	if (mode)
1570	screen.flags |= Screen_Relative;	1636	screen.flags |= Screen_Relative;
1571	else	1637	else
1572	screen.flags &= ~Screen_Relative;	1638	screen.flags &= ~Screen_Relative;
		1639
1573	scr_gotorc (0, 0, 0);	1640	scr_gotorc (0, 0, 0);
1574	}	1641	}
1575		1642
1576	/* ------------------------------------------------------------------------- */	1643	/* ------------------------------------------------------------------------- */
1577	/*	1644	/*
…		…
1617		1684
1618	if (rvideo != mode)	1685	if (rvideo != mode)
1619	{	1686	{
1620	rvideo = mode;	1687	rvideo = mode;
1621	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1688	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1622	#if defined(XPM_BACKGROUND)	1689	#if XPM_BACKGROUND
1623	if (bgPixmap.pixmap == None)	1690	if (bgPixmap.pixmap == None)
1624	#endif	1691	#endif
1625	#if defined(TRANSPARENT)	1692	#if TRANSPARENT
1626	if (! (options & Opt_transparent) || am_transparent == 0)	1693	if (! (options & Opt_transparent) || am_transparent == 0)
1627	#endif	1694	#endif
1628	XSetWindowBackground (display->display, TermWin.vt,	1695	XSetWindowBackground (display->display, TermWin.vt,
1629	pix_colors[Color_bg]);	1696	pix_colors[Color_bg]);
1630		1697
…		…
1685	* XTERM_SEQ: Invoke G2 character set: ESC N	1752	* XTERM_SEQ: Invoke G2 character set: ESC N
1686	* XTERM_SEQ: Invoke G3 character set: ESC O	1753	* XTERM_SEQ: Invoke G3 character set: ESC O
1687	*/	1754	*/
1688	void	1755	void
1689	rxvt_term::scr_charset_choose (int set)	1756	rxvt_term::scr_charset_choose (int set)
1690	{	1757	{
1691	screen.charset = set;	1758	screen.charset = set;
1692	set_font_style ();	1759	set_font_style ();
1693	}	1760	}
1694		1761
1695	/* ------------------------------------------------------------------------- */	1762	/* ------------------------------------------------------------------------- */
1696	/*	1763	/*
1697	* Set a font	1764	* Set a font
1698	* XTERM_SEQ: Set G0 character set: ESC ( <C>	1765	* XTERM_SEQ: Set G0 character set: ESC ( <C>
…		…
1701	* XTERM_SEQ: Set G3 character set: ESC + <C>	1768	* XTERM_SEQ: Set G3 character set: ESC + <C>
1702	* See set_font_style for possible values for <C>	1769	* See set_font_style for possible values for <C>
1703	*/	1770	*/
1704	void	1771	void
1705	rxvt_term::scr_charset_set (int set, unsigned int ch)	1772	rxvt_term::scr_charset_set (int set, unsigned int ch)
1706	{	1773	{
1707	charsets[set] = (unsigned char)ch;	1774	charsets[set] = (unsigned char)ch;
1708	set_font_style ();	1775	set_font_style ();
1709	}	1776	}
1710		1777
1711		1778
1712	/* ------------------------------------------------------------------------- *	1779	/* ------------------------------------------------------------------------- *
1713	* MAJOR SCREEN MANIPULATION *	1780	* MAJOR SCREEN MANIPULATION *
1714	* ------------------------------------------------------------------------- */	1781	* ------------------------------------------------------------------------- */
…		…
1808	*/	1875	*/
1809	int	1876	int
1810	rxvt_term::scr_move_to (int y, int len)	1877	rxvt_term::scr_move_to (int y, int len)
1811	{	1878	{
1812	long p = 0;	1879	long p = 0;
1813	uint16_t oldviewstart;	1880	unsigned int oldviewstart;
1814		1881
1815	oldviewstart = TermWin.view_start;	1882	oldviewstart = TermWin.view_start;
1816		1883
1817	if (y < len)	1884	if (y < len)
1818	{	1885	{
1819	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;	1886	p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1820	p -= (long) (TermWin.nrow - 1);	1887	p -= (long) (TermWin.nrow - 1);
1821	p = max (p, 0);	1888	p = max (p, 0);
1822	}	1889	}
1823		1890
1824	TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);	1891	TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1825		1892
1826	return scr_changeview (oldviewstart);	1893	return scr_changeview (oldviewstart);
1827	}	1894	}
1828		1895
1829	/* ------------------------------------------------------------------------- */	1896	/* ------------------------------------------------------------------------- */
…		…
1833	*/	1900	*/
1834	int	1901	int
1835	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1902	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1836	{	1903	{
1837	int n;	1904	int n;
1838	uint16_t oldviewstart;	1905	unsigned int oldviewstart;
1839		1906
1840	#ifdef DEBUG_STRICT	1907	#ifdef DEBUG_STRICT
1841	assert ((nlines >= 0) && (nlines <= TermWin.nrow));	1908	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1842	#endif	1909	#endif
1843	oldviewstart = TermWin.view_start;	1910	oldviewstart = TermWin.view_start;
…		…
1853	}	1920	}
1854	return scr_changeview (oldviewstart);	1921	return scr_changeview (oldviewstart);
1855	}	1922	}
1856		1923
1857	int	1924	int
1858	rxvt_term::scr_changeview (uint16_t oldviewstart)	1925	rxvt_term::scr_changeview (unsigned int oldviewstart)
1859	{	1926	{
1860	if (TermWin.view_start != oldviewstart)	1927	if (TermWin.view_start != oldviewstart)
1861	{	1928	{
1862	want_refresh = 1;	1929	want_refresh = 1;
1863	num_scr -= (TermWin.view_start - oldviewstart);	1930	num_scr -= (TermWin.view_start - oldviewstart);
…		…
1960		2027
1961	void	2028	void
1962	rxvt_term::scr_refresh (unsigned char refresh_type)	2029	rxvt_term::scr_refresh (unsigned char refresh_type)
1963	{	2030	{
1964	unsigned char must_clear, /* use draw_string not draw_image_string */	2031	unsigned char must_clear, /* use draw_string not draw_image_string */
1965	rvid, /* reverse video this position */
1966	showcursor; /* show the cursor */	2032	showcursor; /* show the cursor */
1967	int16_t col, row, /* column/row we're processing */	2033	int16_t col, row, /* column/row we're processing */
1968	ocrow; /* old cursor row */	2034	ocrow; /* old cursor row */
1969	int i, /* tmp */	2035	int i, /* tmp */
1970	row_offset; /* basic offset in screen structure */	2036	row_offset; /* basic offset in screen structure */
1971	#ifndef NO_CURSORCOLOR	2037	#ifndef NO_CURSORCOLOR
1972	rend_t cc1; /* store colours at cursor position (s) */	2038	rend_t cc1; /* store colours at cursor position (s) */
1973	#endif	2039	#endif
1974	rend_t *crp; // cursor rendition pointer	2040	rend_t *crp; // cursor rendition pointer
1975		2041
		2042	want_refresh = 0; /* screen is current */
		2043
1976	if (refresh_type == NO_REFRESH || !TermWin.mapped)	2044	if (refresh_type == NO_REFRESH || !TermWin.mapped)
1977	return;	2045	return;
1978		2046
1979	/*	2047	/*
1980	* A: set up vars	2048	* A: set up vars
…		…
1982	must_clear = 0;	2050	must_clear = 0;
1983	refresh_count = 0;	2051	refresh_count = 0;
1984		2052
1985	row_offset = TermWin.saveLines - TermWin.view_start;	2053	row_offset = TermWin.saveLines - TermWin.view_start;
1986		2054
1987	#ifdef XPM_BACKGROUND	2055	#if XPM_BACKGROUND
1988	must_clear |= (bgPixmap.pixmap != None);	2056	must_clear |= (bgPixmap.pixmap != None);
1989	#endif	2057	#endif
1990	#ifdef TRANSPARENT	2058	#if TRANSPARENT
1991	must_clear |= ((options & Opt_transparent) && am_transparent);	2059	must_clear |= ((options & Opt_transparent) && am_transparent);
1992	#endif	2060	#endif
1993	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2061	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1994		2062
1995	/*	2063	/*
1996	* B: reverse any characters which are selected	2064	* B: reverse any characters which are selected
1997	*/	2065	*/
1998	scr_reverse_selection ();	2066	scr_reverse_selection ();
1999	#if ENABLE_OVERLAY
2000	scr_swap_overlay ();
2001	#endif
2002		2067
2003	/*	2068	/*
2004	* C: set the cursor character (s)	2069	* C: set the cursor character (s)
2005	*/	2070	*/
2006	{	2071	{
…		…
2080	oldcursor.col = screen.cur.col;	2145	oldcursor.col = screen.cur.col;
2081	}	2146	}
2082	}	2147	}
2083	}	2148	}
2084		2149
		2150	#if ENABLE_OVERLAY
		2151	scr_swap_overlay ();
		2152	#endif
		2153
2085	rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */	2154	rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086	text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */	2155	text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
		2156
2087	#ifndef NO_SLOW_LINK_SUPPORT	2157	#ifndef NO_SLOW_LINK_SUPPORT
2088	/*	2158	/*
2089	* D: CopyArea pass - very useful for slower links	2159	* D: CopyArea pass - very useful for slower links
2090	* This has been deliberately kept simple.	2160	* This has been deliberately kept simple.
2091	*/	2161	*/
…		…
2168		2238
2169	for (col = 0; col < TermWin.ncol; col++)	2239	for (col = 0; col < TermWin.ncol; col++)
2170	{	2240	{
2171	/* compare new text with old - if exactly the same then continue */	2241	/* compare new text with old - if exactly the same then continue */
2172	if (stp[col] == dtp[col] /* Must match characters to skip. */	2242	if (stp[col] == dtp[col] /* Must match characters to skip. */
2173	&& (srp[col] == drp[col] /* Either rendition the same or */	2243	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2174	|| (stp[col] == ' ' /* space w/ no background change */	2244	|| (stp[col] == ' ' /* space w/ no background change */
2175	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))	2245	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176	continue;	2246	continue;
2177		2247
2178	// redraw one or more characters	2248	// redraw one or more characters
2179		2249
2180	// seek to the beginning if wide characters	2250	// seek to the beginning of wide characters
2181	while (stp[col] == NOCHAR && col > 0)	2251	while (stp[col] == NOCHAR && col > 0)
2182	--col;	2252	--col;
2183		2253
2184	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2254	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2185	text_t *text = stp + col;	2255	text_t *text = stp + col;
…		…
2188	dtp[col] = stp[col];	2258	dtp[col] = stp[col];
2189	drp[col] = rend;	2259	drp[col] = rend;
2190		2260
2191	int xpixel = Col2Pixel (col);	2261	int xpixel = Col2Pixel (col);
2192		2262
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; )	2263	for (i = 0; ++col < TermWin.ncol; )
2196	{	2264	{
2197	if (stp[col] == NOCHAR)	2265	if (stp[col] == NOCHAR)
2198	{	2266	{
2199	dtp[col] = stp[col];	2267	dtp[col] = stp[col];
…		…
2202	i++;	2270	i++;
2203		2271
2204	continue;	2272	continue;
2205	}	2273	}
2206		2274
2207	if (rend != srp[col])	2275	if (!RS_SAME (rend, srp[col]))
2208	break;	2276	break;
2209		2277
2210	count++;	2278	count++;
2211		2279
2212	if (stp[col] != dtp[col]	2280	if (stp[col] != dtp[col]
2213	|| srp[col] != drp[col])	2281	|| !RS_SAME (srp[col], drp[col]))
2214	{	2282	{
2215	if (must_clear && (i++ > count / 2))	2283	if (must_clear && (i++ > count / 2))
2216	break;	2284	break;
2217		2285
2218	dtp[col] = stp[col];	2286	dtp[col] = stp[col];
…		…
2228		2296
2229	// sometimes we optimize away the trailing NOCHAR's, add them back	2297	// sometimes we optimize away the trailing NOCHAR's, add them back
2230	while (i && text[count] == NOCHAR)	2298	while (i && text[count] == NOCHAR)
2231	count++, i--;	2299	count++, i--;
2232		2300
		2301	#if ENABLE_STYLES
		2302	// force redraw after "careful" characters to avoid pixel droppings
		2303	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
		2304	drp[col + 1] = ~srp[col + 1];
		2305
		2306	// include previous careful character(s) if possible, looks nicer (best effort...)
		2307	while (text > stp
		2308	&& srp[text - stp - 1] & RS_Careful
		2309	&& RS_SAME (rend, srp[text - stp - 1]))
		2310	text--, count++, xpixel -= TermWin.fwidth;
		2311	#endif
		2312
2233	/*	2313	/*
2234	* Determine the attributes for the string	2314	* Determine the attributes for the string
2235	*/	2315	*/
2236	int fid = GET_FONT (rend);
2237	int fore = GET_FGCOLOR (rend); // desired foreground	2316	int fore = GET_FGCOLOR (rend); // desired foreground
2238	int back = GET_BGCOLOR (rend); // desired background	2317	int back = GET_BGCOLOR (rend); // desired background
2239		2318
2240	rend = GET_ATTR (rend);	2319	// only do special processing if ana attributes are set, which is rare
2241		2320	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2242	rvid = !!(rend & RS_RVid);	2321	{
		2322	bool invert = rend & RS_RVid;
2243		2323
2244	#ifndef NO_BOLD_UNDERLINE_REVERSE	2324	#ifndef NO_BOLD_UNDERLINE_REVERSE
2245	if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))	2325	if (rend & RS_Bold
		2326	&& fore == Color_fg)
2246	{	2327	{
2247	if (ISSET_PIXCOLOR (Color_BD))	2328	if (ISSET_PIXCOLOR (Color_BD))
2248	fore = Color_BD;	2329	fore = Color_BD;
		2330	# if !ENABLE_STYLES
2249	else	2331	else
2250	rvid = !rvid;	2332	invert = !invert;
		2333	# endif
		2334	}
		2335
		2336	if (rend & RS_Italic
		2337	&& fore == Color_fg)
		2338	{
		2339	if (ISSET_PIXCOLOR (Color_IT))
		2340	fore = Color_IT;
		2341	# if !ENABLE_STYLES
		2342	else
		2343	invert = !invert;
		2344	# endif
		2345	}
		2346
		2347	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
		2348	fore = Color_UL;
		2349	#endif
		2350
		2351	if (invert)
		2352	{
		2353	SWAP_IT (fore, back, int);
		2354
		2355	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2356	if (ISSET_PIXCOLOR (Color_RV))
		2357	back = Color_RV;
		2358	#endif
		2359	}
		2360
		2361	#ifdef TEXT_BLINK
		2362	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
		2363	{
		2364	if (!text_blink_ev.active)
		2365	{
		2366	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
		2367	hidden_text = 0;
		2368	}
		2369	else if (hidden_text)
		2370	fore = back;
		2371	}
		2372	#endif
2251	}	2373	}
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		2374
2285	/*	2375	/*
2286	* Actually do the drawing of the string here	2376	* Actually do the drawing of the string here
2287	*/	2377	*/
2288	rxvt_font *font = (*TermWin.fontset)[fid];	2378	rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2289		2379
2290	if (back == fore)	2380	if (back == fore)
2291	font->clear_rect (*TermWin.drawable, xpixel, ypixel,	2381	font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2292	TermWin.fwidth * count, TermWin.fheight,	2382	TermWin.fwidth * count, TermWin.fheight,
2293	back);	2383	back);
…		…
2309	}	2399	}
2310	else	2400	else
2311	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2401	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2312		2402
2313	if (rend & RS_Uline && font->descent > 1 && fore != back)	2403	if (rend & RS_Uline && font->descent > 1 && fore != back)
		2404	{
		2405	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2314	XDrawLine (display->display, drawBuffer, TermWin.gc,	2406	XDrawLine (display->display, drawBuffer, TermWin.gc,
2315	xpixel, ypixel + font->ascent + 1,	2407	xpixel, ypixel + font->ascent + 1,
2316	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2408	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
		2409	}
2317	} /* for (col....) */	2410	} /* for (col....) */
2318	} /* for (row....) */	2411	} /* for (row....) */
		2412
		2413	#if ENABLE_OVERLAY
		2414	scr_swap_overlay ();
		2415	#endif
2319		2416
2320	/*	2417	/*
2321	* G: cleanup cursor and display outline cursor if necessary	2418	* G: cleanup cursor and display outline cursor if necessary
2322	*/	2419	*/
2323	if (showcursor)	2420	if (showcursor)
…		…
2349	}	2446	}
2350		2447
2351	/*	2448	/*
2352	* H: cleanup selection	2449	* H: cleanup selection
2353	*/	2450	*/
2354	#if ENABLE_OVERLAY
2355	scr_swap_overlay ();
2356	#endif
2357	scr_reverse_selection ();	2451	scr_reverse_selection ();
2358		2452
2359	if (refresh_type & SMOOTH_REFRESH)	2453	if (refresh_type & SMOOTH_REFRESH)
2360	XFlush (display->display);	2454	XFlush (display->display);
2361		2455
2362	num_scr = 0;	2456	num_scr = 0;
2363	num_scr_allow = 1;	2457	num_scr_allow = 1;
2364	want_refresh = 0; /* screen is current */
2365	}	2458	}
2366		2459
2367	void	2460	void
2368	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)	2461	rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2369	{	2462	{
2370	if (!rp || !tp)	2463	if (!rp || !tp)
2371	return;	2464	return;
2372		2465
2373	for (int i = TermWin.ncol; i; i--, rp++, tp++)	2466	for (int i = TermWin.ncol; i; i--, rp++, tp++)
2374	*rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));	2467	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2375	}	2468	}
2376		2469
2377	void	2470	void
2378	rxvt_term::scr_remap_chars ()	2471	rxvt_term::scr_remap_chars ()
2379	{	2472	{
…		…
2385	scr_remap_chars (drawn_text[i], drawn_rend[i]);	2478	scr_remap_chars (drawn_text[i], drawn_rend[i]);
2386	scr_remap_chars (swap.text[i], swap.rend[i]);	2479	scr_remap_chars (swap.text[i], swap.rend[i]);
2387	}	2480	}
2388	}	2481	}
2389		2482
		2483	void
		2484	rxvt_term::scr_recolour ()
		2485	{
		2486	if (1
		2487	#if TRANSPARENT
		2488	&& !am_transparent
		2489	#endif
		2490	#if XPM_BACKGROUND
		2491	&& !bgPixmap.pixmap
		2492	#endif
		2493	)
		2494	{
		2495	XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
		2496	XClearWindow (display->display, TermWin.parent[0]);
		2497	XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
		2498	#if HAVE_SCROLLBARS
		2499	if (scrollBar.win)
		2500	{
		2501	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
		2502	scrollBar.setIdle ();
		2503	scrollbar_show (0);
		2504	}
		2505	#endif
		2506	}
		2507
		2508	scr_clear ();
		2509	scr_touch (true);
		2510	want_refresh = 1;
		2511	}
		2512
2390	/* ------------------------------------------------------------------------- */	2513	/* ------------------------------------------------------------------------- */
2391	void	2514	void
2392	rxvt_term::scr_clear (bool really)	2515	rxvt_term::scr_clear (bool really)
2393	{	2516	{
2394	if (!TermWin.mapped)	2517	if (!TermWin.mapped)
2395	return;	2518	return;
2396		2519
2397	num_scr_allow = 0;	2520	num_scr_allow = 0;
2398	want_refresh = 1;	2521	want_refresh = 1;
2399		2522
2400	#ifdef TRANSPARENT	2523	#if TRANSPARENT
2401	if ((options & Opt_transparent) && (am_pixmap_trans == 0))	2524	if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2402	{	2525	{
2403	int i;	2526	int i;
2404		2527
2405	if (! (options & Opt_transparent_all))	2528	if (!(options & Opt_transparent_all))
2406	i = 0;	2529	i = 0;
2407	else	2530	else
2408	i = (int) (sizeof (TermWin.parent) / sizeof (Window));	2531	i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2409		2532
2410	while (i--)	2533	while (i--)
…		…
2426	int end_row = TermWin.saveLines - TermWin.view_start;	2549	int end_row = TermWin.saveLines - TermWin.view_start;
2427	int i = selection.beg.row + TermWin.saveLines;	2550	int i = selection.beg.row + TermWin.saveLines;
2428	int col, row = selection.end.row + TermWin.saveLines;	2551	int col, row = selection.end.row + TermWin.saveLines;
2429	rend_t *srp;	2552	rend_t *srp;
2430		2553
2431	if (i >= end_row)	2554	#if ENABLE_FRILLS
2432	col = selection.beg.col;	2555	if (selection.rect)
		2556	{
		2557	end_row += TermWin.nrow;
		2558
		2559	for (; i <= row && i <= end_row; i++)
		2560	for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
		2561	srp[col] ^= RS_RVid;
		2562	}
2433	else	2563	else
		2564	#endif
		2565	{
		2566	if (i >= end_row)
		2567	col = selection.beg.col;
		2568	else
2434	{	2569	{
2435	col = 0;	2570	col = 0;
2436	i = end_row;	2571	i = end_row;
2437	}	2572	}
2438		2573
2439	end_row += TermWin.nrow;	2574	end_row += TermWin.nrow;
		2575
2440	for (; i < row && i < end_row; i++, col = 0)	2576	for (; i < row && i < end_row; i++, col = 0)
2441	for (srp = screen.rend[i]; col < TermWin.ncol; col++)	2577	for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2442	srp[col] ^= RS_RVid;	2578	srp[col] ^= RS_RVid;
2443		2579
2444	if (i == row && i < end_row)	2580	if (i == row && i < end_row)
2445	for (srp = screen.rend[i]; col < selection.end.col; col++)	2581	for (srp = screen.rend[i]; col < selection.end.col; col++)
2446	srp[col] ^= RS_RVid;	2582	srp[col] ^= RS_RVid;
		2583	}
2447	}	2584	}
2448	}	2585	}
2449		2586
2450	/* ------------------------------------------------------------------------- */	2587	/* ------------------------------------------------------------------------- */
2451	/*	2588	/*
…		…
2522	*/	2659	*/
2523	void	2660	void
2524	rxvt_term::paste (const unsigned char *data, unsigned int len)	2661	rxvt_term::paste (const unsigned char *data, unsigned int len)
2525	{	2662	{
2526	unsigned int i, j, n;	2663	unsigned int i, j, n;
2527	unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);	2664	unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2528		2665
2529	/* convert normal newline chars into common keyboard Return key sequence */	2666	/* convert normal newline chars into common keyboard Return key sequence */
2530	for (i = 0; i < len; i += PROP_SIZE)	2667	for (i = 0; i < len; i += PASTE_SIZE)
2531	{	2668	{
2532	n = min (len - i, PROP_SIZE);	2669	n = min (len - i, PASTE_SIZE);
2533	memcpy (ds, data + i, n);	2670	memcpy (ds, data + i, n);
2534		2671
2535	for (j = 0; j < n; j++)	2672	for (j = 0; j < n; j++)
2536	if (ds[j] == C0_LF)	2673	if (ds[j] == C0_LF)
2537	ds[j] = C0_CR;	2674	ds[j] = C0_CR;
…		…
2545	/* ------------------------------------------------------------------------- */	2682	/* ------------------------------------------------------------------------- */
2546	/*	2683	/*
2547	* Respond to a notification that a primary selection has been sent	2684	* Respond to a notification that a primary selection has been sent
2548	* EXT: SelectionNotify	2685	* EXT: SelectionNotify
2549	*/	2686	*/
2550	int	2687	void
2551	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2688	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2552	{	2689	{
2553	long nread = 0;
2554	unsigned long bytes_after;
2555	XTextProperty ct;
2556
2557	if (prop == None) /* check for failed XConvertSelection */	2690	if (prop == None) /* check for failed XConvertSelection */
2558	{	2691	{
2559	if ((selection_type & Sel_CompoundText))	2692	if ((selection_type & Sel_CompoundText))
2560	{	2693	{
2561	int selnum = selection_type & Sel_whereMask;	2694	int selnum = selection_type & Sel_whereMask;
…		…
2574	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2707	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2575	else	2708	else
2576	selection_type = 0;	2709	selection_type = 0;
2577	}	2710	}
2578		2711
2579	return 0;	2712	return;
2580	}
2581
2582	for (;;)
2583	{	2713	}
		2714
		2715	unsigned long bytes_after;
		2716	XTextProperty ct;
		2717
		2718	if (XGetWindowProperty (display->display, win, prop,
		2719	0, PROP_SIZE / 4,
		2720	delete_prop, AnyPropertyType,
		2721	&ct.encoding, &ct.format,
		2722	&ct.nitems, &bytes_after,
		2723	&ct.value) != Success)
		2724	{
		2725	ct.value = 0;
		2726	goto bailout;
		2727	}
		2728
		2729	if (ct.encoding == None)
		2730	goto bailout;
		2731
		2732	if (bytes_after)
		2733	{
		2734	// fetch and append remaining data
		2735	XTextProperty ct2;
		2736
2584	if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),	2737	if (XGetWindowProperty (display->display, win, prop,
2585	(long) (PROP_SIZE / 4), delete_prop,	2738	ct.nitems / 4, (bytes_after + 3) / 4,
		2739	delete_prop, AnyPropertyType,
2586	AnyPropertyType, &ct.encoding, &ct.format,	2740	&ct2.encoding, &ct2.format,
2587	&ct.nitems, &bytes_after,	2741	&ct2.nitems, &bytes_after,
2588	&ct.value) != Success)	2742	&ct2.value) != Success)
2589	break;	2743	goto bailout;
2590		2744
2591	if (ct.encoding == 0)	2745	// realloc should be compatible to XFree, here, and elsewhere, too
2592	break;	2746	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
		2747	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
		2748	ct.nitems += ct2.nitems;
2593		2749
		2750	XFree (ct2.value);
		2751	}
		2752
		2753	if (ct.value == 0)
		2754	goto bailout;
		2755
2594	if (ct.encoding == xa[XA_INCR])	2756	if (ct.encoding == xa[XA_INCR])
2595	{	2757	{
2596	// INCR selection, start handshake	2758	// INCR selection, start handshake
		2759	if (!delete_prop)
2597	XDeleteProperty (display->display, win, prop);	2760	XDeleteProperty (display->display, win, prop);
		2761
2598	selection_wait = Sel_incr;	2762	selection_wait = Sel_incr;
		2763	incr_buf_fill = 0;
2599	incr_ev.start (NOW + 10);	2764	incr_ev.start (NOW + 10);
2600	break;
2601	}
2602		2765
2603	if (ct.value == NULL)	2766	goto bailout;
2604	continue;	2767	}
2605		2768
2606	if (ct.nitems == 0)	2769	if (ct.nitems == 0)
		2770	{
		2771	if (selection_wait == Sel_incr)
		2772	{
		2773	XFree (ct.value);
		2774
		2775	// finally complete, now paste the whole thing
		2776	selection_wait = Sel_normal;
		2777	ct.value = (unsigned char *)incr_buf;
		2778	ct.nitems = incr_buf_fill;
		2779	incr_buf = 0;
		2780	incr_buf_size = 0;
		2781	incr_ev.stop ();
2607	{	2782	}
		2783	else
		2784	{
2608	if (selection_wait == Sel_normal && nread == 0	2785	if (selection_wait == Sel_normal
2609	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2786	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2610	{	2787	{
2611	/*	2788	/*
2612	* pass through again trying CUT_BUFFER0 if we've come from	2789	* pass through again trying CUT_BUFFER0 if we've come from
2613	* XConvertSelection () but nothing was presented	2790	* XConvertSelection () but nothing was presented
2614	*/	2791	*/
2615	selection_paste (display->root, XA_CUT_BUFFER0, False);	2792	selection_paste (display->root, XA_CUT_BUFFER0, False);
2616	}	2793	}
2617		2794
2618	nread = -1; /* discount any previous stuff */	2795	goto bailout;
2619	break;	2796	}
		2797	}
		2798	else if (selection_wait == Sel_incr)
		2799	{
		2800	incr_ev.start (NOW + 10);
		2801
		2802	while (incr_buf_fill + ct.nitems > incr_buf_size)
2620	}	2803	{
		2804	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
		2805	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
		2806	}
2621		2807
		2808	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2622	nread += ct.nitems;	2809	incr_buf_fill += ct.nitems;
2623		2810
		2811	goto bailout;
		2812	}
		2813
2624	char **cl;	2814	char **cl;
2625	int cr;	2815	int cr;
		2816
		2817	#if ENABLE_FRILLS
		2818	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		2819	// so recode it manually
		2820	if (ct.encoding == xa[XA_UTF8_STRING])
		2821	{
		2822	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
		2823	char *s = rxvt_wcstombs (w);
		2824	free (w);
		2825	// TODO: strlen == only the first element will be converted. well...
		2826	paste ((unsigned char *)s, strlen (s));
		2827	free (s);
		2828	}
		2829	else
		2830	#endif
2626	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)	2831	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2627	{	2832	&& cl)
		2833	{
2628	for (int i = 0; i < cr; i++)	2834	for (int i = 0; i < cr; i++)
2629	paste ((unsigned char *)cl[i], strlen (cl[i]));	2835	paste ((unsigned char *)cl[i], strlen (cl[i]));
2630		2836
2631	XFreeStringList (cl);	2837	XFreeStringList (cl);
2632	}	2838	}
2633	else	2839	else
2634	paste (ct.value, ct.nitems);	2840	paste (ct.value, ct.nitems); // paste raw
2635		2841
2636	if (bytes_after == 0)	2842	bailout:
2637	break;
2638
2639	XFree (ct.value);
2640	}
2641
2642	if (ct.value)
2643	XFree (ct.value);	2843	XFree (ct.value);
2644		2844
2645	if (selection_wait == Sel_normal)	2845	if (selection_wait == Sel_normal)
2646	selection_wait = Sel_none;	2846	selection_wait = Sel_none;
2647
2648	return (int)nread;
2649	}	2847	}
2650		2848
2651	void	2849	void
2652	rxvt_term::incr_cb (time_watcher &w)	2850	rxvt_term::incr_cb (time_watcher &w)
2653	{	2851	{
2654	selection_wait = Sel_none;	2852	selection_wait = Sel_none;
2655		2853
		2854	incr_buf_size = 0;
		2855	free (incr_buf);
		2856
2656	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2857	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2657	}	2858	}
2658		2859
2659	/*
2660	* INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2661	*/
2662	void	2860	void
2663	rxvt_term::selection_property (Window win, Atom prop)	2861	rxvt_term::selection_property (Window win, Atom prop)
2664	{	2862	{
2665	if (prop == None || selection_wait != Sel_incr)	2863	if (prop == None || selection_wait != Sel_incr)
2666	return;	2864	return;
2667		2865
2668	if (selection_paste (win, prop, 1) > 0)	2866	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	}	2867	}
2676		2868
2677	/* ------------------------------------------------------------------------- */	2869	/* ------------------------------------------------------------------------- */
2678	/*	2870	/*
2679	* Request the current selection:	2871	* Request the current selection:
…		…
2713	#else	2905	#else
2714	selection_type = Sel_CompoundText;	2906	selection_type = Sel_CompoundText;
2715	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2907	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2716	return;	2908	return;
2717	#endif	2909	#endif
2718
2719	}	2910	}
2720	}	2911	}
2721		2912
2722	selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */	2913	selection_wait = Sel_none; /* don't loop in selection_paste () */
2723	selection_paste (display->root, XA_CUT_BUFFER0, False);	2914	selection_paste (display->root, XA_CUT_BUFFER0, false);
2724	}	2915	}
2725		2916
2726	int	2917	int
2727	rxvt_term::selection_request_other (Atom target, int selnum)	2918	rxvt_term::selection_request_other (Atom target, int selnum)
2728	{	2919	{
…		…
2801		2992
2802	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);	2993	i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2803	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2994	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2804		2995
2805	col = selection.beg.col;	2996	col = selection.beg.col;
2806	MAX_IT (col, 0);
2807	row = selection.beg.row + TermWin.saveLines;	2997	row = selection.beg.row + TermWin.saveLines;
2808	end_row = selection.end.row + TermWin.saveLines;	2998	end_row = selection.end.row + TermWin.saveLines;
2809	int ofs = 0;	2999	int ofs = 0;
2810	int extra = 0;	3000	int extra = 0;
2811		3001
2812	for (; row <= end_row; row++, col = 0)	3002	for (; row <= end_row; row++, col = 0)
2813	{	3003	{
2814	t = &screen.text[row][col];
2815
2816	end_col = screen.tlen[row];	3004	end_col = screen.tlen[row];
		3005
		3006	#if ENABLE_FRILLS
		3007	if (selection.rect)
		3008	{
		3009	col = selection.beg.col;
		3010	end_col = TermWin.ncol + 1;
		3011	}
		3012	#endif
		3013
		3014	MAX_IT (col, 0);
2817		3015
2818	if (end_col == -1)	3016	if (end_col == -1)
2819	end_col = TermWin.ncol;	3017	end_col = TermWin.ncol;
2820		3018
2821	if (row == end_row)	3019	if (row == end_row || selection.rect)
2822	MIN_IT (end_col, selection.end.col);	3020	MIN_IT (end_col, selection.end.col);
2823		3021
		3022	t = &screen.text[row][col];
2824	for (; col < end_col; col++)	3023	for (; col < end_col; col++)
2825	{	3024	{
2826	if (*t == NOCHAR)	3025	if (*t == NOCHAR)
2827	t++;	3026	t++;
2828	#if ENABLE_COMBINING	3027	#if ENABLE_COMBINING
…		…
2876	#if 0	3075	#if 0
2877	XTextProperty ct;	3076	XTextProperty ct;
2878		3077
2879	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3078	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2880	{	3079	{
2881	XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,	3080	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2882	PropModeReplace, ct.value, ct.nitems);
2883	XFree (ct.value);	3081	XFree (ct.value);
2884	}	3082	}
2885	#endif	3083	#endif
2886		3084
2887	selection_time = tm;	3085	selection_time = tm;
…		…
3088	enum {	3286	enum {
3089	LEFT, RIGHT	3287	LEFT, RIGHT
3090	} closeto = RIGHT;	3288	} closeto = RIGHT;
3091		3289
3092	want_refresh = 1;	3290	want_refresh = 1;
		3291
3093	switch (selection.op)	3292	switch (selection.op)
3094	{	3293	{
3095	case SELECTION_INIT:	3294	case SELECTION_INIT:
3096	CLEAR_SELECTION ();	3295	CLEAR_SELECTION ();
3097	selection.op = SELECTION_BEGIN;	3296	selection.op = SELECTION_BEGIN;
…		…
3110	selection_start_colrow (col, row);	3309	selection_start_colrow (col, row);
3111	/* FALLTHROUGH */	3310	/* FALLTHROUGH */
3112	default:	3311	default:
3113	return;	3312	return;
3114	}	3313	}
		3314
3115	if (selection.beg.col == selection.end.col	3315	if (selection.beg.col == selection.end.col
3116	&& selection.beg.col != selection.mark.col	3316	&& selection.beg.col != selection.mark.col
3117	&& selection.beg.row == selection.end.row	3317	&& selection.beg.row == selection.end.row
3118	&& selection.beg.row != selection.mark.row)	3318	&& selection.beg.row != selection.mark.row)
3119	{	3319	{
…		…
3169	}	3369	}
3170	else	3370	else
3171	{ /* button1 drag or button3 drag */	3371	{ /* button1 drag or button3 drag */
3172	if (ROWCOL_IS_AFTER (selection.mark, pos))	3372	if (ROWCOL_IS_AFTER (selection.mark, pos))
3173	{	3373	{
3174	if ((selection.mark.row == selection.end.row)	3374	if (selection.mark.row == selection.end.row
3175	&& (selection.mark.col == selection.end.col)	3375	&& selection.mark.col == selection.end.col
		3376	&& clickchange
3176	&& clickchange && selection.clicks == 2)	3377	&& selection.clicks == 2)
3177	selection.mark.col--;	3378	selection.mark.col--;
3178		3379
3179	selection.beg.row = pos.row;	3380	selection.beg.row = pos.row;
3180	selection.beg.col = pos.col;	3381	selection.beg.col = pos.col;
3181	selection.end.row = selection.mark.row;	3382	selection.end.row = selection.mark.row;
…		…
3192		3393
3193	if (selection.clicks == 1)	3394	if (selection.clicks == 1)
3194	{	3395	{
3195	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];	3396	end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196		3397
3197	if (end_col != -1 && selection.beg.col > end_col)	3398	if (selection.beg.col > end_col
		3399	&& end_col != -1
		3400	#if ENABLE_FRILLS
		3401	&& !selection.rect
		3402	#endif
3198	{	3403	)
3199	#if 1
3200	selection.beg.col = ncol;	3404	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		3405
3209	end_col = screen.tlen[selection.end.row + TermWin.saveLines];	3406	end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210		3407
3211	if (end_col != -1 && selection.end.col > end_col)	3408	if (
		3409	selection.end.col > end_col
		3410	&& end_col != -1
		3411	#if ENABLE_FRILLS
		3412	&& !selection.rect
		3413	#endif
		3414	)
3212	selection.end.col = ncol;	3415	selection.end.col = ncol;
3213	}	3416	}
3214	else if (selection.clicks == 2)	3417	else if (selection.clicks == 2)
3215	{	3418	{
3216	if (ROWCOL_IS_AFTER (selection.end, selection.beg))	3419	if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3217	selection.end.col--;	3420	selection.end.col--;
3218		3421
3219	selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220	selection_delimit_word (DN, & (selection.end), & (selection.end));	3422	selection_delimit_word (UP, &selection.beg, &selection.beg);
		3423	selection_delimit_word (DN, &selection.end, &selection.end);
3221	}	3424	}
3222	else if (selection.clicks == 3)	3425	else if (selection.clicks == 3)
3223	{	3426	{
3224	#if ENABLE_FRILLS	3427	#if ENABLE_FRILLS
3225	if ((options & Opt_tripleclickwords))	3428	if ((options & Opt_tripleclickwords))
3226	{	3429	{
3227	int end_row;	3430	int end_row;
3228		3431
3229	selection_delimit_word (UP, & (selection.beg), & (selection.beg));	3432	selection_delimit_word (UP, &selection.beg, &selection.beg);
3230	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3433	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3231		3434
3232	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)	3435	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3233	{	3436	{
3234	end_col = screen.tlen[end_row + TermWin.saveLines];	3437	end_col = screen.tlen[end_row + TermWin.saveLines];
…		…
3245	else	3448	else
3246	#endif	3449	#endif
3247	{	3450	{
3248	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3451	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3249	selection.mark.col++;	3452	selection.mark.col++;
		3453
3250	selection.beg.col = 0;	3454	selection.beg.col = 0;
3251	selection.end.col = ncol;	3455	selection.end.col = ncol;
3252	}	3456	}
3253	}	3457	}
3254		3458
…		…
3263	{	3467	{
3264	selection.mark.row = selection.beg.row;	3468	selection.mark.row = selection.beg.row;
3265	selection.mark.col = selection.beg.col;	3469	selection.mark.col = selection.beg.col;
3266	}	3470	}
3267	}	3471	}
3268	}
3269		3472
3270	#if ENABLE_FRILLS	3473	#if ENABLE_FRILLS
		3474	if (selection.rect && selection.beg.col > selection.end.col)
		3475	SWAP_IT (selection.beg.col, selection.end.col, int);
		3476	#endif
		3477	}
		3478
		3479	#if ENABLE_FRILLS
3271	void	3480	void
3272	rxvt_term::selection_remove_trailing_spaces ()	3481	rxvt_term::selection_remove_trailing_spaces ()
3273	{	3482	{
3274	int32_t end_col, end_row;	3483	int32_t end_col, end_row;
3275	text_t *stp;	3484	text_t *stp;
3276		3485
3277	end_col = selection.end.col;	3486	end_col = selection.end.col;
3278	end_row = selection.end.row;	3487	end_row = selection.end.row;
		3488
3279	for ( ; end_row >= selection.beg.row; )	3489	for ( ; end_row >= selection.beg.row; )
3280	{	3490	{
3281	stp = screen.text[end_row + TermWin.saveLines];	3491	stp = screen.text[end_row + TermWin.saveLines];
		3492
3282	while (--end_col >= 0)	3493	while (--end_col >= 0)
3283	{	3494	{
3284	if (stp[end_col] != ' ' && stp[end_col] != '\t')	3495	if (stp[end_col] != ' '
		3496	&& stp[end_col] != '\t'
		3497	&& stp[end_col] != NOCHAR)
3285	break;	3498	break;
3286	}	3499	}
		3500
3287	if (end_col >= 0	3501	if (end_col >= 0
3288	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)	3502	|| screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3289	{	3503	{
3290	selection.end.col = end_col + 1;	3504	selection.end.col = end_col + 1;
3291	selection.end.row = end_row;	3505	selection.end.row = end_row;
3292	break;	3506	break;
3293	}	3507	}
		3508
3294	end_row--;	3509	end_row--;
3295	end_col = TermWin.ncol;	3510	end_col = TermWin.ncol;
3296	}	3511	}
		3512
3297	if (selection.mark.row > selection.end.row)	3513	if (selection.mark.row > selection.end.row)
3298	{	3514	{
3299	selection.mark.row = selection.end.row;	3515	selection.mark.row = selection.end.row;
3300	selection.mark.col = selection.end.col;	3516	selection.mark.col = selection.end.col;
3301	}	3517	}
…		…
3317	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3533	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3318	}	3534	}
3319		3535
3320	/* ------------------------------------------------------------------------- */	3536	/* ------------------------------------------------------------------------- */
3321	/*	3537	/*
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	3538	* Respond to a request for our current selection
3331	* EXT: SelectionRequest	3539	* EXT: SelectionRequest
3332	*/	3540	*/
3333	void	3541	void
3334	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3542	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3335	{	3543	{
3336	XSelectionEvent ev;	3544	XSelectionEvent ev;
3337	XTextProperty ct;
3338	XICCEncodingStyle style;
3339	Atom target;
3340		3545
3341	ev.type = SelectionNotify;	3546	ev.type = SelectionNotify;
3342	ev.property = None;	3547	ev.property = None;
3343	ev.display = rq.display;	3548	ev.display = rq.display;
3344	ev.requestor = rq.requestor;	3549	ev.requestor = rq.requestor;
…		…
3346	ev.target = rq.target;	3551	ev.target = rq.target;
3347	ev.time = rq.time;	3552	ev.time = rq.time;
3348		3553
3349	if (rq.target == xa[XA_TARGETS])	3554	if (rq.target == xa[XA_TARGETS])
3350	{	3555	{
3351	Atom32 target_list[6];	3556	Atom target_list[6];
3352	Atom32 *target = target_list;	3557	Atom *target = target_list;
3353		3558
3354	*target++ = (Atom32) xa[XA_TARGETS];	3559	*target++ = xa[XA_TARGETS];
3355	*target++ = (Atom32) xa[XA_TIMESTAMP];	3560	*target++ = xa[XA_TIMESTAMP];
3356	*target++ = (Atom32) XA_STRING;	3561	*target++ = XA_STRING;
3357	*target++ = (Atom32) xa[XA_TEXT];	3562	*target++ = xa[XA_TEXT];
3358	*target++ = (Atom32) xa[XA_COMPOUND_TEXT];	3563	*target++ = xa[XA_COMPOUND_TEXT];
3359	#if X_HAVE_UTF8_STRING	3564	#if X_HAVE_UTF8_STRING
3360	*target++ = (Atom32) xa[XA_UTF8_STRING];	3565	*target++ = xa[XA_UTF8_STRING];
3361	#endif	3566	#endif
3362		3567
3363	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3568	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3364	(8 * sizeof (target_list[0])), PropModeReplace,	3569	32, PropModeReplace,
3365	(unsigned char *)target_list,	3570	(unsigned char *)target_list, target - target_list);
3366	target - target_list);
3367	ev.property = rq.property;	3571	ev.property = rq.property;
3368	}	3572	}
3369	#if TODO // TODO	3573	#if TODO // TODO
3370	else if (rq.target == xa[XA_MULTIPLE])	3574	else if (rq.target == xa[XA_MULTIPLE])
3371	{	3575	{
3372	/* TODO: Handle MULTIPLE */	3576	/* TODO: Handle MULTIPLE */
3373	}	3577	}
3374	#endif	3578	#endif
3375	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3579	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3376	{	3580	{
3377	XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,	3581	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3378	(8 * sizeof (Time)), PropModeReplace,
3379	(unsigned char *)&selection_time, 1);	3582	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3380	ev.property = rq.property;	3583	ev.property = rq.property;
3381	}	3584	}
3382	else if (rq.target == XA_STRING	3585	else if (rq.target == XA_STRING
3383	|| rq.target == xa[XA_TEXT]	3586	|| rq.target == xa[XA_TEXT]
3384	|| rq.target == xa[XA_COMPOUND_TEXT]	3587	|| rq.target == xa[XA_COMPOUND_TEXT]
3385	|| rq.target == xa[XA_UTF8_STRING]	3588	|| rq.target == xa[XA_UTF8_STRING]
3386	)	3589	)
3387	{	3590	{
		3591	XTextProperty ct;
		3592	Atom target = rq.target;
3388	short freect = 0;	3593	short freect = 0;
3389	int selectlen;	3594	int selectlen;
3390	wchar_t *cl;	3595	wchar_t *cl;
3391		3596	enum {
3392	target = rq.target;	3597	enc_string = XStringStyle,
		3598	enc_text = XStdICCTextStyle,
		3599	enc_compound_text = XCompoundTextStyle,
		3600	#ifdef X_HAVE_UTF8_STRING
		3601	enc_utf8 = XUTF8StringStyle,
		3602	#else
		3603	enc_utf8 = -1,
		3604	#endif
		3605	} style;
3393		3606
3394	if (target == XA_STRING)	3607	if (target == XA_STRING)
3395	// we actually don't do XA_STRING, but who cares, as i18n clients	3608	// we actually don't do XA_STRING, but who cares, as i18n clients
3396	// will ask for another format anyways.	3609	// will ask for another format anyways.
3397	style = XStringStyle;	3610	style = enc_string;
3398	else if (target == xa[XA_TEXT])	3611	else if (target == xa[XA_TEXT])
3399	style = XStdICCTextStyle;	3612	style = enc_text;
3400	else if (target == xa[XA_COMPOUND_TEXT])	3613	else if (target == xa[XA_COMPOUND_TEXT])
3401	style = XCompoundTextStyle;	3614	style = enc_compound_text;
3402	#if X_HAVE_UTF8_STRING	3615	#if ENABLE_FRILLS
3403	else if (target == xa[XA_UTF8_STRING])	3616	else if (target == xa[XA_UTF8_STRING])
3404	style = XUTF8StringStyle;	3617	style = enc_utf8;
3405	#endif	3618	#endif
3406	else	3619	else
3407	{	3620	{
3408	target = xa[XA_COMPOUND_TEXT];	3621	target = xa[XA_COMPOUND_TEXT];
3409	style = XCompoundTextStyle;	3622	style = enc_compound_text;
3410	}	3623	}
3411		3624
3412	if (selection.text)	3625	if (selection.text)
3413	{	3626	{
3414	cl = selection.text;	3627	cl = selection.text;
…		…
3418	{	3631	{
3419	cl = L"";	3632	cl = L"";
3420	selectlen = 0;	3633	selectlen = 0;
3421	}	3634	}
3422		3635
3423	// Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it	3636	#if ENABLE_FRILLS
3424	// manually for XUTF8StringStyle.	3637	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		3638	// so recode it manually
		3639	if (style == enc_utf8)
		3640	{
		3641	freect = 1;
		3642	ct.encoding = target;
		3643	ct.format = 8;
		3644	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
		3645	ct.nitems = strlen ((char *)ct.value);
		3646	}
		3647	else
		3648	#endif
3425	if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)	3649	if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426	freect = 1;	3650	freect = 1;
3427	else	3651	else
3428	{	3652	{
3429	/* if we failed to convert then send it raw */	3653	/* if we failed to convert then send it raw */
3430	ct.value = (unsigned char *)cl;	3654	ct.value = (unsigned char *)cl;
3431	ct.nitems = selectlen;	3655	ct.nitems = selectlen;
		3656	ct.encoding = target;
3432	}	3657	}
3433		3658
3434	XChangeProperty (display->display, rq.requestor, rq.property,	3659	XChangeProperty (display->display, rq.requestor, rq.property,
3435	target, 8, PropModeReplace,	3660	ct.encoding, 8, PropModeReplace,
3436	ct.value, (int)ct.nitems);	3661	ct.value, (int)ct.nitems);
3437	ev.property = rq.property;	3662	ev.property = rq.property;
3438		3663
3439	if (freect)	3664	if (freect)
3440	XFree (ct.value);	3665	XFree (ct.value);
…		…
3507	{	3732	{
3508	text_t *tp = ov_text[y] = new text_t[w];	3733	text_t *tp = ov_text[y] = new text_t[w];
3509	rend_t *rp = ov_rend[y] = new rend_t[w];	3734	rend_t *rp = ov_rend[y] = new rend_t[w];
3510		3735
3511	text_t t0, t1, t2;	3736	text_t t0, t1, t2;
3512	rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);	3737	rend_t r = OVERLAY_RSTYLE;
3513		3738
3514	if (y == 0)	3739	if (y == 0)
3515	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;	3740	t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516	else if (y < h - 1)	3741	else if (y < h - 1)
3517	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;	3742	t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
…		…
3551	}	3776	}
3552		3777
3553	void	3778	void
3554	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3779	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555	{	3780	{
3556	if (!ov_text || x >= ov_w - 2 || y >= ov_h)	3781	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3557	return;	3782	return;
3558		3783
3559	x++, y++;	3784	x++, y++;
3560		3785
3561	ov_text[y][x] = text;	3786	ov_text[y][x] = text;
…		…
3587	rend_t *r2 = screen.rend[y + row_offset] + ov_x;	3812	rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588		3813
3589	for (int x = ov_w; x--; )	3814	for (int x = ov_w; x--; )
3590	{	3815	{
3591	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3816	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));	3817	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3593	}	3818	}
3594	}	3819	}
3595	}	3820	}
3596		3821
3597	#endif	3822	#endif

Diff Legend

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