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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.139 by root, Sun Nov 21 18:51:13 2004 UTC vs.
Revision 1.163 by root, Sat Jun 18 09:02:37 2005 UTC

…		…
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29		29
30	#include <X11/Xmd.h> /* get the typedef for CARD32 */	30	#include <X11/Xmd.h> /* get the typedef for CARD32 */
31		31
32	#include <inttypes.h>	32	#include <inttypes.h>
33	#include <wchar.h>
34		33
35	#include "salloc.C" // HACK, should be a seperate compile!	34	#include "salloc.C" // HACK, should be a seperate compile!
36		35
37	inline void fill_text (text_t *start, text_t value, int len)	36	inline void fill_text (text_t *start, text_t value, int len)
38	{	37	{
39	while (len--)	38	while (len--)
40	*start++ = value;	39	*start++ = value;
41	}	40	}
42		41
43	/* ------------------------------------------------------------------------- */	42	/* ------------------------------------------------------------------------- */
44	#define PROP_SIZE 16384	43	#define PROP_SIZE 256*1024
		44	#define PASTE_SIZE 32768
45	#define TABSIZE 8 /* default tab size */	45	#define TABSIZE 8 /* default tab size */
46		46
47	/* ------------------------------------------------------------------------- *	47	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	49	* ------------------------------------------------------------------------- */
…		…
202	/*	202	/*
203	* first time called so just malloc everything: don't rely on realloc	203	* first time called so just malloc everything: don't rely on realloc
204	* Note: this is still needed so that all the scrollback lines are NULL	204	* Note: this is still needed so that all the scrollback lines are NULL
205	*/	205	*/
206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
210		210
211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));	212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213		213
214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
218		218
219	for (p = 0; p < nrow; p++)	219	for (p = 0; p < nrow; p++)
220	{	220	{
221	q = p + TermWin.saveLines;	221	q = p + TermWin.saveLines;
222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
…		…
293	ralloc->free (drawn_rend[p]);	293	ralloc->free (drawn_rend[p]);
294	}	294	}
295		295
296	/* we have fewer rows so fix up cursor position */	296	/* we have fewer rows so fix up cursor position */
297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	297	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298	MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299		298
300	scr_reset_realloc (); /* realloc _last_ */	299	scr_reset_realloc (); /* realloc _last_ */
301	}	300	}
302	else if (nrow > prev_nrow)	301	else if (nrow > prev_nrow)
303	{	302	{
…		…
334	scr_scroll_text (0, (int)nrow - 1, -k, 1);	333	scr_scroll_text (0, (int)nrow - 1, -k, 1);
335	screen.cur.row += k;	334	screen.cur.row += k;
336	screen.s_cur.row += k;	335	screen.s_cur.row += k;
337	TermWin.nscrolled -= k;	336	TermWin.nscrolled -= k;
338	}	337	}
		338
339	#ifdef DEBUG_STRICT	339	#ifdef DEBUG_STRICT
340	assert (screen.cur.row < TermWin.nrow);	340	assert (screen.cur.row < TermWin.nrow);
341	assert (swap.cur.row < TermWin.nrow);
342	#else /* drive with your eyes closed */	341	#else /* drive with your eyes closed */
343
344	MIN_IT (screen.cur.row, nrow - 1);	342	MIN_IT (screen.cur.row, nrow - 1);
345	MIN_IT (swap.cur.row, nrow - 1);
346	#endif	343	#endif
347	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	344	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348	}	345	}
349		346
350	/* resize columns */	347	/* resize columns */
…		…
393	}	390	}
394		391
395	}	392	}
396		393
397	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	394	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398	MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399		395
400	delete talloc; talloc = ta;	396	delete talloc; talloc = ta;
401	delete ralloc; ralloc = ra;	397	delete ralloc; ralloc = ra;
402	}	398	}
403		399
…		…
565	if (current_screen == scrn)	561	if (current_screen == scrn)
566	return scrn;	562	return scrn;
567		563
568	selection_check (2); /* check for boundary cross */	564	selection_check (2); /* check for boundary cross */
569		565
570	SWAP_IT (current_screen, scrn, int);	566	i = current_screen; current_screen = scrn; scrn = i;
571		567
572	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	568	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
573	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	569	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
574	# ifdef DEBUG_STRICT
575	assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
576	assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
577	# else /* drive with your eyes closed */
578	MAX_IT (screen.cur.row, 0);	570	MAX_IT (screen.cur.row, 0);
579	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	571	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
580	MAX_IT (screen.cur.col, 0);	572	MAX_IT (screen.cur.col, 0);
581	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);	573	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
582	# endif
583		574
584	#if NSCREENS	575	#if NSCREENS
585	if (options & Opt_secondaryScreen)	576	if (options & Opt_secondaryScreen)
586	{	577	{
587	num_scr = 0;	578	num_scr = 0;
…		…
600	swap.flags \|= Screen_VisibleCursor;	591	swap.flags \|= Screen_VisibleCursor;
601	}	592	}
602	else	593	else
603	#endif	594	#endif
604	if (options & Opt_secondaryScroll)	595	if (options & Opt_secondaryScroll)
605	//if (current_screen == PRIMARY)
606	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);	596	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607		597
608	return scrn;	598	return scrn;
609	}	599	}
610		600
611	// clear WrapNext indicator, solidifying position on next line	601	// clear WrapNext indicator, solidifying position on next line
…		…
709	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	699	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
710	}	700	}
711	else if (j >= row1 && j <= row2)	701	else if (j >= row1 && j <= row2)
712	{	702	{
713	/* move selected region too */	703	/* move selected region too */
714	selection.beg.row -= count;	704	selection.beg.row -= count;
715	selection.end.row -= count;	705	selection.end.row -= count;
716	selection.mark.row -= count;	706	selection.mark.row -= count;
717	}	707	}
718	}	708	}
719		709
720	selection_check (0); /* _after_ TermWin.nscrolled update */	710	selection_check (0); /* _after_ TermWin.nscrolled update */
…		…
728	i = row2 - row1 + 1;	718	i = row2 - row1 + 1;
729	MIN_IT (count, i);	719	MIN_IT (count, i);
730		720
731	if (j > 0)	721	if (j > 0)
732	{	722	{
733	/* A: scroll up */	723	/* scroll up */
734		724
735	/* A1: Copy lines that will get clobbered by the rotation */	725	/* Copy lines that will get clobbered by the rotation */
736	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
737	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));	727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
738		728
739	/* A2: Rotate lines */	729	/* Rotate lines */
740	i = row2 - row1 - count + 1;	730	i = row2 - row1 - count + 1;
741	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));	731	memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
742	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));	732	memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
743	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));	733	memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
744		734
745	j = row2 - count + 1, i = count;	735	j = row2 - count + 1, i = count;
746	}	736	}
747	else /* if (j < 0) */	737	else /* if (j < 0) */
748	{	738	{
749	/* B: scroll down */	739	/* scroll down */
750		740
751	/* B1: Copy lines that will get clobbered by the rotation */	741	/* Copy lines that will get clobbered by the rotation */
752	for (i = 0, j = row2; i < count; i++, j--)	742	for (i = 0, j = row2; i < count; i++, j--)
753	{	743	{
754	buf_text[i] = screen.text[j];	744	buf_text[i] = screen.text[j];
755	buf_rend[i] = screen.rend[j];	745	buf_rend[i] = screen.rend[j];
756	}	746	}
757		747
758	/* B2: Rotate lines */	748	/* Rotate lines */
759	for (j = row2, i = j - count; i >= row1; i--, j--)	749	for (j = row2, i = j - count; i >= row1; i--, j--)
760	{	750	{
761	screen.tlen[j] = screen.tlen[i];	751	screen.tlen[j] = screen.tlen[i];
762	screen.text[j] = screen.text[i];	752	screen.text[j] = screen.text[i];
763	screen.rend[j] = screen.rend[i];	753	screen.rend[j] = screen.rend[i];
…		…
765		755
766	j = row1, i = count;	756	j = row1, i = count;
767	count = -count;	757	count = -count;
768	}	758	}
769		759
770	/* C: Resurrect lines */	760	/* Resurrect lines */
771	memset (screen.tlen + j, 0, i * sizeof (int16_t));	761	memset (screen.tlen + j, 0, i * sizeof (int16_t));
772	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
773	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
774	if (!spec) /* line length may not equal TermWin.ncol */	764	if (!spec) /* line length may not equal TermWin.ncol */
775	for (; i--; j++)	765	for (; i--; j++)
…		…
883		873
884	stp = screen.text[row]; /* _must_ refresh */	874	stp = screen.text[row]; /* _must_ refresh */
885	srp = screen.rend[row]; /* _must_ refresh */	875	srp = screen.rend[row]; /* _must_ refresh */
886	}	876	}
887		877
888	if (screen.flags & Screen_Insert)
889	scr_insdel_chars (1, INSERT);
890
891	// rely on wcwidth to tell us the character width, at least for non-latin1	878	// rely on wcwidth to tell us the character width, at least for non-latin1
892	// do wcwidth before further replacements, as wcwidth says that line-drawing	879	// do wcwidth before further replacements, as wcwidth says that line-drawing
893	// characters have width -1 (DOH!) on GNU/Linux sometimes.	880	// characters have width -1 (DOH!) on GNU/Linux sometimes.
894	int width = c < 0x100 ? 1 : wcwidth (c);	881	int width = c < 0x100 ? 1 : wcwidth (c);
895		882
896	if (charsets[screen.charset] == '0') // DEC SPECIAL	883	if (charsets[screen.charset] == '0') // DEC SPECIAL
897	{	884	{
898	// vt100 special graphics and line drawing	885	// vt100 special graphics and line drawing
899	// 5f-7e standard vt100	886	// 5f-7e standard vt100
900	// 40-5e rxvt extension for extra curses acs chars	887	// 40-5e rxvt extension for extra curses acs chars
901	static uint16_t vt100_0[63] = { // 5f .. 7e	888	static uint16_t vt100_0[63] = { // 40 .. 7e
902	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!	889	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
903	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	890	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
904	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	891	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
905	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	892	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
906	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	893	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
…		…
914	c = vt100_0[c - 0x40];	901	c = vt100_0[c - 0x40];
915	width = 1;	902	width = 1;
916	}	903	}
917	}	904	}
918		905
		906	if (screen.flags & Screen_Insert)
		907	scr_insdel_chars (width, INSERT);
		908
919	if (width != 0)	909	if (width != 0)
920	{	910	{
921	// some utf-8 decoders decode surrogate characters.	911	// some utf-8 decoders decode surrogate characters.
922	if (0xd800 <= c && c <= 0xdfff)	912	if (0xd800 <= c && c <= 0xdfff)
923	c = 0xfffd;	913	c = 0xfffd;
…		…
973	c = NOCHAR;	963	c = NOCHAR;
974	}	964	}
975	while (--width > 0);	965	while (--width > 0);
976		966
977	// pad with spaces when overwriting wide character with smaller one	967	// pad with spaces when overwriting wide character with smaller one
		968	if (!width)
978	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)	969	for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
979	{	970	{
980	stp[c] = ' ';	971	stp[c] = ' ';
981	srp[c] = rend;	972	srp[c] = rend;
982	}	973	}
983	}	974	}
984	else if (width == 0)	975	else if (width == 0)
985	{	976	{
986	#if ENABLE_COMBINING	977	#if ENABLE_COMBINING
987	// handle combining characters	978	// handle combining characters
…		…
1100	if (count)	1091	if (count)
1101	x = TermWin.ncol - 1;	1092	x = TermWin.ncol - 1;
1102		1093
1103	// store horizontal tab commands as characters inside the text	1094	// store horizontal tab commands as characters inside the text
1104	// buffer so they can be selected and pasted.	1095	// buffer so they can be selected and pasted.
1105	if (ht)	1096	if (ht && options & Opt_pastableTabs)
1106	{	1097	{
1107	base_rend = SET_FONT (base_rend, 0);	1098	base_rend = SET_FONT (base_rend, 0);
1108		1099
1109	if (screen.tlen[row] != -1) /* XXX: think about this */	1100	if (screen.tlen[row] != -1) /* XXX: think about this */
1110	MAX_IT (screen.tlen[row], x);	1101	MAX_IT (screen.tlen[row], x);
…		…
1170	*/	1161	*/
1171	#if ENABLE_FRILLS	1162	#if ENABLE_FRILLS
1172	void	1163	void
1173	rxvt_term::scr_forwardindex ()	1164	rxvt_term::scr_forwardindex ()
1174	{	1165	{
1175	int row;	1166	int row;
1176		1167
1177	if (screen.cur.col < TermWin.ncol - 1)	1168	if (screen.cur.col < TermWin.ncol - 1)
1178	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1169	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1179	else	1170	else
1180	{	1171	{
…		…
1399	screen.tlen[row + row_offset] = 0;	1390	screen.tlen[row + row_offset] = 0;
1400	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1391	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1401	}	1392	}
1402	}	1393	}
1403		1394
		1395	#if ENABLE_FRILLS
		1396	void
		1397	rxvt_term::scr_erase_savelines ()
		1398	{
		1399	want_refresh = 1;
		1400	ZERO_SCROLLBACK ();
		1401
		1402	TermWin.nscrolled = 0;
		1403	}
		1404	#endif
		1405
1404	/* ------------------------------------------------------------------------- */	1406	/* ------------------------------------------------------------------------- */
1405	/*	1407	/*
1406	* Fill the screen with `E's	1408	* Fill the screen with `E's
1407	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1409	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1408	*/	1410	*/
1409	void	1411	void
1410	rxvt_term::scr_E ()	1412	rxvt_term::scr_E ()
1411	{	1413	{
1412	int i, j, k;	1414	int i, j, k;
1413	rend_t *r1, fs;	1415	rend_t *r1, fs;
1414		1416
1415	want_refresh = 1;	1417	want_refresh = 1;
1416	ZERO_SCROLLBACK ();	1418	ZERO_SCROLLBACK ();
1417		1419
1418	num_scr_allow = 0;	1420	num_scr_allow = 0;
…		…
1901	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1903	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902	{	1904	{
1903	int n;	1905	int n;
1904	unsigned int oldviewstart;	1906	unsigned int oldviewstart;
1905		1907
1906	#ifdef DEBUG_STRICT
1907	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908	#endif
1909	oldviewstart = TermWin.view_start;	1908	oldviewstart = TermWin.view_start;
		1909
1910	if (direction == UP)	1910	if (direction == UP)
1911	{	1911	{
1912	n = TermWin.view_start + nlines;	1912	n = TermWin.view_start + nlines;
1913	TermWin.view_start = min (n, TermWin.nscrolled);	1913	TermWin.view_start = min (n, TermWin.nscrolled);
1914	}	1914	}
1915	else	1915	else
1916	{	1916	{
1917	n = TermWin.view_start - nlines;	1917	n = TermWin.view_start - nlines;
1918	TermWin.view_start = max (n, 0);	1918	TermWin.view_start = max (n, 0);
1919	}	1919	}
		1920
1920	return scr_changeview (oldviewstart);	1921	return scr_changeview (oldviewstart);
1921	}	1922	}
1922		1923
1923	int	1924	int
1924	rxvt_term::scr_changeview (unsigned int oldviewstart)	1925	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
2012	/*	2013	/*
2013	* Refresh the screen	2014	* Refresh the screen
2014	* drawn_text/drawn_rend contain the screen information before the update.	2015	* drawn_text/drawn_rend contain the screen information before the update.
2015	* screen.text/screen.rend contain what the screen will change to.	2016	* screen.text/screen.rend contain what the screen will change to.
2016	*/	2017	*/
2017
2018	#define FONT_WIDTH(X, Y) \
2019	(X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2020	#define FONT_RBEAR(X, Y) \
2021	(X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2022	#define FONT_LBEAR(X, Y) \
2023	(X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2024	#define IS_FONT_CHAR(X, Y) \
2025	((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2026
2027	void	2018	void
2028	rxvt_term::scr_refresh (unsigned char refresh_type)	2019	rxvt_term::scr_refresh (unsigned char refresh_type)
2029	{	2020	{
2030	unsigned char must_clear, /* use draw_string not draw_image_string */	2021	unsigned char must_clear, /* use draw_string not draw_image_string */
2031	showcursor; /* show the cursor */	2022	showcursor; /* show the cursor */
…		…
2050	refresh_count = 0;	2041	refresh_count = 0;
2051		2042
2052	row_offset = TermWin.saveLines - TermWin.view_start;	2043	row_offset = TermWin.saveLines - TermWin.view_start;
2053		2044
2054	#if XPM_BACKGROUND	2045	#if XPM_BACKGROUND
2055	must_clear \|= (bgPixmap.pixmap != None);	2046	must_clear \|= bgPixmap.pixmap != None;
2056	#endif	2047	#endif
2057	#if TRANSPARENT	2048	#if TRANSPARENT
2058	must_clear \|= ((options & Opt_transparent) && am_transparent);	2049	must_clear \|= (options & Opt_transparent) && am_transparent;
2059	#endif	2050	#endif
2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2051	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061		2052
2062	/*	2053	/*
2063	* B: reverse any characters which are selected	2054	* B: reverse any characters which are selected
…		…
2087		2078
2088	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2079	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2089		2080
2090	if (showcursor && TermWin.focus)	2081	if (showcursor && TermWin.focus)
2091	{	2082	{
		2083	if (options & Opt_cursorUnderline)
		2084	*crp ^= RS_Uline;
		2085	else
		2086	{
2092	*crp ^= RS_RVid;	2087	*crp ^= RS_RVid;
		2088
2093	#ifndef NO_CURSORCOLOR	2089	#ifndef NO_CURSORCOLOR
2094	cc1 = *crp & (RS_fgMask \| RS_bgMask);	2090	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2095	if (ISSET_PIXCOLOR (Color_cursor))	2091	if (ISSET_PIXCOLOR (Color_cursor))
2096	ccol1 = Color_cursor;	2092	ccol1 = Color_cursor;
2097	else	2093	else
2098	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2094	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2099	ccol1 = GET_FGCOLOR (rstyle);	2095	ccol1 = GET_FGCOLOR (rstyle);
2100	#else	2096	#else
2101	ccol1 = Color_fg;	2097	ccol1 = Color_fg;
2102	#endif	2098	#endif
2103	if (ISSET_PIXCOLOR (Color_cursor2))	2099	if (ISSET_PIXCOLOR (Color_cursor2))
2104	ccol2 = Color_cursor2;	2100	ccol2 = Color_cursor2;
2105	else	2101	else
2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2102	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2107	ccol2 = GET_BGCOLOR (rstyle);	2103	ccol2 = GET_BGCOLOR (rstyle);
2108	#else	2104	#else
2109	ccol2 = Color_bg;	2105	ccol2 = Color_bg;
2110	#endif	2106	#endif
2111	crp = SET_FGCOLOR (crp, ccol1);	2107	crp = SET_FGCOLOR (crp, ccol1);
2112	crp = SET_BGCOLOR (crp, ccol2);	2108	crp = SET_BGCOLOR (crp, ccol2);
2113	#endif	2109	#endif
		2110	}
2114	}	2111	}
2115	}	2112	}
2116		2113
2117	/* make sure no outline cursor is left around */	2114	/* make sure no outline cursor is left around */
2118	setoldcursor = 0;	2115	setoldcursor = 0;
…		…
2244	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))	2241	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2245	continue;	2242	continue;
2246		2243
2247	// redraw one or more characters	2244	// redraw one or more characters
2248		2245
2249	// seek to the beginning if wide characters	2246	// seek to the beginning of wide characters
2250	while (stp[col] == NOCHAR && col > 0)	2247	while (stp[col] == NOCHAR && col > 0)
2251	--col;	2248	--col;
2252		2249
2253	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2250	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2254	text_t *text = stp + col;	2251	text_t *text = stp + col;
…		…
2398	}	2395	}
2399	else	2396	else
2400	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2397	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401		2398
2402	if (rend & RS_Uline && font->descent > 1 && fore != back)	2399	if (rend & RS_Uline && font->descent > 1 && fore != back)
		2400	{
		2401	#if ENABLE_FRILLS
		2402	if (ISSET_PIXCOLOR (Color_underline))
		2403	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
		2404	else
		2405	#endif
		2406	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
		2407
2403	XDrawLine (display->display, drawBuffer, TermWin.gc,	2408	XDrawLine (display->display, drawBuffer, TermWin.gc,
2404	xpixel, ypixel + font->ascent + 1,	2409	xpixel, ypixel + font->ascent + 1,
2405	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
		2411	}
2406	} /* for (col....) */	2412	} /* for (col....) */
2407	} /* for (row....) */	2413	} /* for (row....) */
2408		2414
2409	#if ENABLE_OVERLAY	2415	#if ENABLE_OVERLAY
2410	scr_swap_overlay ();	2416	scr_swap_overlay ();
…		…
2415	*/	2421	*/
2416	if (showcursor)	2422	if (showcursor)
2417	{	2423	{
2418	if (TermWin.focus)	2424	if (TermWin.focus)
2419	{	2425	{
		2426	if (options & Opt_cursorUnderline)
		2427	*crp ^= RS_Uline;
		2428	else
		2429	{
2420	*crp ^= RS_RVid;	2430	*crp ^= RS_RVid;
2421	#ifndef NO_CURSORCOLOR	2431	#ifndef NO_CURSORCOLOR
2422	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2432	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2423	#endif	2433	#endif
		2434	}
2424	}	2435	}
2425	else if (oldcursor.row >= 0)	2436	else if (oldcursor.row >= 0)
2426	{	2437	{
2427	#ifndef NO_CURSORCOLOR	2438	#ifndef NO_CURSORCOLOR
2428	if (ISSET_PIXCOLOR (Color_cursor))	2439	if (ISSET_PIXCOLOR (Color_cursor))
…		…
2652	/* ------------------------------------------------------------------------- */	2663	/* ------------------------------------------------------------------------- */
2653	/*	2664	/*
2654	* Paste a selection direct to the command fd	2665	* Paste a selection direct to the command fd
2655	*/	2666	*/
2656	void	2667	void
2657	rxvt_term::paste (const unsigned char *data, unsigned int len)	2668	rxvt_term::paste (unsigned char *data, unsigned int len)
2658	{	2669	{
2659	unsigned int i, j, n;
2660	unsigned char ds = (unsigned char )rxvt_malloc (PROP_SIZE);
2661
2662	/* convert normal newline chars into common keyboard Return key sequence */	2670	/* convert normal newline chars into common keyboard Return key sequence */
2663	for (i = 0; i < len; i += PROP_SIZE)	2671	for (unsigned int i = 0; i < len; i++)
2664	{
2665	n = min (len - i, PROP_SIZE);
2666	memcpy (ds, data + i, n);
2667
2668	for (j = 0; j < n; j++)
2669	if (ds[j] == C0_LF)	2672	if (data[i] == C0_LF)
2670	ds[j] = C0_CR;	2673	data[i] = C0_CR;
2671		2674
2672	tt_write (ds, (int)n);	2675	tt_write (data, len);
2673	}
2674
2675	free (ds);
2676	}	2676	}
2677		2677
2678	/* ------------------------------------------------------------------------- */	2678	/* ------------------------------------------------------------------------- */
2679	/*	2679	/*
2680	* Respond to a notification that a primary selection has been sent	2680	* Respond to a notification that a primary selection has been sent
2681	* EXT: SelectionNotify	2681	* EXT: SelectionNotify
2682	*/	2682	*/
2683	int	2683	void
2684	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2684	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685	{	2685	{
2686	long nread = 0;
2687	unsigned long bytes_after;
2688	XTextProperty ct;
2689
2690	if (prop == None) /* check for failed XConvertSelection */	2686	if (prop == None) /* check for failed XConvertSelection */
2691	{	2687	{
2692	if ((selection_type & Sel_CompoundText))	2688	if ((selection_type & Sel_CompoundText))
2693	{	2689	{
2694	int selnum = selection_type & Sel_whereMask;	2690	int selnum = selection_type & Sel_whereMask;
…		…
2707	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2703	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708	else	2704	else
2709	selection_type = 0;	2705	selection_type = 0;
2710	}	2706	}
2711		2707
2712	return 0;	2708	return;
2713	}
2714
2715	for (;;)
2716	{	2709	}
		2710
		2711	unsigned long bytes_after;
		2712	XTextProperty ct;
		2713
		2714	if (XGetWindowProperty (display->display, win, prop,
		2715	0, PROP_SIZE / 4,
		2716	delete_prop, AnyPropertyType,
		2717	&ct.encoding, &ct.format,
		2718	&ct.nitems, &bytes_after,
		2719	&ct.value) != Success)
		2720	{
		2721	ct.value = 0;
		2722	goto bailout;
		2723	}
		2724
		2725	if (ct.encoding == None)
		2726	goto bailout;
		2727
		2728	if (bytes_after)
		2729	{
		2730	// fetch and append remaining data
		2731	XTextProperty ct2;
		2732
2717	if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),	2733	if (XGetWindowProperty (display->display, win, prop,
2718	(long) (PROP_SIZE / 4), delete_prop,	2734	ct.nitems / 4, (bytes_after + 3) / 4,
		2735	delete_prop, AnyPropertyType,
2719	AnyPropertyType, &ct.encoding, &ct.format,	2736	&ct2.encoding, &ct2.format,
2720	&ct.nitems, &bytes_after,	2737	&ct2.nitems, &bytes_after,
2721	&ct.value) != Success)	2738	&ct2.value) != Success)
2722	break;	2739	goto bailout;
2723		2740
2724	if (ct.encoding == 0)	2741	// realloc should be compatible to XFree, here, and elsewhere, too
2725	break;	2742	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
		2743	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
		2744	ct.nitems += ct2.nitems;
2726		2745
		2746	XFree (ct2.value);
		2747	}
		2748
		2749	if (ct.value == 0)
		2750	goto bailout;
		2751
2727	if (ct.encoding == xa[XA_INCR])	2752	if (ct.encoding == xa[XA_INCR])
2728	{	2753	{
2729	// INCR selection, start handshake	2754	// INCR selection, start handshake
		2755	if (!delete_prop)
2730	XDeleteProperty (display->display, win, prop);	2756	XDeleteProperty (display->display, win, prop);
		2757
2731	selection_wait = Sel_incr;	2758	selection_wait = Sel_incr;
		2759	incr_buf_fill = 0;
2732	incr_ev.start (NOW + 10);	2760	incr_ev.start (NOW + 10);
2733	break;
2734	}
2735		2761
2736	if (ct.value == NULL)	2762	goto bailout;
2737	continue;	2763	}
2738		2764
2739	if (ct.nitems == 0)	2765	if (ct.nitems == 0)
		2766	{
		2767	if (selection_wait == Sel_incr)
		2768	{
		2769	XFree (ct.value);
		2770
		2771	// finally complete, now paste the whole thing
		2772	selection_wait = Sel_normal;
		2773	ct.value = (unsigned char *)incr_buf;
		2774	ct.nitems = incr_buf_fill;
		2775	incr_buf = 0;
		2776	incr_buf_size = 0;
		2777	incr_ev.stop ();
2740	{	2778	}
		2779	else
		2780	{
2741	if (selection_wait == Sel_normal && nread == 0	2781	if (selection_wait == Sel_normal
2742	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion	2782	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion
2743	{	2783	{
2744	/*	2784	/*
2745	* pass through again trying CUT_BUFFER0 if we've come from	2785	* pass through again trying CUT_BUFFER0 if we've come from
2746	* XConvertSelection () but nothing was presented	2786	* XConvertSelection () but nothing was presented
2747	*/	2787	*/
2748	selection_paste (display->root, XA_CUT_BUFFER0, False);	2788	selection_paste (display->root, XA_CUT_BUFFER0, False);
2749	}	2789	}
2750		2790
2751	nread = -1; /* discount any previous stuff */	2791	goto bailout;
2752	break;	2792	}
		2793	}
		2794	else if (selection_wait == Sel_incr)
		2795	{
		2796	incr_ev.start (NOW + 10);
		2797
		2798	while (incr_buf_fill + ct.nitems > incr_buf_size)
2753	}	2799	{
		2800	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
		2801	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
		2802	}
2754		2803
		2804	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755	nread += ct.nitems;	2805	incr_buf_fill += ct.nitems;
2756		2806
		2807	goto bailout;
		2808	}
		2809
2757	char **cl;	2810	char **cl;
2758	int cr;	2811	int cr;
		2812
		2813	#if ENABLE_FRILLS
		2814	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		2815	// so recode it manually
		2816	if (ct.encoding == xa[XA_UTF8_STRING])
		2817	{
		2818	wchar_t w = rxvt_utf8towcs ((const char )ct.value, ct.nitems);
		2819	char *s = rxvt_wcstombs (w);
		2820	free (w);
		2821	// TODO: strlen == only the first element will be converted. well...
		2822	paste ((unsigned char *)s, strlen (s));
		2823	free (s);
		2824	}
		2825	else
		2826	#endif
2759	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)	2827	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760	{	2828	&& cl)
		2829	{
2761	for (int i = 0; i < cr; i++)	2830	for (int i = 0; i < cr; i++)
2762	paste ((unsigned char *)cl[i], strlen (cl[i]));	2831	paste ((unsigned char *)cl[i], strlen (cl[i]));
2763		2832
2764	XFreeStringList (cl);	2833	XFreeStringList (cl);
2765	}	2834	}
2766	else	2835	else
2767	paste (ct.value, ct.nitems);	2836	paste (ct.value, ct.nitems); // paste raw
2768		2837
2769	if (bytes_after == 0)	2838	bailout:
2770	break;
2771
2772	XFree (ct.value);
2773	}
2774
2775	if (ct.value)
2776	XFree (ct.value);	2839	XFree (ct.value);
2777		2840
2778	if (selection_wait == Sel_normal)	2841	if (selection_wait == Sel_normal)
2779	selection_wait = Sel_none;	2842	selection_wait = Sel_none;
2780
2781	return (int)nread;
2782	}	2843	}
2783		2844
2784	void	2845	void
2785	rxvt_term::incr_cb (time_watcher &w)	2846	rxvt_term::incr_cb (time_watcher &w)
2786	{	2847	{
2787	selection_wait = Sel_none;	2848	selection_wait = Sel_none;
2788		2849
		2850	incr_buf_size = 0;
		2851	free (incr_buf);
		2852
2789	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2853	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790	}	2854	}
2791		2855
2792	/*
2793	* INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794	*/
2795	void	2856	void
2796	rxvt_term::selection_property (Window win, Atom prop)	2857	rxvt_term::selection_property (Window win, Atom prop)
2797	{	2858	{
2798	if (prop == None \|\| selection_wait != Sel_incr)	2859	if (prop == None \|\| selection_wait != Sel_incr)
2799	return;	2860	return;
2800		2861
2801	if (selection_paste (win, prop, 1) > 0)	2862	selection_paste (win, prop, true);
2802	incr_ev.start (NOW + 10);
2803	else
2804	{
2805	selection_wait = Sel_none;
2806	incr_ev.stop ();
2807	}
2808	}	2863	}
2809		2864
2810	/* ------------------------------------------------------------------------- */	2865	/* ------------------------------------------------------------------------- */
2811	/*	2866	/*
2812	* Request the current selection:	2867	* Request the current selection:
…		…
2846	#else	2901	#else
2847	selection_type = Sel_CompoundText;	2902	selection_type = Sel_CompoundText;
2848	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2903	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849	return;	2904	return;
2850	#endif	2905	#endif
2851
2852	}	2906	}
2853	}	2907	}
2854		2908
2855	selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */	2909	selection_wait = Sel_none; /* don't loop in selection_paste () */
2856	selection_paste (display->root, XA_CUT_BUFFER0, False);	2910	selection_paste (display->root, XA_CUT_BUFFER0, false);
2857	}	2911	}
2858		2912
2859	int	2913	int
2860	rxvt_term::selection_request_other (Atom target, int selnum)	2914	rxvt_term::selection_request_other (Atom target, int selnum)
2861	{	2915	{
2862	Atom sel;	2916	Atom sel;
2863	#ifdef DEBUG_SELECT
2864	char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2865	#endif
2866		2917
2867	selection_type \|= selnum;	2918	selection_type \|= selnum;
2868		2919
2869	if (selnum == Sel_Primary)	2920	if (selnum == Sel_Primary)
2870	sel = XA_PRIMARY;	2921	sel = XA_PRIMARY;
…		…
3017	#if 0	3068	#if 0
3018	XTextProperty ct;	3069	XTextProperty ct;
3019		3070
3020	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3071	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021	{	3072	{
3022	XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,	3073	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023	PropModeReplace, ct.value, ct.nitems);
3024	XFree (ct.value);	3074	XFree (ct.value);
3025	}	3075	}
3026	#endif	3076	#endif
3027		3077
3028	selection_time = tm;	3078	selection_time = tm;
…		…
3366	selection_delimit_word (DN, &selection.end, &selection.end);	3416	selection_delimit_word (DN, &selection.end, &selection.end);
3367	}	3417	}
3368	else if (selection.clicks == 3)	3418	else if (selection.clicks == 3)
3369	{	3419	{
3370	#if ENABLE_FRILLS	3420	#if ENABLE_FRILLS
3371	if ((options & Opt_tripleclickwords))	3421	if (options & Opt_tripleclickwords)
3372	{	3422	{
3373	int end_row;	3423	int end_row;
3374		3424
3375	selection_delimit_word (UP, &selection.beg, &selection.beg);	3425	selection_delimit_word (UP, &selection.beg, &selection.beg);
3376	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3426	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
…		…
3394	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3444	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395	selection.mark.col++;	3445	selection.mark.col++;
3396		3446
3397	selection.beg.col = 0;	3447	selection.beg.col = 0;
3398	selection.end.col = ncol;	3448	selection.end.col = ncol;
		3449
		3450	// select a complete logical line
		3451	while (selection.beg.row > -TermWin.saveLines
		3452	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3453	selection.beg.row--;
		3454
		3455	while (selection.end.row < TermWin.nrow
		3456	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3457	selection.end.row++;
3399	}	3458	}
3400	}	3459	}
3401		3460
3402	if (button3 && buttonpress)	3461	if (button3 && buttonpress)
3403	{ /* mark may need to be changed */	3462	{ /* mark may need to be changed */
…		…
3483	*/	3542	*/
3484	void	3543	void
3485	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3544	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486	{	3545	{
3487	XSelectionEvent ev;	3546	XSelectionEvent ev;
3488	XTextProperty ct;	3547	dDisp;
3489	XICCEncodingStyle style;
3490	Atom target;
3491		3548
3492	ev.type = SelectionNotify;	3549	ev.type = SelectionNotify;
3493	ev.property = None;	3550	ev.property = None;
3494	ev.display = rq.display;	3551	ev.display = rq.display;
3495	ev.requestor = rq.requestor;	3552	ev.requestor = rq.requestor;
…		…
3509	*target++ = xa[XA_COMPOUND_TEXT];	3566	*target++ = xa[XA_COMPOUND_TEXT];
3510	#if X_HAVE_UTF8_STRING	3567	#if X_HAVE_UTF8_STRING
3511	*target++ = xa[XA_UTF8_STRING];	3568	*target++ = xa[XA_UTF8_STRING];
3512	#endif	3569	#endif
3513		3570
3514	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3571	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515	32, PropModeReplace,	3572	32, PropModeReplace,
3516	(unsigned char *)target_list, target - target_list);	3573	(unsigned char *)target_list, target - target_list);
3517	ev.property = rq.property;	3574	ev.property = rq.property;
3518	}	3575	}
3519	#if TODO // TODO	3576	#if TODO // TODO
…		…
3522	/* TODO: Handle MULTIPLE */	3579	/* TODO: Handle MULTIPLE */
3523	}	3580	}
3524	#endif	3581	#endif
3525	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3582	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526	{	3583	{
3527	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,	3584	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3585	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529	ev.property = rq.property;	3586	ev.property = rq.property;
3530	}	3587	}
3531	else if (rq.target == XA_STRING	3588	else if (rq.target == XA_STRING
3532	\|\| rq.target == xa[XA_TEXT]	3589	\|\| rq.target == xa[XA_TEXT]
3533	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3590	\|\| rq.target == xa[XA_COMPOUND_TEXT]
3534	\|\| rq.target == xa[XA_UTF8_STRING]	3591	\|\| rq.target == xa[XA_UTF8_STRING]
3535	)	3592	)
3536	{	3593	{
		3594	XTextProperty ct;
		3595	Atom target = rq.target;
3537	short freect = 0;	3596	short freect = 0;
3538	int selectlen;	3597	int selectlen;
3539	wchar_t *cl;	3598	wchar_t *cl;
3540		3599	enum {
3541	target = rq.target;	3600	enc_string = XStringStyle,
		3601	enc_text = XStdICCTextStyle,
		3602	enc_compound_text = XCompoundTextStyle,
		3603	#ifdef X_HAVE_UTF8_STRING
		3604	enc_utf8 = XUTF8StringStyle,
		3605	#else
		3606	enc_utf8 = -1,
		3607	#endif
		3608	} style;
3542		3609
3543	if (target == XA_STRING)	3610	if (target == XA_STRING)
3544	// we actually don't do XA_STRING, but who cares, as i18n clients	3611	// we actually don't do XA_STRING, but who cares, as i18n clients
3545	// will ask for another format anyways.	3612	// will ask for another format anyways.
3546	style = XStringStyle;	3613	style = enc_string;
3547	else if (target == xa[XA_TEXT])	3614	else if (target == xa[XA_TEXT])
3548	style = XStdICCTextStyle;	3615	style = enc_text;
3549	else if (target == xa[XA_COMPOUND_TEXT])	3616	else if (target == xa[XA_COMPOUND_TEXT])
3550	style = XCompoundTextStyle;	3617	style = enc_compound_text;
3551	#if X_HAVE_UTF8_STRING	3618	#if ENABLE_FRILLS
3552	else if (target == xa[XA_UTF8_STRING])	3619	else if (target == xa[XA_UTF8_STRING])
3553	style = XUTF8StringStyle;	3620	style = enc_utf8;
3554	#endif	3621	#endif
3555	else	3622	else
3556	{	3623	{
3557	target = xa[XA_COMPOUND_TEXT];	3624	target = xa[XA_COMPOUND_TEXT];
3558	style = XCompoundTextStyle;	3625	style = enc_compound_text;
3559	}	3626	}
3560		3627
3561	if (selection.text)	3628	if (selection.text)
3562	{	3629	{
3563	cl = selection.text;	3630	cl = selection.text;
…		…
3567	{	3634	{
3568	cl = L"";	3635	cl = L"";
3569	selectlen = 0;	3636	selectlen = 0;
3570	}	3637	}
3571		3638
3572	// Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it	3639	#if ENABLE_FRILLS
3573	// manually for XUTF8StringStyle.	3640	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		3641	// so recode it manually
		3642	if (style == enc_utf8)
		3643	{
		3644	freect = 1;
		3645	ct.encoding = target;
		3646	ct.format = 8;
		3647	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
		3648	ct.nitems = strlen ((char *)ct.value);
		3649	}
		3650	else
		3651	#endif
3574	if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)	3652	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575	freect = 1;	3653	freect = 1;
3576	else	3654	else
3577	{	3655	{
3578	/* if we failed to convert then send it raw */	3656	/* if we failed to convert then send it raw */
3579	ct.value = (unsigned char *)cl;	3657	ct.value = (unsigned char *)cl;
3580	ct.nitems = selectlen;	3658	ct.nitems = selectlen;
		3659	ct.encoding = target;
3581	}	3660	}
3582		3661
3583	XChangeProperty (display->display, rq.requestor, rq.property,	3662	XChangeProperty (disp, rq.requestor, rq.property,
3584	target, 8, PropModeReplace,	3663	ct.encoding, 8, PropModeReplace,
3585	ct.value, (int)ct.nitems);	3664	ct.value, (int)ct.nitems);
3586	ev.property = rq.property;	3665	ev.property = rq.property;
3587		3666
3588	if (freect)	3667	if (freect)
3589	XFree (ct.value);	3668	XFree (ct.value);
3590	}	3669	}
3591		3670
3592	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3671	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593	}	3672	}
3594		3673
3595	/* ------------------------------------------------------------------------- *	3674	/* ------------------------------------------------------------------------- *
3596	* MOUSE ROUTINES *	3675	* MOUSE ROUTINES *
3597	* ------------------------------------------------------------------------- */	3676	* ------------------------------------------------------------------------- */
…		…
3717	while (*s)	3796	while (*s)
3718	scr_overlay_set (x++, y, *s++);	3797	scr_overlay_set (x++, y, *s++);
3719	}	3798	}
3720		3799
3721	void	3800	void
		3801	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
		3802	{
		3803	while (*s)
		3804	{
		3805	text_t t = *s++;
		3806	int width = wcwidth (t);
		3807
		3808	while (width--)
		3809	{
		3810	scr_overlay_set (x++, y, t);
		3811	t = NOCHAR;
		3812	}
		3813	}
		3814	}
		3815
		3816	void
3722	rxvt_term::scr_swap_overlay ()	3817	rxvt_term::scr_swap_overlay ()
3723	{	3818	{
3724	if (!ov_text)	3819	if (!ov_text)
3725	return;	3820	return;
3726		3821

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.139 by root, Sun Nov 21 18:51:13 2004 UTC vs. Revision 1.163 by root, Sat Jun 18 09:02:37 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.139 by root, Sun Nov 21 18:51:13 2004 UTC vs.
Revision 1.163 by root, Sat Jun 18 09:02:37 2005 UTC