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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.149 by root, Mon Dec 13 06:44:18 2004 UTC vs.
Revision 1.171 by root, Fri Dec 16 13:05:49 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	{
…		…
203	/*	202	/*
204	* 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
205	* 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
206	*/	205	*/
207	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	206	screen.text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
208	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));	207	buf_text = (text_t *)rxvt_calloc (total_rows, sizeof (text_t ));
209	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	208	drawn_text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
210	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));	209	swap.text = (text_t *)rxvt_calloc (nrow, sizeof (text_t ));
211		210
212	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));	211	screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
213	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));	212	swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
214		213
215	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	214	screen.rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
216	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));	215	buf_rend = (rend_t *)rxvt_calloc (total_rows, sizeof (rend_t ));
217	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	216	drawn_rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
218	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));	217	swap.rend = (rend_t *)rxvt_calloc (nrow, sizeof (rend_t ));
219		218
220	for (p = 0; p < nrow; p++)	219	for (p = 0; p < nrow; p++)
221	{	220	{
222	q = p + TermWin.saveLines;	221	q = p + TermWin.saveLines;
223	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);	222	scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
…		…
261		260
262	if (nrow < prev_nrow)	261	if (nrow < prev_nrow)
263	{	262	{
264	/* delete rows */	263	/* delete rows */
265	k = min (TermWin.nscrolled, prev_nrow - nrow);	264	k = min (TermWin.nscrolled, prev_nrow - nrow);
		265	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
266	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);	266	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
267		267
268	for (p = nrow; p < prev_nrow; p++)	268	for (p = nrow; p < prev_nrow; p++)
269	{	269	{
270	q = p + TermWin.saveLines;	270	q = p + TermWin.saveLines;
…		…
294	ralloc->free (drawn_rend[p]);	294	ralloc->free (drawn_rend[p]);
295	}	295	}
296		296
297	/* we have fewer rows so fix up cursor position */	297	/* we have fewer rows so fix up cursor position */
298	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	298	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
299	MIN_IT (swap.cur.row, (int32_t)nrow - 1);
300		299
301	scr_reset_realloc (); /* realloc _last_ */	300	scr_reset_realloc (); /* realloc _last_ */
302	}	301	}
303	else if (nrow > prev_nrow)	302	else if (nrow > prev_nrow)
304	{	303	{
…		…
335	scr_scroll_text (0, (int)nrow - 1, -k, 1);	334	scr_scroll_text (0, (int)nrow - 1, -k, 1);
336	screen.cur.row += k;	335	screen.cur.row += k;
337	screen.s_cur.row += k;	336	screen.s_cur.row += k;
338	TermWin.nscrolled -= k;	337	TermWin.nscrolled -= k;
339	}	338	}
		339
