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

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs. Revision 1.155 by root, Thu Feb 3 07:45:39 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.155 by root, Thu Feb 3 07:45:39 2005 UTC