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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.136 by root, Tue Sep 7 21:05:41 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;
		567
		568	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
		569	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
		570	MAX_IT (screen.cur.row, 0);
		571	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
		572	MAX_IT (screen.cur.col, 0);
		573	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
		574
571	#if NSCREENS	575	#if NSCREENS
572	if (options & Opt_secondaryScreen)	576	if (options & Opt_secondaryScreen)
573	{	577	{
574	num_scr = 0;	578	num_scr = 0;
575	offset = TermWin.saveLines;	579	offset = TermWin.saveLines;
		580
576	for (i = prev_nrow; i--;)	581	for (i = prev_nrow; i--;)
577	{	582	{
578	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);	583	SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);	584	SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);	585	SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581	}	586	}
582	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	587
583	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584	# ifdef DEBUG_STRICT
585	assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586	assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587	# else /* drive with your eyes closed */
588	MAX_IT (screen.cur.row, 0);
589	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590	MAX_IT (screen.cur.col, 0);
591	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592	# endif
593	SWAP_IT (screen.charset, swap.charset, int16_t);	588	SWAP_IT (screen.charset, swap.charset, int16_t);
594	SWAP_IT (screen.flags, swap.flags, int);	589	SWAP_IT (screen.flags, swap.flags, int);
595	screen.flags \|= Screen_VisibleCursor;	590	screen.flags \|= Screen_VisibleCursor;
596	swap.flags \|= Screen_VisibleCursor;	591	swap.flags \|= Screen_VisibleCursor;
597	}	592	}
598	else	593	else
599	#endif	594	#endif
600	if (options & Opt_secondaryScroll)	595	if (options & Opt_secondaryScroll)
601	//if (current_screen == PRIMARY)
602	scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);	596	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
		597