340	#ifdef DEBUG_STRICT	340	#ifdef DEBUG_STRICT
341	assert (screen.cur.row < TermWin.nrow);	341	assert (screen.cur.row < TermWin.nrow);
342	assert (swap.cur.row < TermWin.nrow);
343	#else /* drive with your eyes closed */	342	#else /* drive with your eyes closed */
344
345	MIN_IT (screen.cur.row, nrow - 1);	343	MIN_IT (screen.cur.row, nrow - 1);
346	MIN_IT (swap.cur.row, nrow - 1);
347	#endif	344	#endif
348	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this	345	TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
349	}	346	}
350		347
351	/* resize columns */	348	/* resize columns */
…		…
394	}	391	}
395		392
396	}	393	}
397		394
398	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	395	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
399	MIN_IT (swap.cur.col, (int16_t)ncol - 1);
400		396
401	delete talloc; talloc = ta;	397	delete talloc; talloc = ta;
402	delete ralloc; ralloc = ra;	398	delete ralloc; ralloc = ra;
403	}	399	}
404		400
…		…
446	*/	442	*/
447	void	443	void
448	rxvt_term::scr_release ()	444	rxvt_term::scr_release ()
449	{	445	{
450	unsigned int total_rows;	446	unsigned int total_rows;
451	int i;
452		447
453	total_rows = TermWin.nrow + TermWin.saveLines;	448	total_rows = TermWin.nrow + TermWin.saveLines;
454		449
455	delete talloc; talloc = 0;	450	delete talloc; talloc = 0;
456	delete ralloc; ralloc = 0;	451	delete ralloc; ralloc = 0;
…		…
566	if (current_screen == scrn)	561	if (current_screen == scrn)
567	return scrn;	562	return scrn;
568		563
569	selection_check (2); /* check for boundary cross */	564	selection_check (2); /* check for boundary cross */
570		565
571	SWAP_IT (current_screen, scrn, int);	566	i = current_screen; current_screen = scrn; scrn = i;
572		567
573	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	568	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	569	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575	# ifdef DEBUG_STRICT
576	assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577	assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578	# else /* drive with your eyes closed */
579	MAX_IT (screen.cur.row, 0);	570	MAX_IT (screen.cur.row, 0);
580	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	571	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581	MAX_IT (screen.cur.col, 0);	572	MAX_IT (screen.cur.col, 0);
582	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);	573	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583	# endif
584		574
585	#if NSCREENS	575	#if NSCREENS
586	if (options & Opt_secondaryScreen)	576	if (options & Opt_secondaryScreen)
587	{	577	{
588	num_scr = 0;	578	num_scr = 0;
…		…
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++)
…		…
783	* Add text given in <str> of length <len> to screen struct	773	* Add text given in <str> of length <len> to screen struct
784	*/	774	*/
785	void	775	void
786	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	776	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
787	{	777	{
		778	if (len <= 0) /* sanity */
		779	return;
		780
788	unsigned char checksel;	781	unsigned char checksel;
789	unicode_t c;	782	unicode_t c;
790	int i, row, last_col;	783	int row, last_col;
791	text_t *stp;	784	text_t *stp;
792	rend_t *srp;	785	rend_t *srp;
793		786	const unicode_t *strend = str + len;
794	if (len <= 0) /* sanity */
795	return;
796		787
797	want_refresh = 1;	788	want_refresh = 1;
798	ZERO_SCROLLBACK ();	789	ZERO_SCROLLBACK ();
799	last_col = TermWin.ncol;	790	last_col = TermWin.ncol;
800		791
…		…
825	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	816	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
826		817
827	stp = screen.text[row];	818	stp = screen.text[row];
828	srp = screen.rend[row];	819	srp = screen.rend[row];
829		820
830	while (len--)	821	while (str < strend)
831	{	822	{
832	c = *str++;	823	c = *str++;
833		824
834	if (c < 0x20)	825	if (c < 0x20)
835	switch (c)	826	if (c == C0_LF)
		827	{
		828	if (screen.tlen[row] != -1) /* XXX: think about this */
		829	MAX_IT (screen.tlen[row], screen.cur.col);
		830
		831	screen.flags &= ~Screen_WrapNext;
		832
		833	if (screen.cur.row == screen.bscroll)
		834	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
		835	else if (screen.cur.row < (TermWin.nrow - 1))
		836	row = (++screen.cur.row) + TermWin.saveLines;
		837
		838	stp = screen.text[row]; /* _must_ refresh */
		839	srp = screen.rend[row]; /* _must_ refresh */
		840	continue;
		841	}
		842	else if (c == C0_CR)
836	{	843	{
837	case C0_HT:
838	scr_tab (1, true);
839	continue;
840
841	case C0_LF:
842	if (screen.tlen[row] != -1) /* XXX: think about this */	844	if (screen.tlen[row] != -1) /* XXX: think about this */
843	MAX_IT (screen.tlen[row], screen.cur.col);	845	MAX_IT (screen.tlen[row], screen.cur.col);
844		846
845	screen.flags &= ~Screen_WrapNext;	847	screen.flags &= ~Screen_WrapNext;
846
847	if (screen.cur.row == screen.bscroll)
848	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
849	else if (screen.cur.row < (TermWin.nrow - 1))
850	row = (++screen.cur.row) + TermWin.saveLines;
851
852	stp = screen.text[row]; /* _must_ refresh */
853	srp = screen.rend[row]; /* _must_ refresh */
854	continue;
855
856	case C0_CR:
857	if (screen.tlen[row] != -1) /* XXX: think about this */
858	MAX_IT (screen.tlen[row], screen.cur.col);
859
860	screen.flags &= ~Screen_WrapNext;
861	screen.cur.col = 0;	848	screen.cur.col = 0;
862	continue;	849	continue;
		850	}
		851	else if (c == C0_HT)
		852	{
		853	scr_tab (1, true);
		854	continue;
863	}	855	}
864		856
865	if (checksel /* see if we're writing within selection */	857	if (checksel /* see if we're writing within selection */
866	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	858	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
867	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	859	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
…		…
877		869
878	if (screen.flags & Screen_WrapNext)	870	if (screen.flags & Screen_WrapNext)
879	{	871	{
880	screen.tlen[row] = -1;	872	screen.tlen[row] = -1;
881		873
		874	scr_do_wrap ();
		875
882	scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;	876	row = screen.cur.row + TermWin.saveLines;
883
884	stp = screen.text[row]; /* _must_ refresh */	877	stp = screen.text[row]; /* _must_ refresh */
885	srp = screen.rend[row]; /* _must_ refresh */	878	srp = screen.rend[row]; /* _must_ refresh */
886	}	879	}
887		880
		881	// some utf-8 decoders "decode" surrogate characters: let's fix this.
		882	if (IN_RANGE (c, 0xd800, 0xdfff))
		883	c = 0xfffd;
		884
888	// rely on wcwidth to tell us the character width, at least for non-latin1	885	// rely on wcwidth to tell us the character width, at least for non-latin1
889	// do wcwidth before further replacements, as wcwidth says that line-drawing	886	// do wcwidth before further replacements, as wcwidth might return -1
890	// characters have width -1 (DOH!) on GNU/Linux sometimes.	887	// for the line drawing characters below as they might be invalid in the current
		888	// locale.
891	int width = c < 0x100 ? 1 : wcwidth (c);	889	int width = c < 0x100 ? 1 : wcwidth (c);
892		890
893	if (charsets[screen.charset] == '0') // DEC SPECIAL	891	if (charsets[screen.charset] == '0') // DEC SPECIAL
894	{	892	{
895	// vt100 special graphics and line drawing	893	// vt100 special graphics and line drawing
896	// 5f-7e standard vt100	894	// 5f-7e standard vt100
897	// 40-5e rxvt extension for extra curses acs chars	895	// 40-5e rxvt extension for extra curses acs chars
898	static uint16_t vt100_0[63] = { // 40 .. 7e	896	static uint16_t vt100_0[62] = { // 41 .. 7e
899	0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!	897	0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
900	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f	898	0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
901	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57	899	0, 0, 0, 0, 0, 0, 0, 0, // 50-57
902	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f	900	0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
903	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67	901	0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
904	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f	902	0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
905	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77	903	0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
906	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e	904	0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
907	};	905	};
908		906
909	if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])	907	if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
910	{	908	{
911	c = vt100_0[c - 0x40];	909	c = vt100_0[c - 0x41];
912	width = 1;	910	width = 1; // vt100 line drawing characters are always single-width
913	}	911	}
914	}	912	}
915		913
916	if (screen.flags & Screen_Insert)	914	if (screen.flags & Screen_Insert)
917	scr_insdel_chars (width, INSERT);	915	scr_insdel_chars (width, INSERT);
918		916
919	if (width != 0)	917	if (width != 0)
920	{	918	{
921	// some utf-8 decoders decode surrogate characters.
922	if (0xd800 <= c && c <= 0xdfff)
923	c = 0xfffd;
924
925	#if !UNICODE_3	919	#if !UNICODE_3
926	// trim characters we can't store directly :(	920	// trim characters we can't store directly :(
927	if (c >= 0x10000)	921	if (c >= 0x10000)
928	# if ENABLE_COMBINING	922	# if ENABLE_COMBINING
929	c = rxvt_composite.compose (c); // map to lower 16 bits	923	c = rxvt_composite.compose (c); // map to lower 16 bits
…		…
952	col++;	946	col++;
953	} while (col < TermWin.ncol && stp[col] == NOCHAR);	947	} while (col < TermWin.ncol && stp[col] == NOCHAR);
954	}	948	}
955		949
956	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	950	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		951
		952	// if the character doesn't fit into the remaining columns...
		953	if (screen.cur.col > last_col - width && last_col >= width)
		954	{
		955	// ...output spaces
		956	c = ' ';
		957	// and try the same character next loop iteration
		958	--str;
		959	}
957		960
958	do	961	do
959	{	962	{
960	stp[screen.cur.col] = c;	963	stp[screen.cur.col] = c;
961	srp[screen.cur.col] = rend;	964	srp[screen.cur.col] = rend;
…		…
980	{	983	{
981	stp[c] = ' ';	984	stp[c] = ' ';
982	srp[c] = rend;	985	srp[c] = rend;
983	}	986	}
984	}	987	}
985	else if (width == 0)	988	else // width == 0
986	{	989	{
987	#if ENABLE_COMBINING	990	#if ENABLE_COMBINING
988	// handle combining characters	991	// handle combining characters
989	// we just tag the accent on the previous on-screen character.	992	// we just tag the accent on the previous on-screen character.
990	// this is arguably not correct, but also arguably not wrong.	993	// this is arguably not correct, but also arguably not wrong.
991	// we don't handle double-width characters nicely yet.	994	// we don't handle double-width characters nicely yet.
992
993	text_t *tp;	995	text_t *tp;
994	rend_t *rp;	996	rend_t *rp;
995		997
996	if (screen.cur.col > 0)	998	if (screen.cur.col > 0)
997	{	999	{
…		…
1171	*/	1173	*/
1172	#if ENABLE_FRILLS	1174	#if ENABLE_FRILLS
1173	void	1175	void
1174	rxvt_term::scr_forwardindex ()	1176	rxvt_term::scr_forwardindex ()
1175	{	1177	{
1176	int row;	1178	int row;
1177		1179
1178	if (screen.cur.col < TermWin.ncol - 1)	1180	if (screen.cur.col < TermWin.ncol - 1)
1179	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1181	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1180	else	1182	else
1181	{	1183	{
…		…
1400	screen.tlen[row + row_offset] = 0;	1402	screen.tlen[row + row_offset] = 0;
1401	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);	1403	scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1402	}	1404	}
1403	}	1405	}
1404		1406
		1407	#if ENABLE_FRILLS
		1408	void
		1409	rxvt_term::scr_erase_savelines ()
		1410	{
		1411	want_refresh = 1;
		1412	ZERO_SCROLLBACK ();
		1413
		1414	TermWin.nscrolled = 0;
		1415	}
		1416	#endif
		1417
1405	/* ------------------------------------------------------------------------- */	1418	/* ------------------------------------------------------------------------- */
1406	/*	1419	/*
1407	* Fill the screen with `E's	1420	* Fill the screen with `E's
1408	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1421	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1409	*/	1422	*/
1410	void	1423	void
1411	rxvt_term::scr_E ()	1424	rxvt_term::scr_E ()
1412	{	1425	{
1413	int i, j, k;	1426	int i, j, k;
1414	rend_t *r1, fs;	1427	rend_t *r1, fs;
1415		1428
1416	want_refresh = 1;	1429	want_refresh = 1;
1417	ZERO_SCROLLBACK ();	1430	ZERO_SCROLLBACK ();
1418		1431
1419	num_scr_allow = 0;	1432	num_scr_allow = 0;
…		…
1902	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1915	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1903	{	1916	{
1904	int n;	1917	int n;
1905	unsigned int oldviewstart;	1918	unsigned int oldviewstart;
1906		1919
1907	#ifdef DEBUG_STRICT
1908	assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1909	#endif
1910	oldviewstart = TermWin.view_start;	1920	oldviewstart = TermWin.view_start;
		1921
1911	if (direction == UP)	1922	if (direction == UP)
1912	{	1923	{
1913	n = TermWin.view_start + nlines;	1924	n = TermWin.view_start + nlines;
1914	TermWin.view_start = min (n, TermWin.nscrolled);	1925	TermWin.view_start = min (n, TermWin.nscrolled);
1915	}	1926	}
1916	else	1927	else
1917	{	1928	{
1918	n = TermWin.view_start - nlines;	1929	n = TermWin.view_start - nlines;
1919	TermWin.view_start = max (n, 0);	1930	TermWin.view_start = max (n, 0);
1920	}	1931	}
		1932
1921	return scr_changeview (oldviewstart);	1933	return scr_changeview (oldviewstart);
1922	}	1934	}
1923		1935
1924	int	1936	int
1925	rxvt_term::scr_changeview (unsigned int oldviewstart)	1937	rxvt_term::scr_changeview (unsigned int oldviewstart)
…		…
1936	/* ------------------------------------------------------------------------- */	1948	/* ------------------------------------------------------------------------- */
1937	void	1949	void
1938	rxvt_term::scr_bell ()	1950	rxvt_term::scr_bell ()
1939	{	1951	{
1940	#ifndef NO_BELL	1952	#ifndef NO_BELL
		1953
1941	# ifndef NO_MAPALERT	1954	# ifndef NO_MAPALERT
1942	# ifdef MAPALERT_OPTION	1955	# ifdef MAPALERT_OPTION
1943	if (options & Opt_mapAlert)	1956	if (options & Opt_mapAlert)
1944	# endif	1957	# endif
1945	XMapWindow (display->display, TermWin.parent[0]);	1958	XMapWindow (display->display, TermWin.parent[0]);
1946	# endif	1959	# endif
		1960
1947	if (options & Opt_visualBell)	1961	if (options & Opt_visualBell)
1948	{	1962	{
1949	scr_rvideo_mode (!rvideo); /* refresh also done */	1963	scr_rvideo_mode (!rvideo); /* refresh also done */
		1964	rxvt_usleep (VISUAL_BELL_DURATION);
1950	scr_rvideo_mode (!rvideo); /* refresh also done */	1965	scr_rvideo_mode (!rvideo); /* refresh also done */
1951	}	1966	}
1952	else	1967	else
1953	XBell (display->display, 0);	1968	XBell (display->display, 0);
		1969
1954	#endif	1970	#endif
1955	}	1971	}
1956		1972
1957	/* ------------------------------------------------------------------------- */	1973	/* ------------------------------------------------------------------------- */
1958	/* ARGSUSED */	1974	/* ARGSUSED */
…		…
2013	/*	2029	/*
2014	* Refresh the screen	2030	* Refresh the screen
2015	* drawn_text/drawn_rend contain the screen information before the update.	2031	* drawn_text/drawn_rend contain the screen information before the update.
2016	* screen.text/screen.rend contain what the screen will change to.	2032	* screen.text/screen.rend contain what the screen will change to.
2017	*/	2033	*/
2018
2019	#define FONT_WIDTH(X, Y) \
2020	(X)->per_char[ (Y) - (X)->min_char_or_byte2].width
2021	#define FONT_RBEAR(X, Y) \
2022	(X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
2023	#define FONT_LBEAR(X, Y) \
2024	(X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
2025	#define IS_FONT_CHAR(X, Y) \
2026	((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
2027
2028	void	2034	void
2029	rxvt_term::scr_refresh (unsigned char refresh_type)	2035	rxvt_term::scr_refresh (unsigned char refresh_type)
2030	{	2036	{
2031	unsigned char must_clear, /* use draw_string not draw_image_string */	2037	unsigned char must_clear, /* use draw_string not draw_image_string */
2032	showcursor; /* show the cursor */	2038	showcursor; /* show the cursor */
…		…
2051	refresh_count = 0;	2057	refresh_count = 0;
2052		2058
2053	row_offset = TermWin.saveLines - TermWin.view_start;	2059	row_offset = TermWin.saveLines - TermWin.view_start;
2054		2060
2055	#if XPM_BACKGROUND	2061	#if XPM_BACKGROUND
2056	must_clear \|= (bgPixmap.pixmap != None);	2062	must_clear \|= bgPixmap.pixmap != None;
2057	#endif	2063	#endif
2058	#if TRANSPARENT	2064	#if TRANSPARENT
2059	must_clear \|= ((options & Opt_transparent) && am_transparent);	2065	must_clear \|= (options & Opt_transparent) && am_transparent;
2060	#endif	2066	#endif
2061	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2067	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062		2068
2063	/*	2069	/*
2064	* B: reverse any characters which are selected	2070	* B: reverse any characters which are selected
…		…
2088		2094
2089	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];	2095	crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2090		2096
2091	if (showcursor && TermWin.focus)	2097	if (showcursor && TermWin.focus)
2092	{	2098	{
		2099	if (options & Opt_cursorUnderline)
		2100	*crp ^= RS_Uline;
		2101	else
		2102	{
2093	*crp ^= RS_RVid;	2103	*crp ^= RS_RVid;
		2104
2094	#ifndef NO_CURSORCOLOR	2105	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);	2106	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2107	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2108	ccol1 = Color_cursor;
2098	else	2109	else
2099	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2110	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100	ccol1 = GET_FGCOLOR (rstyle);	2111	ccol1 = GET_FGCOLOR (rstyle);
2101	#else	2112	#else
2102	ccol1 = Color_fg;	2113	ccol1 = Color_fg;
2103	#endif	2114	#endif
2104	if (ISSET_PIXCOLOR (Color_cursor2))	2115	if (ISSET_PIXCOLOR (Color_cursor2))
2105	ccol2 = Color_cursor2;	2116	ccol2 = Color_cursor2;
2106	else	2117	else
2107	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2118	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2108	ccol2 = GET_BGCOLOR (rstyle);	2119	ccol2 = GET_BGCOLOR (rstyle);
2109	#else	2120	#else
2110	ccol2 = Color_bg;	2121	ccol2 = Color_bg;
2111	#endif	2122	#endif
2112	crp = SET_FGCOLOR (crp, ccol1);	2123	crp = SET_FGCOLOR (crp, ccol1);
2113	crp = SET_BGCOLOR (crp, ccol2);	2124	crp = SET_BGCOLOR (crp, ccol2);
2114	#endif	2125	#endif
		2126	}
2115	}	2127	}
2116	}	2128	}
2117		2129
2118	/* make sure no outline cursor is left around */	2130	/* make sure no outline cursor is left around */
2119	setoldcursor = 0;	2131	setoldcursor = 0;
…		…
2149		2161
2150	#if ENABLE_OVERLAY	2162	#if ENABLE_OVERLAY
2151	scr_swap_overlay ();	2163	scr_swap_overlay ();
2152	#endif	2164	#endif
2153		2165
2154	rend_t drp, srp; /* drawn-rend-pointer, screen-rend-pointer */
2155	text_t dtp, stp; /* drawn-text-pointer, screen-text-pointer */
2156
2157	#ifndef NO_SLOW_LINK_SUPPORT	2166	#ifndef NO_SLOW_LINK_SUPPORT
2158	/*	2167	/*
2159	* D: CopyArea pass - very useful for slower links	2168	* D: CopyArea pass - very useful for slower links
2160	* This has been deliberately kept simple.	2169	* This has been deliberately kept simple.
2161	*/	2170	*/
…		…
2296		2305
2297	// sometimes we optimize away the trailing NOCHAR's, add them back	2306	// sometimes we optimize away the trailing NOCHAR's, add them back
2298	while (i && text[count] == NOCHAR)	2307	while (i && text[count] == NOCHAR)
2299	count++, i--;	2308	count++, i--;
2300		2309
2301	#if ENABLE_STYLES
2302	// force redraw after "careful" characters to avoid pixel droppings
2303	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304	drp[col + 1] = ~srp[col + 1];
2305
2306	// include previous careful character(s) if possible, looks nicer (best effort...)
2307	while (text > stp
2308	&& srp[text - stp - 1] & RS_Careful
2309	&& RS_SAME (rend, srp[text - stp - 1]))
2310	text--, count++, xpixel -= TermWin.fwidth;
2311	#endif
2312
2313	/*	2310	/*
2314	* Determine the attributes for the string	2311	* Determine the attributes for the string
2315	*/	2312	*/
2316	int fore = GET_FGCOLOR (rend); // desired foreground	2313	int fore = GET_FGCOLOR (rend); // desired foreground
2317	int back = GET_BGCOLOR (rend); // desired background	2314	int back = GET_BGCOLOR (rend); // desired background
2318		2315
2319	// only do special processing if ana attributes are set, which is rare	2316	// only do special processing if any attributes are set, which is rare
2320	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink))	2317	if (rend & (RS_Bold \| RS_Italic \| RS_Uline \| RS_RVid \| RS_Blink \| RS_Careful))
2321	{	2318	{
		2319	#if ENABLE_STYLES
		2320	// force redraw after "careful" characters to avoid pixel droppings
		2321	if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
		2322	drp[col + 1] = ~srp[col + 1];
		2323
		2324	// include previous careful character(s) if possible, looks nicer (best effort...)
		2325	while (text > stp
		2326	&& srp[text - stp - 1] & RS_Careful
		2327	&& RS_SAME (rend, srp[text - stp - 1]))
		2328	text--, count++, xpixel -= TermWin.fwidth;
		2329	#endif
		2330
2322	bool invert = rend & RS_RVid;	2331	bool invert = rend & RS_RVid;
2323		2332
2324	#ifndef NO_BOLD_UNDERLINE_REVERSE	2333	#ifndef NO_BOLD_UNDERLINE_REVERSE
2325	if (rend & RS_Bold	2334	if (rend & RS_Bold
2326	&& fore == Color_fg)	2335	&& fore == Color_fg)
…		…
2353	SWAP_IT (fore, back, int);	2362	SWAP_IT (fore, back, int);
2354		2363
2355	#ifndef NO_BOLD_UNDERLINE_REVERSE	2364	#ifndef NO_BOLD_UNDERLINE_REVERSE
2356	if (ISSET_PIXCOLOR (Color_RV))	2365	if (ISSET_PIXCOLOR (Color_RV))
2357	back = Color_RV;	2366	back = Color_RV;
		2367
		2368	if (fore == back)
		2369	{
		2370	fore = Color_bg;
		2371	back = Color_fg;
		2372	}
2358	#endif	2373	#endif
2359	}	2374	}
2360		2375
2361	#ifdef TEXT_BLINK	2376	#ifdef TEXT_BLINK
2362	if (rend & RS_Blink && (back == Color_bg \|\| fore == Color_bg))	2377	if (rend & RS_Blink && (back == Color_bg \|\| fore == Color_bg))
…		…
2400	else	2415	else
2401	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);	2416	font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2402		2417
2403	if (rend & RS_Uline && font->descent > 1 && fore != back)	2418	if (rend & RS_Uline && font->descent > 1 && fore != back)
2404	{	2419	{
		2420	#if ENABLE_FRILLS
		2421	if (ISSET_PIXCOLOR (Color_underline))
		2422	XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
		2423	else
		2424	#endif
2405	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);	2425	XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
		2426
2406	XDrawLine (display->display, drawBuffer, TermWin.gc,	2427	XDrawLine (display->display, drawBuffer, TermWin.gc,
2407	xpixel, ypixel + font->ascent + 1,	2428	xpixel, ypixel + font->ascent + 1,
2408	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2429	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409	}	2430	}
2410	} /* for (col....) */	2431	} /* for (col....) */
…		…
2419	*/	2440	*/
2420	if (showcursor)	2441	if (showcursor)
2421	{	2442	{
2422	if (TermWin.focus)	2443	if (TermWin.focus)
2423	{	2444	{
		2445	if (options & Opt_cursorUnderline)
		2446	*crp ^= RS_Uline;
		2447	else
		2448	{
2424	*crp ^= RS_RVid;	2449	*crp ^= RS_RVid;
2425	#ifndef NO_CURSORCOLOR	2450	#ifndef NO_CURSORCOLOR
2426	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2451	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2427	#endif	2452	#endif
		2453	}
2428	}	2454	}
2429	else if (oldcursor.row >= 0)	2455	else if (oldcursor.row >= 0)
2430	{	2456	{
		2457	int cursorwidth = 1;
		2458	int col = oldcursor.col;
		2459
		2460	while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
		2461	col--;
		2462
		2463	while (col + cursorwidth < TermWin.ncol
		2464	&& drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
		2465	cursorwidth++;
		2466
2431	#ifndef NO_CURSORCOLOR	2467	#ifndef NO_CURSORCOLOR
2432	if (ISSET_PIXCOLOR (Color_cursor))	2468	if (ISSET_PIXCOLOR (Color_cursor))
2433	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);	2469	XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2434	#endif	2470	#endif
2435	int cursorwidth = 1;
2436	while (oldcursor.col + cursorwidth < TermWin.ncol
2437	&& drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438	cursorwidth++;
2439		2471
2440	XDrawRectangle (display->display, drawBuffer, TermWin.gc,	2472	XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2441	Col2Pixel (oldcursor.col),	2473	Col2Pixel (col),
2442	Row2Pixel (oldcursor.row),	2474	Row2Pixel (oldcursor.row),
2443	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2475	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2444	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));	2476	(unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2445	}	2477	}
2446	}	2478	}
…		…
2517	if (!TermWin.mapped)	2549	if (!TermWin.mapped)
2518	return;	2550	return;
2519		2551
2520	num_scr_allow = 0;	2552	num_scr_allow = 0;
2521	want_refresh = 1;	2553	want_refresh = 1;
2522
2523	#if TRANSPARENT
2524	if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2525	{
2526	int i;
2527
2528	if (!(options & Opt_transparent_all))
2529	i = 0;
2530	else
2531	i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533	while (i--)
2534	if (TermWin.parent[i] != None)
2535	XClearWindow (display->display, TermWin.parent[i]);
2536	}
2537	#endif
2538		2554
2539	if (really)	2555	if (really)
2540	XClearWindow (display->display, TermWin.vt);	2556	XClearWindow (display->display, TermWin.vt);
2541	}	2557	}
2542		2558
…		…
2656	/* ------------------------------------------------------------------------- */	2672	/* ------------------------------------------------------------------------- */
2657	/*	2673	/*
2658	* Paste a selection direct to the command fd	2674	* Paste a selection direct to the command fd
2659	*/	2675	*/
2660	void	2676	void
2661	rxvt_term::paste (const unsigned char *data, unsigned int len)	2677	rxvt_term::paste (unsigned char *data, unsigned int len)
2662	{	2678	{
2663	unsigned int i, j, n;
2664	unsigned char ds = (unsigned char )rxvt_malloc (PASTE_SIZE);
2665
2666	/* convert normal newline chars into common keyboard Return key sequence */	2679	/* convert normal newline chars into common keyboard Return key sequence */
2667	for (i = 0; i < len; i += PASTE_SIZE)	2680	for (unsigned int i = 0; i < len; i++)
2668	{
2669	n = min (len - i, PASTE_SIZE);
2670	memcpy (ds, data + i, n);
2671
2672	for (j = 0; j < n; j++)
2673	if (ds[j] == C0_LF)	2681	if (data[i] == C0_LF)
2674	ds[j] = C0_CR;	2682	data[i] = C0_CR;
2675		2683
2676	tt_write (ds, (int)n);	2684	tt_write (data, len);
2677	}
2678
2679	free (ds);
2680	}	2685	}
2681		2686
2682	/* ------------------------------------------------------------------------- */	2687	/* ------------------------------------------------------------------------- */
2683	/*	2688	/*
2684	* Respond to a notification that a primary selection has been sent	2689	* Respond to a notification that a primary selection has been sent
…		…
2916		2921
2917	int	2922	int
2918	rxvt_term::selection_request_other (Atom target, int selnum)	2923	rxvt_term::selection_request_other (Atom target, int selnum)
2919	{	2924	{
2920	Atom sel;	2925	Atom sel;
2921	#ifdef DEBUG_SELECT
2922	char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2923	#endif
2924		2926
2925	selection_type \|= selnum;	2927	selection_type \|= selnum;
2926		2928
2927	if (selnum == Sel_Primary)	2929	if (selnum == Sel_Primary)
2928	sel = XA_PRIMARY;	2930	sel = XA_PRIMARY;
…		…
3423	selection_delimit_word (DN, &selection.end, &selection.end);	3425	selection_delimit_word (DN, &selection.end, &selection.end);
3424	}	3426	}
3425	else if (selection.clicks == 3)	3427	else if (selection.clicks == 3)
3426	{	3428	{
3427	#if ENABLE_FRILLS	3429	#if ENABLE_FRILLS
3428	if ((options & Opt_tripleclickwords))	3430	if (options & Opt_tripleclickwords)
3429	{	3431	{
3430	int end_row;	3432	int end_row;
3431		3433
3432	selection_delimit_word (UP, &selection.beg, &selection.beg);	3434	selection_delimit_word (UP, &selection.beg, &selection.beg);
3433	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];	3435	end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
…		…
3451	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))	3453	if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3452	selection.mark.col++;	3454	selection.mark.col++;
3453		3455
3454	selection.beg.col = 0;	3456	selection.beg.col = 0;
3455	selection.end.col = ncol;	3457	selection.end.col = ncol;
		3458
		3459	// select a complete logical line
		3460	while (selection.beg.row > -TermWin.saveLines
		3461	&& screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
		3462	selection.beg.row--;
		3463
		3464	while (selection.end.row < TermWin.nrow
		3465	&& screen.tlen[selection.end.row + TermWin.saveLines] == -1)
		3466	selection.end.row++;
3456	}	3467	}
3457	}	3468	}
3458		3469
3459	if (button3 && buttonpress)	3470	if (button3 && buttonpress)
3460	{ /* mark may need to be changed */	3471	{ /* mark may need to be changed */
…		…
3540	*/	3551	*/
3541	void	3552	void
3542	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3553	rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3543	{	3554	{
3544	XSelectionEvent ev;	3555	XSelectionEvent ev;
		3556	dDisp;
3545		3557
3546	ev.type = SelectionNotify;	3558	ev.type = SelectionNotify;
3547	ev.property = None;	3559	ev.property = None;
3548	ev.display = rq.display;	3560	ev.display = rq.display;
3549	ev.requestor = rq.requestor;	3561	ev.requestor = rq.requestor;
…		…
3563	*target++ = xa[XA_COMPOUND_TEXT];	3575	*target++ = xa[XA_COMPOUND_TEXT];
3564	#if X_HAVE_UTF8_STRING	3576	#if X_HAVE_UTF8_STRING
3565	*target++ = xa[XA_UTF8_STRING];	3577	*target++ = xa[XA_UTF8_STRING];
3566	#endif	3578	#endif
3567		3579
3568	XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,	3580	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3569	32, PropModeReplace,	3581	32, PropModeReplace,
3570	(unsigned char *)target_list, target - target_list);	3582	(unsigned char *)target_list, target - target_list);
3571	ev.property = rq.property;	3583	ev.property = rq.property;
3572	}	3584	}
3573	#if TODO // TODO	3585	#if TODO // TODO
…		…
3576	/* TODO: Handle MULTIPLE */	3588	/* TODO: Handle MULTIPLE */
3577	}	3589	}
3578	#endif	3590	#endif
3579	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3591	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3580	{	3592	{
3581	XChangeProperty (display->display, rq.requestor, rq.property, rq.target,	3593	XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3582	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3594	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3583	ev.property = rq.property;	3595	ev.property = rq.property;
3584	}	3596	}
3585	else if (rq.target == XA_STRING	3597	else if (rq.target == XA_STRING
3586	\|\| rq.target == xa[XA_TEXT]	3598	\|\| rq.target == xa[XA_TEXT]
…		…
3644	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3656	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3645	ct.nitems = strlen ((char *)ct.value);	3657	ct.nitems = strlen ((char *)ct.value);
3646	}	3658	}
3647	else	3659	else
3648	#endif	3660	#endif
3649	if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3661	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3650	freect = 1;	3662	freect = 1;
3651	else	3663	else
3652	{	3664	{
3653	/* if we failed to convert then send it raw */	3665	/* if we failed to convert then send it raw */
3654	ct.value = (unsigned char *)cl;	3666	ct.value = (unsigned char *)cl;
3655	ct.nitems = selectlen;	3667	ct.nitems = selectlen;
3656	ct.encoding = target;	3668	ct.encoding = target;
3657	}	3669	}
3658		3670
3659	XChangeProperty (display->display, rq.requestor, rq.property,	3671	XChangeProperty (disp, rq.requestor, rq.property,
3660	ct.encoding, 8, PropModeReplace,	3672	ct.encoding, 8, PropModeReplace,
3661	ct.value, (int)ct.nitems);	3673	ct.value, (int)ct.nitems);
3662	ev.property = rq.property;	3674	ev.property = rq.property;
3663		3675
3664	if (freect)	3676	if (freect)
3665	XFree (ct.value);	3677	XFree (ct.value);
3666	}	3678	}
3667		3679
3668	XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);	3680	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3669	}	3681	}
3670		3682
3671	/* ------------------------------------------------------------------------- *	3683	/* ------------------------------------------------------------------------- *
3672	* MOUSE ROUTINES *	3684	* MOUSE ROUTINES *
3673	* ------------------------------------------------------------------------- */	3685	* ------------------------------------------------------------------------- */
…		…
3793	while (*s)	3805	while (*s)
3794	scr_overlay_set (x++, y, *s++);	3806	scr_overlay_set (x++, y, *s++);
3795	}	3807	}
3796		3808
3797	void	3809	void
		3810	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
		3811	{
		3812	while (*s)
		3813	{
		3814	text_t t = *s++;
		3815	int width = wcwidth (t);
		3816
		3817	while (width--)
		3818	{
		3819	scr_overlay_set (x++, y, t);
		3820	t = NOCHAR;
		3821	}
		3822	}
		3823	}
		3824
		3825	void
3798	rxvt_term::scr_swap_overlay ()	3826	rxvt_term::scr_swap_overlay ()
3799	{	3827	{
3800	if (!ov_text)	3828	if (!ov_text)
3801	return;	3829	return;
3802		3830

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.149 by root, Mon Dec 13 06:44:18 2004 UTC vs. Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.149 by root, Mon Dec 13 06:44:18 2004 UTC vs.
Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC