[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.160 by root, Mon Feb 21 19:30:58 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	for (int i = 0; i < TermWin.saveLines; ++i)
		1403	if (screen.text [i])
		1404	{
		1405	screen.tlen[i] = 0;
		1406	scr_blank_line (screen.text [i], screen.rend [i], (unsigned int)TermWin.ncol, DEFAULT_RSTYLE);
		1407	}
		1408	}
		1409	#endif
		1410
1404	/* ------------------------------------------------------------------------- */	1411	/* ------------------------------------------------------------------------- */
1405	/*	1412	/*
1406	* Fill the screen with `E's	1413	* Fill the screen with `E's
1407	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1414	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1408	*/	1415	*/
1409	void	1416	void
1410	rxvt_term::scr_E ()	1417	rxvt_term::scr_E ()
1411	{	1418	{
1412	int i, j, k;	1419	int i, j, k;
1413	rend_t *r1, fs;	1420	rend_t *r1, fs;
1414		1421
1415	want_refresh = 1;	1422	want_refresh = 1;
1416	ZERO_SCROLLBACK ();	1423	ZERO_SCROLLBACK ();
1417		1424
1418	num_scr_allow = 0;	1425	num_scr_allow = 0;
…		…
1901	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1908	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1902	{	1909	{
1903	int n;	1910	int n;
1904	unsigned int oldviewstart;	1911	unsigned int oldviewstart;
1905		1912
1906	#ifdef DEBUG_STRICT
1907	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1908	#endif
1909	oldviewstart = TermWin.view_start;	1913	oldviewstart = TermWin.view_start;
		1914
1910	if (direction == UP)	1915	if (direction == UP)
1911	{	1916	{
1912	n = TermWin.view_start + nlines;	1917	n = TermWin.view_start + nlines;
1913	TermWin.view_start = min (n, TermWin.nscrolled);	1918	TermWin.view_start = min (n, TermWin.nscrolled);
1914	}	1919	}
1915	else	1920	else
1916	{	1921	{
1917	n = TermWin.view_start - nlines;	1922	n = TermWin.view_start - nlines;
1918	TermWin.view_start = max (n, 0);	1923	TermWin.view_start = max (n, 0);
1919	}	1924	}
		1925
1920	return scr_changeview (oldviewstart);	1926	return scr_changeview (oldviewstart);
1921	}	1927	}
1922		1928
1923	int	1929	int
1924	rxvt_term::scr_changeview (unsigned int oldviewstart)	1930	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
2244	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))	2250	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2245	continue;	2251	continue;
2246		2252
2247	// redraw one or more characters	2253	// redraw one or more characters
2248		2254
2249	// seek to the beginning if wide characters	2255	// seek to the beginning of wide characters
2250	while (stp[col] == NOCHAR && col > 0)	2256	while (stp[col] == NOCHAR && col > 0)
2251	--col;	2257	--col;
2252		2258
2253	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2259	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2254	text_t *text = stp + col;	2260	text_t *text = stp + col;
…		…
2398	}	2404	}
2399	else	2405	else
2400	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2406	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2401		2407
2402	if (rend & RS_Uline && font->descent > 1 && fore != back)	2408	if (rend & RS_Uline && font->descent > 1 && fore != back)
		2409	{
		2410	#if ENABLE_FRILLS
		2411	if (ISSET_PIXCOLOR (Color_underline))
		2412	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
		2413	else
		2414	#endif
		2415	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
		2416
2403	XDrawLine (display->display, drawBuffer, TermWin.gc,	2417	XDrawLine (display->display, drawBuffer, TermWin.gc,
2404	xpixel, ypixel + font->ascent + 1,	2418	xpixel, ypixel + font->ascent + 1,
2405	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2419	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
		2420	}
2406	} /* for (col....) */	2421	} /* for (col....) */
2407	} /* for (row....) */	2422	} /* for (row....) */
2408		2423
2409	#if ENABLE_OVERLAY	2424	#if ENABLE_OVERLAY
2410	scr_swap_overlay ();	2425	scr_swap_overlay ();
…		…
2652	/* ------------------------------------------------------------------------- */	2667	/* ------------------------------------------------------------------------- */
2653	/*	2668	/*
2654	* Paste a selection direct to the command fd	2669	* Paste a selection direct to the command fd
2655	*/	2670	*/
2656	void	2671	void
2657	rxvt_term::paste (const unsigned char *data, unsigned int len)	2672	rxvt_term::paste (unsigned char *data, unsigned int len)
2658	{	2673	{
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 */	2674	/* convert normal newline chars into common keyboard Return key sequence */
2663	for (i = 0; i < len; i += PROP_SIZE)	2675	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)	2676	if (data[i] == C0_LF)
2670	ds[j] = C0_CR;	2677	data[i] = C0_CR;
2671		2678
2672	tt_write (ds, (int)n);	2679	tt_write (data, len);
2673	}
2674
2675	free (ds);
2676	}	2680	}
2677		2681
2678	/* ------------------------------------------------------------------------- */	2682	/* ------------------------------------------------------------------------- */
2679	/*	2683	/*
2680	* Respond to a notification that a primary selection has been sent	2684	* Respond to a notification that a primary selection has been sent
2681	* EXT: SelectionNotify	2685	* EXT: SelectionNotify
2682	*/	2686	*/
2683	int	2687	void
2684	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2688	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2685	{	2689	{
2686	long nread = 0;
2687	unsigned long bytes_after;
2688	XTextProperty ct;
2689
2690	if (prop == None) /* check for failed XConvertSelection */	2690	if (prop == None) /* check for failed XConvertSelection */
2691	{	2691	{
2692	if ((selection_type & Sel_CompoundText))	2692	if ((selection_type & Sel_CompoundText))
2693	{	2693	{
2694	int selnum = selection_type & Sel_whereMask;	2694	int selnum = selection_type & Sel_whereMask;
…		…
2707	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2707	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708	else	2708	else
2709	selection_type = 0;	2709	selection_type = 0;
2710	}	2710	}
2711		2711
2712	return 0;	2712	return;
2713	}
2714
2715	for (;;)
2716	{	2713	}
		2714
		2715	unsigned long bytes_after;
		2716	XTextProperty ct;
		2717
		2718	if (XGetWindowProperty (display->display, win, prop,
		2719	0, PROP_SIZE / 4,
		2720	delete_prop, AnyPropertyType,
		2721	&ct.encoding, &ct.format,
		2722	&ct.nitems, &bytes_after,
		2723	&ct.value) != Success)
		2724	{
		2725	ct.value = 0;
		2726	goto bailout;
		2727	}
		2728
		2729	if (ct.encoding == None)
		2730	goto bailout;
		2731
		2732	if (bytes_after)
		2733	{
		2734	// fetch and append remaining data
		2735	XTextProperty ct2;
		2736
2717	if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),	2737	if (XGetWindowProperty (display->display, win, prop,
2718	(long) (PROP_SIZE / 4), delete_prop,	2738	ct.nitems / 4, (bytes_after + 3) / 4,
		2739	delete_prop, AnyPropertyType,
2719	AnyPropertyType, &ct.encoding, &ct.format,	2740	&ct2.encoding, &ct2.format,
2720	&ct.nitems, &bytes_after,	2741	&ct2.nitems, &bytes_after,
2721	&ct.value) != Success)	2742	&ct2.value) != Success)
2722	break;	2743	goto bailout;
2723		2744
2724	if (ct.encoding == 0)	2745	// realloc should be compatible to XFree, here, and elsewhere, too
2725	break;	2746	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
		2747	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
		2748	ct.nitems += ct2.nitems;
2726		2749
		2750	XFree (ct2.value);
		2751	}
		2752
		2753	if (ct.value == 0)
		2754	goto bailout;
		2755
2727	if (ct.encoding == xa[XA_INCR])	2756	if (ct.encoding == xa[XA_INCR])
2728	{	2757	{
2729	// INCR selection, start handshake	2758	// INCR selection, start handshake
		2759	if (!delete_prop)
2730	XDeleteProperty (display->display, win, prop);	2760	XDeleteProperty (display->display, win, prop);
		2761
2731	selection_wait = Sel_incr;	2762	selection_wait = Sel_incr;
		2763	incr_buf_fill = 0;
2732	incr_ev.start (NOW + 10);	2764	incr_ev.start (NOW + 10);
2733	break;
2734	}
2735		2765
2736	if (ct.value == NULL)	2766	goto bailout;
2737	continue;	2767	}
2738		2768
2739	if (ct.nitems == 0)	2769	if (ct.nitems == 0)
		2770	{
		2771	if (selection_wait == Sel_incr)
		2772	{
		2773	XFree (ct.value);
		2774
		2775	// finally complete, now paste the whole thing
		2776	selection_wait = Sel_normal;
		2777	ct.value = (unsigned char *)incr_buf;
		2778	ct.nitems = incr_buf_fill;
		2779	incr_buf = 0;
		2780	incr_buf_size = 0;
		2781	incr_ev.stop ();
2740	{	2782	}
		2783	else
		2784	{
2741	if (selection_wait == Sel_normal && nread == 0	2785	if (selection_wait == Sel_normal
2742	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion	2786	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion
2743	{	2787	{
2744	/*	2788	/*
2745	* pass through again trying CUT_BUFFER0 if we've come from	2789	* pass through again trying CUT_BUFFER0 if we've come from
2746	* XConvertSelection () but nothing was presented	2790	* XConvertSelection () but nothing was presented
2747	*/	2791	*/
2748	selection_paste (display->root, XA_CUT_BUFFER0, False);	2792	selection_paste (display->root, XA_CUT_BUFFER0, False);
2749	}	2793	}
2750		2794
2751	nread = -1; /* discount any previous stuff */	2795	goto bailout;
2752	break;	2796	}
		2797	}
		2798	else if (selection_wait == Sel_incr)
		2799	{
		2800	incr_ev.start (NOW + 10);
		2801
		2802	while (incr_buf_fill + ct.nitems > incr_buf_size)
2753	}	2803	{
		2804	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
		2805	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
		2806	}
2754		2807
		2808	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2755	nread += ct.nitems;	2809	incr_buf_fill += ct.nitems;
2756		2810
		2811	goto bailout;
		2812	}
		2813
2757	char **cl;	2814	char **cl;
2758	int cr;	2815	int cr;
		2816
		2817	#if ENABLE_FRILLS
		2818	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		2819	// so recode it manually
		2820	if (ct.encoding == xa[XA_UTF8_STRING])
		2821	{
		2822	wchar_t w = rxvt_utf8towcs ((const char )ct.value, ct.nitems);
		2823	char *s = rxvt_wcstombs (w);
		2824	free (w);
		2825	// TODO: strlen == only the first element will be converted. well...
		2826	paste ((unsigned char *)s, strlen (s));
		2827	free (s);
		2828	}
		2829	else
		2830	#endif
2759	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)	2831	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2760	{	2832	&& cl)
		2833	{
2761	for (int i = 0; i < cr; i++)	2834	for (int i = 0; i < cr; i++)
2762	paste ((unsigned char *)cl[i], strlen (cl[i]));	2835	paste ((unsigned char *)cl[i], strlen (cl[i]));
2763		2836
2764	XFreeStringList (cl);	2837	XFreeStringList (cl);
2765	}	2838	}
2766	else	2839	else
2767	paste (ct.value, ct.nitems);	2840	paste (ct.value, ct.nitems); // paste raw
2768		2841
2769	if (bytes_after == 0)	2842	bailout:
2770	break;
2771
2772	XFree (ct.value);
2773	}
2774
2775	if (ct.value)
2776	XFree (ct.value);	2843	XFree (ct.value);
2777		2844
2778	if (selection_wait == Sel_normal)	2845	if (selection_wait == Sel_normal)
2779	selection_wait = Sel_none;	2846	selection_wait = Sel_none;
2780
2781	return (int)nread;
2782	}	2847	}
2783		2848
2784	void	2849	void
2785	rxvt_term::incr_cb (time_watcher &w)	2850	rxvt_term::incr_cb (time_watcher &w)
2786	{	2851	{
2787	selection_wait = Sel_none;	2852	selection_wait = Sel_none;
2788		2853
		2854	incr_buf_size = 0;
		2855	free (incr_buf);
		2856
2789	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2857	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2790	}	2858	}
2791		2859
2792	/*
2793	* INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2794	*/
2795	void	2860	void
2796	rxvt_term::selection_property (Window win, Atom prop)	2861	rxvt_term::selection_property (Window win, Atom prop)
2797	{	2862	{
2798	if (prop == None \|\| selection_wait != Sel_incr)	2863	if (prop == None \|\| selection_wait != Sel_incr)
2799	return;	2864	return;
2800		2865
2801	if (selection_paste (win, prop, 1) > 0)	2866	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	}	2867	}
2809		2868
2810	/* ------------------------------------------------------------------------- */	2869	/* ------------------------------------------------------------------------- */
2811	/*	2870	/*
2812	* Request the current selection:	2871	* Request the current selection:
…		…
2846	#else	2905	#else
2847	selection_type = Sel_CompoundText;	2906	selection_type = Sel_CompoundText;
2848	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2907	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2849	return;	2908	return;
2850	#endif	2909	#endif
2851
2852	}	2910	}
2853	}	2911	}
2854		2912
2855	selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */	2913	selection_wait = Sel_none; /* don't loop in selection_paste () */
2856	selection_paste (display->root, XA_CUT_BUFFER0, False);	2914	selection_paste (display->root, XA_CUT_BUFFER0, false);
2857	}	2915	}
2858		2916
2859	int	2917	int
2860	rxvt_term::selection_request_other (Atom target, int selnum)	2918	rxvt_term::selection_request_other (Atom target, int selnum)
2861	{	2919	{
…		…
3017	#if 0	3075	#if 0
3018	XTextProperty ct;	3076	XTextProperty ct;
3019		3077
3020	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3078	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3021	{	3079	{
3022	XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,	3080	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3023	PropModeReplace, ct.value, ct.nitems);
3024	XFree (ct.value);	3081	XFree (ct.value);
3025	}	3082	}
3026	#endif	3083	#endif
3027		3084
3028	selection_time = tm;	3085	selection_time = tm;
…		…
3366	selection_delimit_word (DN, &selection.end, &selection.end);	3423	selection_delimit_word (DN, &selection.end, &selection.end);
3367	}	3424	}
3368	else if (selection.clicks == 3)	3425	else if (selection.clicks == 3)
3369	{	3426	{
3370	#if ENABLE_FRILLS	3427	#if ENABLE_FRILLS
3371	if ((options & Opt_tripleclickwords))	3428	if (options & Opt_tripleclickwords)
3372	{	3429	{
3373	int end_row;	3430	int end_row;
3374		3431
3375	selection_delimit_word (UP, &selection.beg, &selection.beg);	3432	selection_delimit_word (UP, &selection.beg, &selection.beg);
3376	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3433	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
…		…
3394	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3451	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3395	selection.mark.col++;	3452	selection.mark.col++;
3396		3453
3397	selection.beg.col = 0;	3454	selection.beg.col = 0;
3398	selection.end.col = ncol;	3455	selection.end.col = ncol;
		3456
		3457	// select a complete logical line
		3458	while (selection.beg.row > -TermWin.saveLines
		3459	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3460	selection.beg.row--;
		3461
		3462	while (selection.end.row < TermWin.nrow
		3463	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3464	selection.end.row++;
3399	}	3465	}
3400	}	3466	}
3401		3467
3402	if (button3 && buttonpress)	3468	if (button3 && buttonpress)
3403	{ /* mark may need to be changed */	3469	{ /* mark may need to be changed */
…		…
3483	*/	3549	*/
3484	void	3550	void
3485	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3551	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3486	{	3552	{
3487	XSelectionEvent ev;	3553	XSelectionEvent ev;
3488	XTextProperty ct;	3554	dDisp;
3489	XICCEncodingStyle style;
3490	Atom target;
3491		3555
3492	ev.type = SelectionNotify;	3556	ev.type = SelectionNotify;
3493	ev.property = None;	3557	ev.property = None;
3494	ev.display = rq.display;	3558	ev.display = rq.display;
3495	ev.requestor = rq.requestor;	3559	ev.requestor = rq.requestor;
…		…
3509	*target++ = xa[XA_COMPOUND_TEXT];	3573	*target++ = xa[XA_COMPOUND_TEXT];
3510	#if X_HAVE_UTF8_STRING	3574	#if X_HAVE_UTF8_STRING
3511	*target++ = xa[XA_UTF8_STRING];	3575	*target++ = xa[XA_UTF8_STRING];
3512	#endif	3576	#endif
3513		3577
3514	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3578	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3515	32, PropModeReplace,	3579	32, PropModeReplace,
3516	(unsigned char *)target_list, target - target_list);	3580	(unsigned char *)target_list, target - target_list);
3517	ev.property = rq.property;	3581	ev.property = rq.property;
3518	}	3582	}
3519	#if TODO // TODO	3583	#if TODO // TODO
…		…
3522	/* TODO: Handle MULTIPLE */	3586	/* TODO: Handle MULTIPLE */
3523	}	3587	}
3524	#endif	3588	#endif
3525	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3589	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526	{	3590	{
3527	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,	3591	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3528	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3592	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529	ev.property = rq.property;	3593	ev.property = rq.property;
3530	}	3594	}
3531	else if (rq.target == XA_STRING	3595	else if (rq.target == XA_STRING
3532	\|\| rq.target == xa[XA_TEXT]	3596	\|\| rq.target == xa[XA_TEXT]
3533	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3597	\|\| rq.target == xa[XA_COMPOUND_TEXT]
3534	\|\| rq.target == xa[XA_UTF8_STRING]	3598	\|\| rq.target == xa[XA_UTF8_STRING]
3535	)	3599	)
3536	{	3600	{
		3601	XTextProperty ct;
		3602	Atom target = rq.target;
3537	short freect = 0;	3603	short freect = 0;
3538	int selectlen;	3604	int selectlen;
3539	wchar_t *cl;	3605	wchar_t *cl;
3540		3606	enum {
3541	target = rq.target;	3607	enc_string = XStringStyle,
		3608	enc_text = XStdICCTextStyle,
		3609	enc_compound_text = XCompoundTextStyle,
		3610	#ifdef X_HAVE_UTF8_STRING
		3611	enc_utf8 = XUTF8StringStyle,
		3612	#else
		3613	enc_utf8 = -1,
		3614	#endif
		3615	} style;
3542		3616
3543	if (target == XA_STRING)	3617	if (target == XA_STRING)
3544	// we actually don't do XA_STRING, but who cares, as i18n clients	3618	// we actually don't do XA_STRING, but who cares, as i18n clients
3545	// will ask for another format anyways.	3619	// will ask for another format anyways.
3546	style = XStringStyle;	3620	style = enc_string;
3547	else if (target == xa[XA_TEXT])	3621	else if (target == xa[XA_TEXT])
3548	style = XStdICCTextStyle;	3622	style = enc_text;
3549	else if (target == xa[XA_COMPOUND_TEXT])	3623	else if (target == xa[XA_COMPOUND_TEXT])
3550	style = XCompoundTextStyle;	3624	style = enc_compound_text;
3551	#if X_HAVE_UTF8_STRING	3625	#if ENABLE_FRILLS
3552	else if (target == xa[XA_UTF8_STRING])	3626	else if (target == xa[XA_UTF8_STRING])
3553	style = XUTF8StringStyle;	3627	style = enc_utf8;
3554	#endif	3628	#endif
3555	else	3629	else
3556	{	3630	{
3557	target = xa[XA_COMPOUND_TEXT];	3631	target = xa[XA_COMPOUND_TEXT];
3558	style = XCompoundTextStyle;	3632	style = enc_compound_text;
3559	}	3633	}
3560		3634
3561	if (selection.text)	3635	if (selection.text)
3562	{	3636	{
3563	cl = selection.text;	3637	cl = selection.text;
…		…
3567	{	3641	{
3568	cl = L"";	3642	cl = L"";
3569	selectlen = 0;	3643	selectlen = 0;
3570	}	3644	}
3571		3645
3572	// Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it	3646	#if ENABLE_FRILLS
3573	// manually for XUTF8StringStyle.	3647	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
		3648	// so recode it manually
		3649	if (style == enc_utf8)
		3650	{
		3651	freect = 1;
		3652	ct.encoding = target;
		3653	ct.format = 8;
		3654	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
		3655	ct.nitems = strlen ((char *)ct.value);
		3656	}
		3657	else
		3658	#endif
3574	if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)	3659	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3575	freect = 1;	3660	freect = 1;
3576	else	3661	else
3577	{	3662	{
3578	/* if we failed to convert then send it raw */	3663	/* if we failed to convert then send it raw */
3579	ct.value = (unsigned char *)cl;	3664	ct.value = (unsigned char *)cl;
3580	ct.nitems = selectlen;	3665	ct.nitems = selectlen;
		3666	ct.encoding = target;
3581	}	3667	}
3582		3668
3583	XChangeProperty (display->display, rq.requestor, rq.property,	3669	XChangeProperty (disp, rq.requestor, rq.property,
3584	target, 8, PropModeReplace,	3670	ct.encoding, 8, PropModeReplace,
3585	ct.value, (int)ct.nitems);	3671	ct.value, (int)ct.nitems);
3586	ev.property = rq.property;	3672	ev.property = rq.property;
3587		3673
3588	if (freect)	3674	if (freect)
3589	XFree (ct.value);	3675	XFree (ct.value);
3590	}	3676	}
3591		3677
3592	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3678	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3593	}	3679	}
3594		3680
3595	/* ------------------------------------------------------------------------- *	3681	/* ------------------------------------------------------------------------- *
3596	* MOUSE ROUTINES *	3682	* MOUSE ROUTINES *
3597	* ------------------------------------------------------------------------- */	3683	* ------------------------------------------------------------------------- */

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.160 by root, Mon Feb 21 19:30:58 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.160 by root, Mon Feb 21 19:30:58 2005 UTC