603	return scrn;	598	return scrn;
604	}	599	}
605		600
606	// clear WrapNext indicator, solidifying position on next line	601	// clear WrapNext indicator, solidifying position on next line
607	void	602	void
…		…
704	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	699	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
705	}	700	}
706	else if (j >= row1 && j <= row2)	701	else if (j >= row1 && j <= row2)
707	{	702	{
708	/* move selected region too */	703	/* move selected region too */
709	selection.beg.row -= count;	704	selection.beg.row -= count;
710	selection.end.row -= count;	705	selection.end.row -= count;
711	selection.mark.row -= count;	706	selection.mark.row -= count;
712	}	707	}
713	}	708	}
714		709
715	selection_check (0); /* _after_ TermWin.nscrolled update */	710	selection_check (0); /* _after_ TermWin.nscrolled update */
…		…
723	i = row2 - row1 + 1;	718	i = row2 - row1 + 1;
724	MIN_IT (count, i);	719	MIN_IT (count, i);
725		720
726	if (j > 0)	721	if (j > 0)
727	{	722	{
728	/* A: scroll up */	723	/* scroll up */
729		724
730	/* A1: Copy lines that will get clobbered by the rotation */	725	/* Copy lines that will get clobbered by the rotation */
731	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));	726	memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
732	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));	727	memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
733		728
734	/* A2: Rotate lines */	729	/* Rotate lines */
735	i = row2 - row1 - count + 1;	730	i = row2 - row1 - count + 1;
736	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));
737	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 *));
738	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 *));
739		734
740	j = row2 - count + 1, i = count;	735	j = row2 - count + 1, i = count;
741	}	736	}
742	else /* if (j < 0) */	737	else /* if (j < 0) */
743	{	738	{
744	/* B: scroll down */	739	/* scroll down */
745		740
746	/* B1: Copy lines that will get clobbered by the rotation */	741	/* Copy lines that will get clobbered by the rotation */
747	for (i = 0, j = row2; i < count; i++, j--)	742	for (i = 0, j = row2; i < count; i++, j--)
748	{	743	{
749	buf_text[i] = screen.text[j];	744	buf_text[i] = screen.text[j];
750	buf_rend[i] = screen.rend[j];	745	buf_rend[i] = screen.rend[j];
751	}	746	}
752		747
753	/* B2: Rotate lines */	748	/* Rotate lines */
754	for (j = row2, i = j - count; i >= row1; i--, j--)	749	for (j = row2, i = j - count; i >= row1; i--, j--)
755	{	750	{
756	screen.tlen[j] = screen.tlen[i];	751	screen.tlen[j] = screen.tlen[i];
757	screen.text[j] = screen.text[i];	752	screen.text[j] = screen.text[i];
758	screen.rend[j] = screen.rend[i];	753	screen.rend[j] = screen.rend[i];
…		…
760		755
761	j = row1, i = count;	756	j = row1, i = count;
762	count = -count;	757	count = -count;
763	}	758	}
764		759
765	/* C: Resurrect lines */	760	/* Resurrect lines */
766	memset (screen.tlen + j, 0, i * sizeof (int16_t));	761	memset (screen.tlen + j, 0, i * sizeof (int16_t));
767	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));	762	memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
768	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));	763	memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
769	if (!spec) /* line length may not equal TermWin.ncol */	764	if (!spec) /* line length may not equal TermWin.ncol */
770	for (; i--; j++)	765	for (; i--; j++)
…		…
878		873
879	stp = screen.text[row]; /* _must_ refresh */	874	stp = screen.text[row]; /* _must_ refresh */
880	srp = screen.rend[row]; /* _must_ refresh */	875	srp = screen.rend[row]; /* _must_ refresh */
881	}	876	}
882		877
883	if (screen.flags & Screen_Insert)
884	scr_insdel_chars (1, INSERT);
885
886	// 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
887	// do wcwidth before further replacements, as wcwidth says that line-drawing	879	// do wcwidth before further replacements, as wcwidth says that line-drawing
888	// characters have width -1 (DOH!) on GNU/Linux sometimes.	880	// characters have width -1 (DOH!) on GNU/Linux sometimes.
889	int width = c < 0x100 ? 1 : wcwidth (c);	881	int width = c < 0x100 ? 1 : wcwidth (c);
890		882
891	if (charsets[screen.charset] == '0') // DEC SPECIAL	883	if (charsets[screen.charset] == '0') // DEC SPECIAL
892	{	884	{
893	// vt100 special graphics and line drawing	885	// vt100 special graphics and line drawing
894	// 5f-7e standard vt100	886	// 5f-7e standard vt100
895	// 40-5e rxvt extension for extra curses acs chars	887	// 40-5e rxvt extension for extra curses acs chars
896	static uint16_t vt100_0[63] = { // 5f .. 7e	888	static uint16_t vt100_0[63] = { // 40 .. 7e
897	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!
898	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	890	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
899	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	891	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
900	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	892	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
901	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	893	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
…		…
909	c = vt100_0[c - 0x40];	901	c = vt100_0[c - 0x40];
910	width = 1;	902	width = 1;
911	}	903	}
912	}	904	}
913		905
		906	if (screen.flags & Screen_Insert)
		907	scr_insdel_chars (width, INSERT);
		908
914	if (width != 0)	909	if (width != 0)
915	{	910	{
916	// some utf-8 decoders decode surrogate characters.	911	// some utf-8 decoders decode surrogate characters.
917	if (0xd800 <= c && c <= 0xdfff)	912	if (0xd800 <= c && c <= 0xdfff)
918	c = 0xfffd;	913	c = 0xfffd;
…		…
968	c = NOCHAR;	963	c = NOCHAR;
969	}	964	}
970	while (--width > 0);	965	while (--width > 0);
971		966
972	// pad with spaces when overwriting wide character with smaller one	967	// pad with spaces when overwriting wide character with smaller one
		968	if (!width)
973	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++)
974	{	970	{
975	stp[c] = ' ';	971	stp[c] = ' ';
976	srp[c] = rend;	972	srp[c] = rend;
977	}	973	}
978	}	974	}
979	else if (width == 0)	975	else if (width == 0)
980	{	976	{
981	#if ENABLE_COMBINING	977	#if ENABLE_COMBINING
982	// handle combining characters	978	// handle combining characters
…		…
1095	if (count)	1091	if (count)
1096	x = TermWin.ncol - 1;	1092	x = TermWin.ncol - 1;
1097		1093
1098	// store horizontal tab commands as characters inside the text	1094	// store horizontal tab commands as characters inside the text
1099	// buffer so they can be selected and pasted.	1095	// buffer so they can be selected and pasted.
1100	if (ht)	1096	if (ht && options & Opt_pastableTabs)
1101	{	1097	{
1102	base_rend = SET_FONT (base_rend, 0);	1098	base_rend = SET_FONT (base_rend, 0);
1103		1099
1104	if (screen.tlen[row] != -1) /* XXX: think about this */	1100	if (screen.tlen[row] != -1) /* XXX: think about this */
1105	MAX_IT (screen.tlen[row], x);	1101	MAX_IT (screen.tlen[row], x);
…		…
1165	*/	1161	*/
1166	#if ENABLE_FRILLS	1162	#if ENABLE_FRILLS
1167	void	1163	void
1168	rxvt_term::scr_forwardindex ()	1164	rxvt_term::scr_forwardindex ()
1169	{	1165	{
1170	int row;	1166	int row;
1171		1167
1172	if (screen.cur.col < TermWin.ncol - 1)	1168	if (screen.cur.col < TermWin.ncol - 1)
1173	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1169	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1174	else	1170	else
1175	{	1171	{
…		…
1378	ren = DEFAULT_RSTYLE;	1374	ren = DEFAULT_RSTYLE;
1379	CLEAR_ROWS (row, num);	1375	CLEAR_ROWS (row, num);
1380	}	1376	}
1381	else	1377	else
1382	{	1378	{
1383	ren = (rstyle & (RS_fgMask \| RS_bgMask));	1379	ren = rstyle & (RS_fgMask \| RS_bgMask);
1384	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1380	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1385	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1381	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1386	ERASE_ROWS (row, num);	1382	ERASE_ROWS (row, num);
1387	gcvalue.foreground = pix_colors[Color_fg];	1383	gcvalue.foreground = pix_colors[Color_fg];
1388	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);	1384	XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1389	}	1385	}
1390		1386
1391	for (; num--; row++)	1387	for (; num--; row++)
1392	{	1388	{
1393	scr_blank_screen_mem (screen.text, screen.rend,	1389	scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1394	(unsigned int) (row + row_offset), rstyle);
1395	screen.tlen[row + row_offset] = 0;	1390	screen.tlen[row + row_offset] = 0;
1396	scr_blank_line (drawn_text[row], drawn_rend[row],	1391	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1397	(unsigned int)TermWin.ncol, ren);	1392	}
		1393	}
		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);
1398	}	1407	}
1399	}	1408	}
		1409	#endif
1400		1410
1401	/* ------------------------------------------------------------------------- */	1411	/* ------------------------------------------------------------------------- */
1402	/*	1412	/*
1403	* Fill the screen with `E's	1413	* Fill the screen with `E's
1404	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1414	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1405	*/	1415	*/
1406	void	1416	void
1407	rxvt_term::scr_E ()	1417	rxvt_term::scr_E ()
1408	{	1418	{
1409	int i, j, k;	1419	int i, j, k;
1410	rend_t *r1, fs;	1420	rend_t *r1, fs;
1411		1421
1412	want_refresh = 1;	1422	want_refresh = 1;
1413	ZERO_SCROLLBACK ();	1423	ZERO_SCROLLBACK ();
1414		1424
1415	num_scr_allow = 0;	1425	num_scr_allow = 0;
…		…
1898	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1908	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1899	{	1909	{
1900	int n;	1910	int n;
1901	unsigned int oldviewstart;	1911	unsigned int oldviewstart;
1902		1912
1903	#ifdef DEBUG_STRICT
1904	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1905	#endif
1906	oldviewstart = TermWin.view_start;	1913	oldviewstart = TermWin.view_start;
		1914
1907	if (direction == UP)	1915	if (direction == UP)
1908	{	1916	{
1909	n = TermWin.view_start + nlines;	1917	n = TermWin.view_start + nlines;
1910	TermWin.view_start = min (n, TermWin.nscrolled);	1918	TermWin.view_start = min (n, TermWin.nscrolled);
1911	}	1919	}
1912	else	1920	else
1913	{	1921	{
1914	n = TermWin.view_start - nlines;	1922	n = TermWin.view_start - nlines;
1915	TermWin.view_start = max (n, 0);	1923	TermWin.view_start = max (n, 0);
1916	}	1924	}
		1925
1917	return scr_changeview (oldviewstart);	1926	return scr_changeview (oldviewstart);
1918	}	1927	}
1919		1928
1920	int	1929	int
1921	rxvt_term::scr_changeview (unsigned int oldviewstart)	1930	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
2241	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))	2250	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2242	continue;	2251	continue;
2243		2252
2244	// redraw one or more characters	2253	// redraw one or more characters
2245		2254
2246	// seek to the beginning if wide characters	2255	// seek to the beginning of wide characters
2247	while (stp[col] == NOCHAR && col > 0)	2256	while (stp[col] == NOCHAR && col > 0)
2248	--col;	2257	--col;
2249		2258
2250	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2259	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2251	text_t *text = stp + col;	2260	text_t *text = stp + col;
…		…
2395	}	2404	}
2396	else	2405	else
2397	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2406	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2398		2407
2399	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
2400	XDrawLine (display->display, drawBuffer, TermWin.gc,	2417	XDrawLine (display->display, drawBuffer, TermWin.gc,
2401	xpixel, ypixel + font->ascent + 1,	2418	xpixel, ypixel + font->ascent + 1,
2402	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2419	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
		2420	}
2403	} /* for (col....) */	2421	} /* for (col....) */
2404	} /* for (row....) */	2422	} /* for (row....) */
2405		2423
2406	#if ENABLE_OVERLAY	2424	#if ENABLE_OVERLAY
2407	scr_swap_overlay ();	2425	scr_swap_overlay ();
…		…
2649	/* ------------------------------------------------------------------------- */	2667	/* ------------------------------------------------------------------------- */
2650	/*	2668	/*
2651	* Paste a selection direct to the command fd	2669	* Paste a selection direct to the command fd
2652	*/	2670	*/
2653	void	2671	void
2654	rxvt_term::paste (const unsigned char *data, unsigned int len)	2672	rxvt_term::paste (unsigned char *data, unsigned int len)
2655	{	2673	{
2656	unsigned int i, j, n;
2657	unsigned char ds = (unsigned char )rxvt_malloc (PROP_SIZE);
2658
2659	/* convert normal newline chars into common keyboard Return key sequence */	2674	/* convert normal newline chars into common keyboard Return key sequence */
2660	for (i = 0; i < len; i += PROP_SIZE)	2675	for (unsigned int i = 0; i < len; i++)
2661	{
2662	n = min (len - i, PROP_SIZE);
2663	memcpy (ds, data + i, n);
2664
2665	for (j = 0; j < n; j++)
2666	if (ds[j] == C0_LF)	2676	if (data[i] == C0_LF)
2667	ds[j] = C0_CR;	2677	data[i] = C0_CR;
2668		2678
2669	tt_write (ds, (int)n);	2679	tt_write (data, len);
2670	}
2671
2672	free (ds);
2673	}	2680	}
2674		2681
2675	/* ------------------------------------------------------------------------- */	2682	/* ------------------------------------------------------------------------- */
2676	/*	2683	/*
2677	* Respond to a notification that a primary selection has been sent	2684	* Respond to a notification that a primary selection has been sent
2678	* EXT: SelectionNotify	2685	* EXT: SelectionNotify
2679	*/	2686	*/
2680	int	2687	void
2681	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2688	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2682	{	2689	{
2683	long nread = 0;
2684	unsigned long bytes_after;
2685	XTextProperty ct;
2686
2687	if (prop == None) /* check for failed XConvertSelection */	2690	if (prop == None) /* check for failed XConvertSelection */
2688	{	2691	{
2689	if ((selection_type & Sel_CompoundText))	2692	if ((selection_type & Sel_CompoundText))
2690	{	2693	{
2691	int selnum = selection_type & Sel_whereMask;	2694	int selnum = selection_type & Sel_whereMask;
…		…
2704	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);	2707	selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2705	else	2708	else
2706	selection_type = 0;	2709	selection_type = 0;
2707	}	2710	}
2708		2711
2709	return 0;	2712	return;
2710	}
2711
2712	for (;;)
2713	{	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
2714	if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),	2737	if (XGetWindowProperty (display->display, win, prop,
2715	(long) (PROP_SIZE / 4), delete_prop,	2738	ct.nitems / 4, (bytes_after + 3) / 4,
		2739	delete_prop, AnyPropertyType,
2716	AnyPropertyType, &ct.encoding, &ct.format,	2740	&ct2.encoding, &ct2.format,
2717	&ct.nitems, &bytes_after,	2741	&ct2.nitems, &bytes_after,
2718	&ct.value) != Success)	2742	&ct2.value) != Success)
2719	break;	2743	goto bailout;
2720		2744
2721	if (ct.encoding == 0)	2745	// realloc should be compatible to XFree, here, and elsewhere, too
2722	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;
2723		2749
		2750	XFree (ct2.value);
		2751	}
		2752
		2753	if (ct.value == 0)
		2754	goto bailout;
		2755
2724	if (ct.encoding == xa[XA_INCR])	2756	if (ct.encoding == xa[XA_INCR])
2725	{	2757	{
2726	// INCR selection, start handshake	2758	// INCR selection, start handshake
		2759	if (!delete_prop)
2727	XDeleteProperty (display->display, win, prop);	2760	XDeleteProperty (display->display, win, prop);
		2761
2728	selection_wait = Sel_incr;	2762	selection_wait = Sel_incr;
		2763	incr_buf_fill = 0;
2729	incr_ev.start (NOW + 10);	2764	incr_ev.start (NOW + 10);
2730	break;
2731	}
2732		2765
2733	if (ct.value == NULL)	2766	goto bailout;
2734	continue;	2767	}
2735		2768
2736	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 ();
2737	{	2782	}
		2783	else
		2784	{
2738	if (selection_wait == Sel_normal && nread == 0	2785	if (selection_wait == Sel_normal
2739	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion	2786	&& (win != display->root \|\| prop != XA_CUT_BUFFER0)) // avoid recursion
2740	{	2787	{
2741	/*	2788	/*
2742	* pass through again trying CUT_BUFFER0 if we've come from	2789	* pass through again trying CUT_BUFFER0 if we've come from
2743	* XConvertSelection () but nothing was presented	2790	* XConvertSelection () but nothing was presented
2744	*/	2791	*/
2745	selection_paste (display->root, XA_CUT_BUFFER0, False);	2792	selection_paste (display->root, XA_CUT_BUFFER0, False);
2746	}	2793	}
2747		2794
2748	nread = -1; /* discount any previous stuff */	2795	goto bailout;
2749	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)
2750	}	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	}
2751		2807
		2808	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2752	nread += ct.nitems;	2809	incr_buf_fill += ct.nitems;
2753		2810
		2811	goto bailout;
		2812	}
		2813
2754	char **cl;	2814	char **cl;
2755	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
2756	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)	2831	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2757	{	2832	&& cl)
		2833	{
2758	for (int i = 0; i < cr; i++)	2834	for (int i = 0; i < cr; i++)
2759	paste ((unsigned char *)cl[i], strlen (cl[i]));	2835	paste ((unsigned char *)cl[i], strlen (cl[i]));
2760		2836
2761	XFreeStringList (cl);	2837	XFreeStringList (cl);
2762	}	2838	}
2763	else	2839	else
2764	paste (ct.value, ct.nitems);	2840	paste (ct.value, ct.nitems); // paste raw
2765		2841
2766	if (bytes_after == 0)	2842	bailout:
2767	break;
2768
2769	XFree (ct.value);
2770	}
2771
2772	if (ct.value)
2773	XFree (ct.value);	2843	XFree (ct.value);
2774		2844
2775	if (selection_wait == Sel_normal)	2845	if (selection_wait == Sel_normal)
2776	selection_wait = Sel_none;	2846	selection_wait = Sel_none;
2777
2778	return (int)nread;
2779	}	2847	}
2780		2848
2781	void	2849	void
2782	rxvt_term::incr_cb (time_watcher &w)	2850	rxvt_term::incr_cb (time_watcher &w)
2783	{	2851	{
2784	selection_wait = Sel_none;	2852	selection_wait = Sel_none;
2785		2853
		2854	incr_buf_size = 0;
		2855	free (incr_buf);
		2856
2786	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2857	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2787	}	2858	}
2788		2859
2789	/*
2790	* INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2791	*/
2792	void	2860	void
2793	rxvt_term::selection_property (Window win, Atom prop)	2861	rxvt_term::selection_property (Window win, Atom prop)
2794	{	2862	{
2795	if (prop == None \|\| selection_wait != Sel_incr)	2863	if (prop == None \|\| selection_wait != Sel_incr)
2796	return;	2864	return;
2797		2865
2798	if (selection_paste (win, prop, 1) > 0)	2866	selection_paste (win, prop, true);
2799	incr_ev.start (NOW + 10);
2800	else
2801	{
2802	selection_wait = Sel_none;
2803	incr_ev.stop ();
2804	}
2805	}	2867	}
2806		2868
2807	/* ------------------------------------------------------------------------- */	2869	/* ------------------------------------------------------------------------- */
2808	/*	2870	/*
2809	* Request the current selection:	2871	* Request the current selection:
…		…
2843	#else	2905	#else
2844	selection_type = Sel_CompoundText;	2906	selection_type = Sel_CompoundText;
2845	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2907	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2846	return;	2908	return;
2847	#endif	2909	#endif
2848
2849	}	2910	}
2850	}	2911	}
2851		2912
2852	selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */	2913	selection_wait = Sel_none; /* don't loop in selection_paste () */
2853	selection_paste (display->root, XA_CUT_BUFFER0, False);	2914	selection_paste (display->root, XA_CUT_BUFFER0, false);
2854	}	2915	}
2855		2916
2856	int	2917	int
2857	rxvt_term::selection_request_other (Atom target, int selnum)	2918	rxvt_term::selection_request_other (Atom target, int selnum)
2858	{	2919	{
…		…
3014	#if 0	3075	#if 0
3015	XTextProperty ct;	3076	XTextProperty ct;
3016		3077
3017	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3078	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3018	{	3079	{
3019	XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,	3080	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3020	PropModeReplace, ct.value, ct.nitems);
3021	XFree (ct.value);	3081	XFree (ct.value);
3022	}	3082	}
3023	#endif	3083	#endif
3024		3084
3025	selection_time = tm;	3085	selection_time = tm;
…		…
3363	selection_delimit_word (DN, &selection.end, &selection.end);	3423	selection_delimit_word (DN, &selection.end, &selection.end);
3364	}	3424	}
3365	else if (selection.clicks == 3)	3425	else if (selection.clicks == 3)
3366	{	3426	{
3367	#if ENABLE_FRILLS	3427	#if ENABLE_FRILLS
3368	if ((options & Opt_tripleclickwords))	3428	if (options & Opt_tripleclickwords)
3369	{	3429	{
3370	int end_row;	3430	int end_row;
3371		3431
3372	selection_delimit_word (UP, & (selection.beg), & (selection.beg));	3432	selection_delimit_word (UP, &selection.beg, &selection.beg);
3373	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3433	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3374		3434
3375	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)	3435	for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3376	{	3436	{
3377	end_col = screen.tlen[end_row + TermWin.saveLines];	3437	end_col = screen.tlen[end_row + TermWin.saveLines];
…		…
3391	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3451	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3392	selection.mark.col++;	3452	selection.mark.col++;
3393		3453
3394	selection.beg.col = 0;	3454	selection.beg.col = 0;
3395	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++;
3396	}	3465	}
3397	}	3466	}
3398		3467
3399	if (button3 && buttonpress)	3468	if (button3 && buttonpress)
3400	{ /* mark may need to be changed */	3469	{ /* mark may need to be changed */
…		…
3473	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3542	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3474	}	3543	}
3475		3544
3476	/* ------------------------------------------------------------------------- */	3545	/* ------------------------------------------------------------------------- */
3477	/*	3546	/*
3478	* On some systems, the Atom typedef is 64 bits wide. We need to have a type
3479	* that is exactly 32 bits wide, because a format of 64 is not allowed by
3480	* the X11 protocol.
3481	*/
3482	typedef CARD32 Atom32;
3483
3484	/* ------------------------------------------------------------------------- */
3485	/*
3486	* Respond to a request for our current selection	3547	* Respond to a request for our current selection
3487	* EXT: SelectionRequest	3548	* EXT: SelectionRequest
3488	*/	3549	*/
3489	void	3550	void
3490	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3551	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3491	{	3552	{
3492	XSelectionEvent ev;	3553	XSelectionEvent ev;
3493	XTextProperty ct;	3554	dDisp;
3494	XICCEncodingStyle style;
3495	Atom target;
3496		3555
3497	ev.type = SelectionNotify;	3556	ev.type = SelectionNotify;
3498	ev.property = None;	3557	ev.property = None;
3499	ev.display = rq.display;	3558	ev.display = rq.display;
3500	ev.requestor = rq.requestor;	3559	ev.requestor = rq.requestor;
…		…
3502	ev.target = rq.target;	3561	ev.target = rq.target;
3503	ev.time = rq.time;	3562	ev.time = rq.time;
3504		3563
3505	if (rq.target == xa[XA_TARGETS])	3564	if (rq.target == xa[XA_TARGETS])
3506	{	3565	{
3507	Atom32 target_list[6];	3566	Atom target_list[6];
3508	Atom32 *target = target_list;	3567	Atom *target = target_list;
3509		3568
3510	*target++ = (Atom32) xa[XA_TARGETS];	3569	*target++ = xa[XA_TARGETS];
3511	*target++ = (Atom32) xa[XA_TIMESTAMP];	3570	*target++ = xa[XA_TIMESTAMP];
3512	*target++ = (Atom32) XA_STRING;	3571	*target++ = XA_STRING;
3513	*target++ = (Atom32) xa[XA_TEXT];	3572	*target++ = xa[XA_TEXT];
3514	*target++ = (Atom32) xa[XA_COMPOUND_TEXT];	3573	*target++ = xa[XA_COMPOUND_TEXT];
3515	#if X_HAVE_UTF8_STRING	3574	#if X_HAVE_UTF8_STRING
3516	*target++ = (Atom32) xa[XA_UTF8_STRING];	3575	*target++ = xa[XA_UTF8_STRING];
3517	#endif	3576	#endif
3518		3577
3519	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3578	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3520	(8 * sizeof (target_list[0])), PropModeReplace,	3579	32, PropModeReplace,
3521	(unsigned char *)target_list,	3580	(unsigned char *)target_list, target - target_list);
3522	target - target_list);
3523	ev.property = rq.property;	3581	ev.property = rq.property;
3524	}	3582	}
3525	#if TODO // TODO	3583	#if TODO // TODO
3526	else if (rq.target == xa[XA_MULTIPLE])	3584	else if (rq.target == xa[XA_MULTIPLE])
3527	{	3585	{
3528	/* TODO: Handle MULTIPLE */	3586	/* TODO: Handle MULTIPLE */
3529	}	3587	}
3530	#endif	3588	#endif
3531	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3589	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3532	{	3590	{
3533	XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,	3591	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3534	(8 * sizeof (Time)), PropModeReplace,
3535	(unsigned char *)&selection_time, 1);	3592	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3536	ev.property = rq.property;	3593	ev.property = rq.property;
3537	}	3594	}
3538	else if (rq.target == XA_STRING	3595	else if (rq.target == XA_STRING
3539	\|\| rq.target == xa[XA_TEXT]	3596	\|\| rq.target == xa[XA_TEXT]
3540	\|\| rq.target == xa[XA_COMPOUND_TEXT]	3597	\|\| rq.target == xa[XA_COMPOUND_TEXT]
3541	\|\| rq.target == xa[XA_UTF8_STRING]	3598	\|\| rq.target == xa[XA_UTF8_STRING]
3542	)	3599	)
3543	{	3600	{
		3601	XTextProperty ct;
		3602	Atom target = rq.target;
3544	short freect = 0;	3603	short freect = 0;
3545	int selectlen;	3604	int selectlen;
3546	wchar_t *cl;	3605	wchar_t *cl;
3547		3606	enum {
3548	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;
3549		3616
3550	if (target == XA_STRING)	3617	if (target == XA_STRING)
3551	// 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
3552	// will ask for another format anyways.	3619	// will ask for another format anyways.
3553	style = XStringStyle;	3620	style = enc_string;
3554	else if (target == xa[XA_TEXT])	3621	else if (target == xa[XA_TEXT])
3555	style = XStdICCTextStyle;	3622	style = enc_text;
3556	else if (target == xa[XA_COMPOUND_TEXT])	3623	else if (target == xa[XA_COMPOUND_TEXT])
3557	style = XCompoundTextStyle;	3624	style = enc_compound_text;
3558	#if X_HAVE_UTF8_STRING	3625	#if ENABLE_FRILLS
3559	else if (target == xa[XA_UTF8_STRING])	3626	else if (target == xa[XA_UTF8_STRING])
3560	style = XUTF8StringStyle;	3627	style = enc_utf8;
3561	#endif	3628	#endif
3562	else	3629	else
3563	{	3630	{
3564	target = xa[XA_COMPOUND_TEXT];	3631	target = xa[XA_COMPOUND_TEXT];
3565	style = XCompoundTextStyle;	3632	style = enc_compound_text;
3566	}	3633	}
3567		3634
3568	if (selection.text)	3635	if (selection.text)
3569	{	3636	{
3570	cl = selection.text;	3637	cl = selection.text;
…		…
3574	{	3641	{
3575	cl = L"";	3642	cl = L"";
3576	selectlen = 0;	3643	selectlen = 0;
3577	}	3644	}
3578		3645
3579	// Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it	3646	#if ENABLE_FRILLS
3580	// 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
3581	if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)	3659	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3582	freect = 1;	3660	freect = 1;
3583	else	3661	else
3584	{	3662	{
3585	/* if we failed to convert then send it raw */	3663	/* if we failed to convert then send it raw */
3586	ct.value = (unsigned char *)cl;	3664	ct.value = (unsigned char *)cl;
3587	ct.nitems = selectlen;	3665	ct.nitems = selectlen;
		3666	ct.encoding = target;
3588	}	3667	}
3589		3668
3590	XChangeProperty (display->display, rq.requestor, rq.property,	3669	XChangeProperty (disp, rq.requestor, rq.property,
3591	target, 8, PropModeReplace,	3670	ct.encoding, 8, PropModeReplace,
3592	ct.value, (int)ct.nitems);	3671	ct.value, (int)ct.nitems);
3593	ev.property = rq.property;	3672	ev.property = rq.property;
3594		3673
3595	if (freect)	3674	if (freect)
3596	XFree (ct.value);	3675	XFree (ct.value);
3597	}	3676	}
3598		3677
3599	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3678	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3600	}	3679	}
3601		3680
3602	/* ------------------------------------------------------------------------- *	3681	/* ------------------------------------------------------------------------- *
3603	* MOUSE ROUTINES *	3682	* MOUSE ROUTINES *
3604	* ------------------------------------------------------------------------- */	3683	* ------------------------------------------------------------------------- */

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.136 by root, Tue Sep 7 21:05:41 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.136 by root, Tue Sep 7 21:05:41 2004 UTC vs.
Revision 1.160 by root, Mon Feb 21 19:30:58 2005 UTC