ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*--------------------------------*-C-*--------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
24	* This file handles _all_ screen updates and selections	24	* This file handles _all_ screen updates and selections
25	*/	25	*/
26		26
27	#include "../config.h" /* NECESSARY */	27	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
		29	#include "rxvtperl.h" /* NECESSARY */
29		30
30	#include <X11/Xmd.h> /* get the typedef for CARD32 */	31	#include <X11/Xmd.h> /* get the typedef for CARD32 */
31		32
32	#include <inttypes.h>	33	#include <inttypes.h>
33		34
…		…
46		47
47	/* ------------------------------------------------------------------------- *	48	/* ------------------------------------------------------------------------- *
48	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49	* ------------------------------------------------------------------------- */	50	* ------------------------------------------------------------------------- */
50	#define ZERO_SCROLLBACK() \	51	#define ZERO_SCROLLBACK() \
51	if (options & Opt_scrollTtyOutput) \	52	if (OPTION (Opt_scrollTtyOutput)) \
52	view_start = 0	53	view_start = 0
53	#define CLEAR_SELECTION() \	54	#define CLEAR_SELECTION() \
54	selection.beg.row = selection.beg.col \	55	selection.beg.row = selection.beg.col \
55	= selection.end.row = selection.end.col = 0	56	= selection.end.row = selection.end.col = 0
56	#define CLEAR_ALL_SELECTION() \	57	#define CLEAR_ALL_SELECTION() \
…		…
114	* SCREEN `COMMON' ROUTINES *	115	* SCREEN `COMMON' ROUTINES *
115	* ------------------------------------------------------------------------- */	116	* ------------------------------------------------------------------------- */
116		117
117	/* Fill part/all of a line with blanks. */	118	/* Fill part/all of a line with blanks. */
118	void	119	void
119	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)	120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
120	{	121	{
121	if (!l.t)	122	if (!l.t)
122	{	123	{
123	lalloc (l);	124	lalloc (l);
124	col = 0;	125	col = 0;
125	width = ncol;	126	width = ncol;
126	}	127	}
127		128
		129	l.touch ();
		130
128	efs &= ~RS_baseattrMask;	131	efs &= ~RS_baseattrMask;
129	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130		133
131	text_t *et = l.t + col;	134	text_t *et = l.t + col;
132	rend_t *er = l.r + col;	135	rend_t *er = l.r + col;
…		…
139	}	142	}
140		143
141	/* ------------------------------------------------------------------------- */	144	/* ------------------------------------------------------------------------- */
142	/* Fill a full line with blanks - make sure it is allocated first */	145	/* Fill a full line with blanks - make sure it is allocated first */
143	void	146	void
144	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)	147	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
145	{	148	{
146	scr_blank_line (l, 0, ncol, efs);	149	scr_blank_line (l, 0, ncol, efs);
		150
		151	l.l = 0;
		152	l.f = 0;
147	}	153	}
148		154
149	/* ------------------------------------------------------------------------- *	155	/* ------------------------------------------------------------------------- *
150	* SCREEN INITIALISATION *	156	* SCREEN INITIALISATION *
151	* ------------------------------------------------------------------------- */	157	* ------------------------------------------------------------------------- */
…		…
173	if (nrow + saveLines < 2)	179	if (nrow + saveLines < 2)
174	{	180	{
175	//TODO//FIXME	181	//TODO//FIXME
176	saveLines++;	182	saveLines++;
177	prev_nrow--;	183	prev_nrow--;
178	nsaved++;	184	top_row--;
179	}	185	}
180		186
181	want_refresh = 1;	187	want_refresh = 1;
182		188
183	int prev_total_rows = prev_nrow + saveLines;	189	int prev_total_rows = prev_nrow + saveLines;
…		…
188		194
189	if (!row_buf)	195	if (!row_buf)
190	{	196	{
191	/*	197	/*
192	* first time called so just malloc everything: don't rely on realloc	198	* first time called so just malloc everything: don't rely on realloc
193	* Note: this is still needed so that all the scrollback lines are NULL
194	*/	199	*/
195	nsaved = 0; /* no saved lines */	200	top_row = 0; /* no saved lines */
196	term_start = 0;	201	term_start = 0;
197		202
198	talloc = new rxvt_salloc (ncol * sizeof (text_t));	203	talloc = new rxvt_salloc (ncol * sizeof (text_t));
199	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200		205
201	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205		209
206	for (int row = nrow; row--; )	210	for (int row = nrow; row--; )
207	{	211	{
208	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);	212	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	213	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
…		…
254	}	258	}
255	}	259	}
256	#endif	260	#endif
257		261
258	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));	262	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));	263	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261		264
262	for (int row = min (nrow, prev_nrow); row--; )	265	for (int row = min (nrow, prev_nrow); row--; )
263	{	266	{
264	lresize (drawn_buf[row]);	267	lresize (drawn_buf[row]);
…		…
269	{	272	{
270	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272	}	275	}
273		276
		277	line_t *old_buf = row_buf;
274	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275		279
276	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277	int pend = MOD (term_start - nsaved , prev_total_rows);	281	int pend = MOD (term_start + top_row , prev_total_rows);
278	int q = total_rows; // rewrapped row	282	int q = total_rows; // rewrapped row
279		283
280	if (nsaved)	284	if (top_row)
281	{	285	{
282	// re-wrap lines, this is rather ugly, possibly because I am too dumb	286	// re-wrap lines, this is rather ugly, possibly because I am too dumb
283	// to come up with a lean and mean algorithm.	287	// to come up with a lean and mean algorithm.
284		288
285	row_col_t ocur = screen.cur;	289	row_col_t ocur = screen.cur;
…		…
289	{	293	{
290	p = MOD (p - 1, prev_total_rows);	294	p = MOD (p - 1, prev_total_rows);
291	#ifdef DEBUG_STRICT	295	#ifdef DEBUG_STRICT
292	assert (old_buf [MOD (p, prev_total_rows)].t);	296	assert (old_buf [MOD (p, prev_total_rows)].t);
293	#endif	297	#endif
294
295	int plines = 1;	298	int plines = 1;
296	int llen = old_buf [MOD (p, prev_total_rows)].l;	299	int llen = old_buf [MOD (p, prev_total_rows)].l;
297		300
298	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	301	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299	{	302	{
…		…
317	// re-assemble the full line by destination lines	320	// re-assemble the full line by destination lines
318	for (int qrow = q; qlines--; qrow++)	321	for (int qrow = q; qlines--; qrow++)
319	{	322	{
320	qline = row_buf + qrow;	323	qline = row_buf + qrow;
321	lalloc (*qline);	324	lalloc (*qline);
		325	qline->l = ncol;
322	qline->set_is_longer ();	326	qline->is_longer (1);
323		327
324	int qcol = 0;	328	int qcol = 0;
325		329
326	// fill a single destination line	330	// fill a single destination line
327	while (lofs < llen && qcol < ncol)	331	while (lofs < llen && qcol < ncol)
…		…
351	lofs += len;	355	lofs += len;
352	qcol += len;	356	qcol += len;
353	}	357	}
354	}	358	}
355		359
356	qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;	360	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357	printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D	361	qline->is_longer (0);
358	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);	362	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
359	}	363	}
360	while (p != pend && q > 0);	364	while (p != pend && q > 0);
361		365
362	term_start = total_rows - nrow;	366	term_start = total_rows - nrow;
363	nsaved = term_start - q;	367	top_row = q - term_start;
364		368
365	// make sure all terminal lines exist	369	// make sure all terminal lines exist
366	while (nsaved < 0)	370	while (top_row > 0)
367	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);	371	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
368
369	}	372	}
370	else	373	else
371	{	374	{
372	// if no scrollback exists (yet), wing, instead of wrap	375	// if no scrollback exists (yet), wing, instead of wrap
373		376
…		…
387		390
388	term_start = 0;	391	term_start = 0;
389	}	392	}
390		393
391	#ifdef DEBUG_STRICT //TODO: remove	394	#ifdef DEBUG_STRICT //TODO: remove
392	for (int i = -nsaved; i < nrow; i++)	395	for (int i = top_row; i < nrow; i++)
393	assert (ROW (i).t);	396	assert (ROW (i).t);
394	#endif	397	#endif
395		398
396	free (old_buf);	399	free (old_buf);
397	delete old_ta;	400	delete old_ta;
…		…
411		414
412	for (int col = ncol; col--; )	415	for (int col = ncol; col--; )
413	tabs [col] = col % TABSIZE == 0;	416	tabs [col] = col % TABSIZE == 0;
414		417
415	tt_winch ();	418	tt_winch ();
		419
		420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416	}	421	}
417		422
418	/* ------------------------------------------------------------------------- */	423	/* ------------------------------------------------------------------------- */
419	/*	424	/*
420	* Free everything. That way malloc debugging can find leakage.	425	* Free everything. That way malloc debugging can find leakage.
…		…
426	delete ralloc; ralloc = 0;	431	delete ralloc; ralloc = 0;
427		432
428	free (row_buf);	433	free (row_buf);
429	free (swap_buf);	434	free (swap_buf);
430	free (drawn_buf);	435	free (drawn_buf);
431	free (temp_buf);
432	free (tabs);	436	free (tabs);
433		437
434	row_buf = 0; // signal that we freed all the arrays	438	row_buf = 0; // signal that we freed all the arrays
435	}	439	}
436		440
…		…
444	scr_release ();	448	scr_release ();
445	prev_nrow = prev_ncol = 0;	449	prev_nrow = prev_ncol = 0;
446	scr_reset ();	450	scr_reset ();
447		451
448	scr_clear (true);	452	scr_clear (true);
449	scr_refresh (SLOW_REFRESH);	453	scr_refresh ();
450	}	454	}
451		455
452	/* ------------------------------------------------------------------------- *	456	/* ------------------------------------------------------------------------- *
453	* PROCESS SCREEN COMMANDS *	457	* PROCESS SCREEN COMMANDS *
454	* ------------------------------------------------------------------------- */	458	* ------------------------------------------------------------------------- */
…		…
524		528
525	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);	529	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
526	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);	530	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
527		531
528	#if NSCREENS	532	#if NSCREENS
529	if (options & Opt_secondaryScreen)	533	if (OPTION (Opt_secondaryScreen))
530	{	534	{
531	num_scr = 0;	535	num_scr = 0;
532		536
533	for (int i = prev_nrow; i--; )	537	for (int i = prev_nrow; i--; )
534	::swap (ROW(i), swap_buf [i]);	538	::swap (ROW(i), swap_buf [i]);
…		…
538	screen.flags |= Screen_VisibleCursor;	542	screen.flags |= Screen_VisibleCursor;
539	swap.flags |= Screen_VisibleCursor;	543	swap.flags |= Screen_VisibleCursor;
540	}	544	}
541	else	545	else
542	#endif	546	#endif
543	if (options & Opt_secondaryScroll)	547	if (OPTION (Opt_secondaryScroll))
544	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	548	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
545		549
546	return scrn;	550	return scrn;
547	}	551	}
548		552
…		…
568	* Change the colour for following text	572	* Change the colour for following text
569	*/	573	*/
570	void	574	void
571	rxvt_term::scr_color (unsigned int color, int fgbg)	575	rxvt_term::scr_color (unsigned int color, int fgbg)
572	{	576	{
573	if (color > maxTermCOLOR)	577	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
574	color = fgbg;	578	color = fgbg;
575		579
576	if (fgbg == Color_fg)	580	if (fgbg == Color_fg)
577	rstyle = SET_FGCOLOR (rstyle, color);	581	rstyle = SET_FGCOLOR (rstyle, color);
578	else	582	else
…		…
609	want_refresh = 1;	613	want_refresh = 1;
610	num_scr += count;	614	num_scr += count;
611		615
612	if (count > 0	616	if (count > 0
613	&& row1 == 0	617	&& row1 == 0
614	&& row2 == nrow - 1
615	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	618	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
616	{	619	{
617	nsaved = min (nsaved + count, saveLines);	620	top_row = max (top_row - count, -saveLines);
		621
		622	// scroll everything up 'count' lines
618	term_start = (term_start + count) % total_rows;	623	term_start = (term_start + count) % total_rows;
619		624
		625	// sever bottommost line
		626	{
		627	line_t &l = ROW(row2 - count);
		628	l.is_longer (0);
		629	l.touch ();
		630	}
		631
		632	// erase newly scrolled-in lines
		633	for (int i = count; i--; )
		634	{
		635	// basically this is a slightly optimized scr_blank_screen_mem
		636	// it is worth the effort on slower machines
		637	line_t &l = ROW(nrow - 1 - i);
		638
		639	scr_blank_line (l, 0, l.l, rstyle);
		640
		641	l.l = 0;
		642	l.f = 0;
		643	}
		644
		645	// now copy lines below the scroll region bottom to the
		646	// bottom of the screen again, so they look as if they
		647	// hadn't moved.
		648	for (int i = nrow; --i > row2; )
		649	{
		650	line_t &l1 = ROW(i - count);
		651	line_t &l2 = ROW(i);
		652
		653	::swap (l1, l2);
		654	l2.touch ();
		655	}
		656
		657	// move and/or clear selection, if any
620	if (selection.op && current_screen == selection.screen)	658	if (selection.op && current_screen == selection.screen)
621	{	659	{
622	selection.beg.row -= count;	660	selection.beg.row -= count;
623	selection.end.row -= count;	661	selection.end.row -= count;
624	selection.mark.row -= count;	662	selection.mark.row -= count;
625		663
626	if (selection.beg.row < -nsaved	664	if (selection.beg.row < top_row
627	|| selection.end.row < -nsaved	665	|| selection.end.row < top_row
628	|| selection.mark.row < -nsaved)	666	|| selection.mark.row < top_row)
629	{	667	{
630	CLEAR_ALL_SELECTION ();	668	CLEAR_ALL_SELECTION ();
631	selection.op = SELECTION_CLEAR;	669	selection.op = SELECTION_CLEAR;
632	}	670	}
633	}	671	}
634		672
635	for (int i = count; i--; )	673	// finally move the view window, if desired
636	{
637	ROW(row2 - i).l = 0;
638	scr_blank_screen_mem (ROW(row2 - i), rstyle);
639	}
640
641	if ((options & Opt_scrollWithBuffer)	674	if (OPTION (Opt_scrollWithBuffer)
642	&& view_start != 0	675	&& view_start != 0
643	&& view_start != saveLines)	676	&& view_start != -saveLines)
644	scr_page (UP, count);	677	scr_page (UP, count);
		678
		679	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
		680	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
645	}	681	}
646	else	682	else
647	{	683	{
648	if (selection.op && current_screen == selection.screen)	684	if (selection.op && current_screen == selection.screen)
649	{	685	{
…		…
673		709
674	int rows = row2 - row1 + 1;	710	int rows = row2 - row1 + 1;
675		711
676	min_it (count, rows);	712	min_it (count, rows);
677		713
		714	line_t *temp_buf = row_buf + total_rows;
		715
678	for (int row = 0; row < rows; row++)	716	for (int row = 0; row < rows; row++)
679	{	717	{
680	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	718	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
681		719
682	if (!IN_RANGE_EXC (row + count, 0, rows))	720	if (!IN_RANGE_EXC (row + count, 0, rows))
…		…
693	/* ------------------------------------------------------------------------- */	731	/* ------------------------------------------------------------------------- */
694	/*	732	/*
695	* Add text given in <str> of length <len> to screen struct	733	* Add text given in <str> of length <len> to screen struct
696	*/	734	*/
697	void	735	void
698	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	736	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
699	{	737	{
700	if (len <= 0) /* sanity */	738	if (len <= 0) /* sanity */
701	return;	739	return;
702		740
703	unsigned char checksel;	741	unsigned char checksel;
704	unicode_t c;	742	unicode_t c;
705	int last_col;	743	int ncol = this->ncol;
706	const unicode_t *strend = str + len;	744	const wchar_t *strend = str + len;
707		745
708	want_refresh = 1;	746	want_refresh = 1;
709	ZERO_SCROLLBACK ();	747	ZERO_SCROLLBACK ();
710	last_col = ncol;
711		748
712	if (nlines > 0)	749	if (minlines > 0)
713	{	750	{
714	nlines += screen.cur.row - screen.bscroll;	751	minlines += screen.cur.row - screen.bscroll;
		752
715	if (nlines > 0	753	if (minlines > 0
716	&& screen.tscroll == 0	754	&& screen.tscroll == 0
717	&& screen.bscroll == (nrow - 1))	755	&& screen.bscroll == nrow - 1)
718	{	756	{
719	/* _at least_ this many lines need to be scrolled */	757	/* _at least_ this many lines need to be scrolled */
720	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	758	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
721	screen.cur.row -= nlines;	759	screen.cur.row -= minlines;
722	}	760	}
723	}	761	}
724		762
725	#ifdef DEBUG_STRICT	763	#ifdef DEBUG_STRICT
726	assert (screen.cur.col < last_col);	764	assert (screen.cur.col < ncol);
727	assert (screen.cur.row < nrow	765	assert (screen.cur.row < nrow
728	&& screen.cur.row >= -nsaved);	766	&& screen.cur.row >= top_row);
729	#endif	767	#endif
730	int row = screen.cur.row;	768	int row = screen.cur.row;
731		769
732	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	770	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
733		771
734	line_t *line = &ROW(row);	772	line_t *line = &ROW(row);
735		773
736	while (str < strend)	774	while (str < strend)
737	{	775	{
738	c = *str++;	776	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
739		777
740	if (c < 0x20)	778	if (c < 0x20)
741	if (c == C0_LF)	779	if (c == C0_LF)
742	{	780	{
743	if (!line->is_longer ()) /* XXX: think about this */
744	max_it (line->l, screen.cur.col);	781	max_it (line->l, screen.cur.col);
745		782
746	screen.flags &= ~Screen_WrapNext;	783	screen.flags &= ~Screen_WrapNext;
747		784
748	if (screen.cur.row == screen.bscroll)	785	if (screen.cur.row == screen.bscroll)
749	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	786	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
753	line = &ROW(row); /* _must_ refresh */	790	line = &ROW(row); /* _must_ refresh */
754	continue;	791	continue;
755	}	792	}
756	else if (c == C0_CR)	793	else if (c == C0_CR)
757	{	794	{
758	if (!line->is_longer ()) /* XXX: think about this */
759	max_it (line->l, screen.cur.col);	795	max_it (line->l, screen.cur.col);
760		796
761	screen.flags &= ~Screen_WrapNext;	797	screen.flags &= ~Screen_WrapNext;
762	screen.cur.col = 0;	798	screen.cur.col = 0;
763	continue;	799	continue;
764	}	800	}
…		…
781	CLEAR_SELECTION ();	817	CLEAR_SELECTION ();
782	}	818	}
783		819
784	if (screen.flags & Screen_WrapNext)	820	if (screen.flags & Screen_WrapNext)
785	{	821	{
786	line->set_is_longer ();
787
788	scr_do_wrap ();	822	scr_do_wrap ();
789		823
		824	line->l = ncol;
		825	line->is_longer (1);
		826
790	row = screen.cur.row;	827	row = screen.cur.row;
791	line = &ROW(row); /* _must_ refresh */	828	line = &ROW(row); /* _must_ refresh */
792	}	829	}
793		830
794	// some utf-8 decoders "decode" surrogate characters: let's fix this.	831	// some utf-8 decoders "decode" surrogate characters: let's fix this.
…		…
799	// do wcwidth before further replacements, as wcwidth might return -1	836	// do wcwidth before further replacements, as wcwidth might return -1
800	// for the line drawing characters below as they might be invalid in the current	837	// for the line drawing characters below as they might be invalid in the current
801	// locale.	838	// locale.
802	int width = c < 0x100 ? 1 : wcwidth (c);	839	int width = c < 0x100 ? 1 : wcwidth (c);
803		840
804	if (charsets[screen.charset] == '0') // DEC SPECIAL	841	if (charsets [screen.charset] == '0') // DEC SPECIAL
805	{	842	{
806	// vt100 special graphics and line drawing	843	// vt100 special graphics and line drawing
807	// 5f-7e standard vt100	844	// 5f-7e standard vt100
808	// 40-5e rxvt extension for extra curses acs chars	845	// 40-5e rxvt extension for extra curses acs chars
809	static uint16_t vt100_0[62] = { // 41 .. 7e	846	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
861	}	898	}
862		899
863	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	900	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
864		901
865	// if the character doesn't fit into the remaining columns...	902	// if the character doesn't fit into the remaining columns...
866	if (screen.cur.col > last_col - width && last_col >= width)	903	if (screen.cur.col > ncol - width && ncol >= width)
867	{	904	{
868	// ...output spaces	905	// ...output spaces
869	c = ' ';	906	c = ' ';
870	// and try the same character next loop iteration	907	// and try the same character next loop iteration
871	--str;	908	--str;
872	}	909	}
873		910
		911	line->touch ();
		912
874	do	913	do
875	{	914	{
876	line->t[screen.cur.col] = c;	915	line->t[screen.cur.col] = c;
877	line->r[screen.cur.col] = rend;	916	line->r[screen.cur.col] = rend;
878		917
879	if (screen.cur.col < last_col - 1)	918	if (screen.cur.col < ncol - 1)
880	screen.cur.col++;	919	screen.cur.col++;
881	else	920	else
882	{	921	{
883	line->l = last_col;	922	line->l = ncol;
884	if (screen.flags & Screen_Autowrap)	923	if (screen.flags & Screen_Autowrap)
885	screen.flags |= Screen_WrapNext;	924	screen.flags |= Screen_WrapNext;
886	break;	925	break;
887	}	926	}
888		927
…		…
890	}	929	}
891	while (--width > 0);	930	while (--width > 0);
892		931
893	// pad with spaces when overwriting wide character with smaller one	932	// pad with spaces when overwriting wide character with smaller one
894	if (!width)	933	if (!width)
		934	{
		935	line->touch ();
		936
895	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)	937	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
896	{	938	{
897	line->t[c] = ' ';	939	line->t[c] = ' ';
898	line->r[c] = rend;	940	line->r[c] = rend;
899	}	941	}
		942	}
900	}	943	}
901	else // width == 0	944	else // width == 0
902	{	945	{
903	#if ENABLE_COMBINING	946	#if ENABLE_COMBINING
904	// handle combining characters	947	// handle combining characters
905	// we just tag the accent on the previous on-screen character.	948	// we just tag the accent on the previous on-screen character.
906	// this is arguably not correct, but also arguably not wrong.	949	// this is arguably not correct, but also arguably not wrong.
907	// we don't handle double-width characters nicely yet.	950	// we don't handle double-width characters nicely yet.
		951	line_t *linep;
908	text_t *tp;	952	text_t *tp;
909	rend_t *rp;	953	rend_t *rp;
910		954
911	if (screen.cur.col > 0)	955	if (screen.cur.col > 0)
912	{	956	{
		957	linep = line;
913	tp = line->t + screen.cur.col - 1;	958	tp = line->t + screen.cur.col - 1;
914	rp = line->r + screen.cur.col - 1;	959	rp = line->r + screen.cur.col - 1;
915
916	while (*tp == NOCHAR && tp > line->t)
917	tp--, rp--;
918	}	960	}
919	else if (screen.cur.row > 0	961	else if (screen.cur.row > 0
920	&& ROW(screen.cur.row - 1).is_longer ())	962	&& ROW(screen.cur.row - 1).is_longer ())
921	{	963	{
922	line_t *line = &ROW(screen.cur.row - 1);	964	linep = &ROW(screen.cur.row - 1);
923
924	tp = line->t + last_col - 1;	965	tp = line->t + ncol - 1;
925	rp = line->r + last_col - 1;	966	rp = line->r + ncol - 1;
926
927	while (*tp == NOCHAR && tp > line->t)
928	tp--, rp--;
929	}	967	}
930	else	968	else
931	continue;	969	continue;
		970
		971	linep->touch ();
		972
		973	while (*tp == NOCHAR && tp > linep->t)
		974	tp--, rp--;
932		975
933	// first try to find a precomposed character	976	// first try to find a precomposed character
934	unicode_t n = rxvt_compose (*tp, c);	977	unicode_t n = rxvt_compose (*tp, c);
935	if (n == NOCHAR)	978	if (n == NOCHAR)
936	n = rxvt_composite.compose (*tp, c);	979	n = rxvt_composite.compose (*tp, c);
…		…
939	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	982	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940	#endif	983	#endif
941	}	984	}
942	}	985	}
943		986
944	if (!line->is_longer ()) /* XXX: think about this */
945	max_it (line->l, screen.cur.col);	987	max_it (line->l, screen.cur.col);
946		988
947	#ifdef DEBUG_STRICT	989	#ifdef DEBUG_STRICT
948	assert (screen.cur.row >= 0);	990	assert (screen.cur.row >= 0);
949	#endif	991	#endif
950	}	992	}
…		…
1000		1042
1001	for (; ++i < ncol; )	1043	for (; ++i < ncol; )
1002	if (tabs[i])	1044	if (tabs[i])
1003	{	1045	{
1004	x = i;	1046	x = i;
		1047
1005	if (!--count)	1048	if (!--count)
1006	break;	1049	break;
1007	}	1050	}
1008	else	1051	else
1009	ht &= l.t[i] == ' '	1052	ht &= l.t[i] == ' '
…		…
1012	if (count)	1055	if (count)
1013	x = ncol - 1;	1056	x = ncol - 1;
1014		1057
1015	// store horizontal tab commands as characters inside the text	1058	// store horizontal tab commands as characters inside the text
1016	// buffer so they can be selected and pasted.	1059	// buffer so they can be selected and pasted.
1017	if (ht && options & Opt_pastableTabs)	1060	if (ht && OPTION (Opt_pastableTabs))
1018	{	1061	{
1019	base_rend = SET_FONT (base_rend, 0);	1062	base_rend = SET_FONT (base_rend, 0);
1020		1063
1021	if (!l.is_longer ()) /* XXX: think about this */	1064	l.touch (x);
1022	max_it (l.l, x);
1023		1065
1024	i = screen.cur.col;	1066	i = screen.cur.col;
1025		1067
1026	l.t[i] = '\t';	1068	l.t[i] = '\t';
1027	l.r[i] = base_rend;	1069	l.r[i] = base_rend;
…		…
1081	{	1123	{
1082	if (screen.cur.col < ncol - 1)	1124	if (screen.cur.col < ncol - 1)
1083	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1125	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1084	else	1126	else
1085	{	1127	{
1086	if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN	1128	line_t &l = ROW(screen.cur.row);
1087	ROW(screen.cur.row).l = ncol;	1129
		1130	l.touch ();
		1131	l.is_longer (0);
1088		1132
1089	scr_gotorc (0, 0, R_RELATIVE);	1133	scr_gotorc (0, 0, R_RELATIVE);
1090	scr_insdel_chars (1, DELETE);	1134	scr_insdel_chars (1, DELETE);
1091	scr_gotorc (0, ncol - 1, R_RELATIVE);	1135	scr_gotorc (0, ncol - 1, R_RELATIVE);
1092	}	1136	}
…		…
1183	ZERO_SCROLLBACK ();	1227	ZERO_SCROLLBACK ();
1184		1228
1185	selection_check (1);	1229	selection_check (1);
1186		1230
1187	line_t &line = ROW(screen.cur.row);	1231	line_t &line = ROW(screen.cur.row);
		1232
		1233	line.touch ();
		1234	line.is_longer (0);
1188		1235
1189	switch (mode)	1236	switch (mode)
1190	{	1237	{
1191	case 0: /* erase to end of line */	1238	case 0: /* erase to end of line */
1192	col = screen.cur.col;	1239	col = screen.cur.col;
…		…
1278	CLEAR_ROWS (row, num);	1325	CLEAR_ROWS (row, num);
1279	}	1326	}
1280	else	1327	else
1281	{	1328	{
1282	ren = rstyle & (RS_fgMask | RS_bgMask);	1329	ren = rstyle & (RS_fgMask | RS_bgMask);
1283	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1330	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1284	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1331	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1285	ERASE_ROWS (row, num);	1332	ERASE_ROWS (row, num);
1286	gcvalue.foreground = pix_colors[Color_fg];	1333	gcvalue.foreground = pix_colors[Color_fg];
1287	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1334	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1288	}	1335	}
1289		1336
1290	for (; num--; row++)	1337	for (; num--; row++)
1291	{	1338	{
1292	ROW (row).l = 0;
1293	scr_blank_screen_mem (ROW (row), rstyle);	1339	scr_blank_screen_mem (ROW(row), rstyle);
1294	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1340	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1295	}	1341	}
1296	}	1342	}
1297		1343
1298	#if ENABLE_FRILLS	1344	#if ENABLE_FRILLS
…		…
1300	rxvt_term::scr_erase_savelines ()	1346	rxvt_term::scr_erase_savelines ()
1301	{	1347	{
1302	want_refresh = 1;	1348	want_refresh = 1;
1303	ZERO_SCROLLBACK ();	1349	ZERO_SCROLLBACK ();
1304		1350
1305	nsaved = 0;	1351	top_row = 0;
1306	}	1352	}
1307	#endif	1353	#endif
1308		1354
1309	/* ------------------------------------------------------------------------- */	1355	/* ------------------------------------------------------------------------- */
1310	/*	1356	/*
…		…
1331	rend_t *r1 = line.r;	1377	rend_t *r1 = line.r;
1332		1378
1333	for (int j = ncol; j--; )	1379	for (int j = ncol; j--; )
1334	*r1++ = fs;	1380	*r1++ = fs;
1335		1381
1336	line.l = ncol; /* make the `E's selectable */	1382	line.is_longer (0);
		1383	line.touch (ncol);
1337	}	1384	}
1338	}	1385	}
1339		1386
1340	/* ------------------------------------------------------------------------- */	1387	/* ------------------------------------------------------------------------- */
1341	/*	1388	/*
…		…
1389	min_it (count, ncol - screen.cur.col);	1436	min_it (count, ncol - screen.cur.col);
1390		1437
1391	row = screen.cur.row;	1438	row = screen.cur.row;
1392		1439
1393	line_t *line = &ROW(row);	1440	line_t *line = &ROW(row);
		1441
		1442	line->touch ();
		1443	line->is_longer (0);
1394		1444
1395	switch (insdel)	1445	switch (insdel)
1396	{	1446	{
1397	case INSERT:	1447	case INSERT:
1398	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1448	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1399	{	1449	{
1400	line->t[col] = line->t[col - count];	1450	line->t[col] = line->t[col - count];
1401	line->r[col] = line->r[col - count];	1451	line->r[col] = line->r[col - count];
1402	}	1452	}
1403		1453
1404	if (!line->is_longer ())	1454	line->l = min (line->l + count, ncol);
1405	{
1406	line->l += count;
1407	min_it (line->l, ncol);
1408	}
1409		1455
1410	if (selection.op && current_screen == selection.screen	1456	if (selection.op && current_screen == selection.screen
1411	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1457	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1412	{	1458	{
1413	if (selection.end.row != screen.cur.row	1459	if (selection.end.row != screen.cur.row
…		…
1426		1472
1427	case ERASE:	1473	case ERASE:
1428	screen.cur.col += count; /* don't worry if > ncol */	1474	screen.cur.col += count; /* don't worry if > ncol */
1429	selection_check (1);	1475	selection_check (1);
1430	screen.cur.col -= count;	1476	screen.cur.col -= count;
		1477
		1478	line->l = max (line->l - count, 0);
1431	scr_blank_line (*line, screen.cur.col, count, rstyle);	1479	scr_blank_line (*line, screen.cur.col, count, rstyle);
1432	break;	1480	break;
1433		1481
1434	case DELETE:	1482	case DELETE:
1435	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1483	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1438	{	1486	{
1439	line->t[col] = line->t[col + count];	1487	line->t[col] = line->t[col + count];
1440	line->r[col] = line->r[col + count];	1488	line->r[col] = line->r[col + count];
1441	}	1489	}
1442		1490
		1491	line->l = max (line->l - count, 0);
1443	scr_blank_line (*line, ncol - count, count, tr);	1492	scr_blank_line (*line, ncol - count, count, tr);
1444
1445	if (line->is_longer ()) /* break line continuation */
1446	line->l = ncol;
1447
1448	line->l = max (line->l - count, 0);
1449		1493
1450	if (selection.op && current_screen == selection.screen	1494	if (selection.op && current_screen == selection.screen
1451	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1495	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1452	{	1496	{
1453	if (selection.end.row != screen.cur.row	1497	if (selection.end.row != screen.cur.row
…		…
1565	rxvt_term::scr_set_tab (int mode)	1609	rxvt_term::scr_set_tab (int mode)
1566	{	1610	{
1567	if (mode < 0)	1611	if (mode < 0)
1568	memset (tabs, 0, ncol * sizeof (char));	1612	memset (tabs, 0, ncol * sizeof (char));
1569	else if (screen.cur.col < ncol)	1613	else if (screen.cur.col < ncol)
1570	tabs[screen.cur.col] = (mode ? 1 : 0);	1614	tabs [screen.cur.col] = !!mode;
1571	}	1615	}
1572		1616
1573	/* ------------------------------------------------------------------------- */	1617	/* ------------------------------------------------------------------------- */
1574	/*	1618	/*
1575	* Set reverse/normal video	1619	* Set reverse/normal video
…		…
1587	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1631	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1588	#if XPM_BACKGROUND	1632	#if XPM_BACKGROUND
1589	if (bgPixmap.pixmap == None)	1633	if (bgPixmap.pixmap == None)
1590	#endif	1634	#endif
1591	#if TRANSPARENT	1635	#if TRANSPARENT
1592	if (! (options & Opt_transparent) || am_transparent == 0)	1636	if (! OPTION (Opt_transparent) || am_transparent == 0)
1593	#endif	1637	#endif
1594	XSetWindowBackground (display->display, vt,	1638	XSetWindowBackground (display->display, vt,
1595	pix_colors[Color_bg]);	1639	pix_colors[Color_bg]);
1596		1640
1597	gcvalue.foreground = pix_colors[Color_fg];	1641	gcvalue.foreground = pix_colors[Color_fg];
…		…
1622	* Set font style	1666	* Set font style
1623	*/	1667	*/
1624	void	1668	void
1625	rxvt_term::set_font_style ()	1669	rxvt_term::set_font_style ()
1626	{	1670	{
		1671	#if 0
1627	switch (charsets[screen.charset])	1672	switch (charsets [screen.charset])
1628	{	1673	{
1629	case '0': /* DEC Special Character & Line Drawing Set */	1674	case '0': /* DEC Special Character & Line Drawing Set */
1630	break;	1675	break;
1631	case 'A': /* United Kingdom (UK) */	1676	case 'A': /* United Kingdom (UK) */
1632	break;	1677	break;
…		…
1639	case 'C': /* Finnish character set */	1684	case 'C': /* Finnish character set */
1640	break;	1685	break;
1641	case 'K': /* German character set */	1686	case 'K': /* German character set */
1642	break;	1687	break;
1643	}	1688	}
		1689	#endif
1644	}	1690	}
1645		1691
1646	/* ------------------------------------------------------------------------- */	1692	/* ------------------------------------------------------------------------- */
1647	/*	1693	/*
1648	* Choose a font	1694	* Choose a font
…		…
1744	}	1790	}
1745		1791
1746	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1792	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1747	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1793	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1748		1794
		1795	num_scr_allow = 0;
		1796
1749	if (refresh)	1797	if (refresh)
1750	scr_refresh (SLOW_REFRESH);	1798	scr_refresh ();
1751	}	1799	}
1752		1800
1753	/* ------------------------------------------------------------------------- */	1801	/* ------------------------------------------------------------------------- */
1754	/*	1802	/*
1755	* Refresh the entire screen	1803	* Refresh the entire screen
…		…
1763	/* ------------------------------------------------------------------------- */	1811	/* ------------------------------------------------------------------------- */
1764	/*	1812	/*
1765	* Move the display so that the line represented by scrollbar value Y is at	1813	* Move the display so that the line represented by scrollbar value Y is at
1766	* the top of the screen	1814	* the top of the screen
1767	*/	1815	*/
1768	int	1816	void
1769	rxvt_term::scr_move_to (int y, int len)	1817	rxvt_term::scr_move_to (int y, int len)
1770	{	1818	{
1771	long p = 0;	1819	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1772	unsigned int oldviewstart;
1773
1774	oldviewstart = view_start;
1775
1776	if (y < len)
1777	{
1778	p = (nrow + nsaved) * (len - y) / len;
1779	p -= (long) (nrow - 1);
1780	p = max (p, 0);
1781	}
1782
1783	view_start = (unsigned int)min (p, nsaved);
1784
1785	return scr_changeview (oldviewstart);
1786	}	1820	}
1787		1821
1788	/* ------------------------------------------------------------------------- */	1822	/* ------------------------------------------------------------------------- */
1789	/*	1823	/*
1790	* Page the screen up/down nlines	1824	* Page the screen up/down nlines
1791	* direction should be UP or DN	1825	* direction should be UP or DN
1792	*/	1826	*/
1793	int	1827	bool
1794	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1828	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1795	{	1829	{
1796	int n;	1830	int new_view_start =
1797	unsigned int oldviewstart;
1798
1799	oldviewstart = view_start;
1800
1801	if (direction == UP)
1802	{
1803	n = view_start + nlines;
1804	view_start = min (n, nsaved);
1805	}
1806	else
1807	{
1808	n = view_start - nlines;	1831	direction == UP ? view_start - nlines
1809	view_start = max (n, 0);	1832	: view_start + nlines;
1810	}
1811		1833
1812	return scr_changeview (oldviewstart);	1834	return scr_changeview (new_view_start);
1813	}	1835	}
1814		1836
1815	int	1837	bool
1816	rxvt_term::scr_changeview (unsigned int oldviewstart)	1838	rxvt_term::scr_changeview (int new_view_start)
1817	{	1839	{
		1840	clamp_it (new_view_start, top_row, 0);
		1841
1818	if (view_start != oldviewstart)	1842	if (new_view_start == view_start)
1819	{	1843	return false;
		1844
		1845	num_scr += new_view_start - view_start;
		1846	view_start = new_view_start;
1820	want_refresh = 1;	1847	want_refresh = 1;
1821	num_scr -= (view_start - oldviewstart);
1822	}
1823		1848
1824	return (int) (view_start - oldviewstart);	1849	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
		1850
		1851	return true;
1825	}	1852	}
1826		1853
1827	/* ------------------------------------------------------------------------- */	1854	/* ------------------------------------------------------------------------- */
1828	void	1855	void
1829	rxvt_term::scr_bell ()	1856	rxvt_term::scr_bell ()
1830	{	1857	{
1831	#ifndef NO_BELL	1858	#ifndef NO_BELL
1832		1859
1833	# ifndef NO_MAPALERT	1860	# ifndef NO_MAPALERT
1834	# ifdef MAPALERT_OPTION	1861	# ifdef MAPALERT_OPTION
1835	if (options & Opt_mapAlert)	1862	if (OPTION (Opt_mapAlert))
1836	# endif	1863	# endif
1837	XMapWindow (display->display, parent[0]);	1864	XMapWindow (display->display, parent[0]);
1838	# endif	1865	# endif
1839		1866
1840	if (options & Opt_visualBell)	1867	if (OPTION (Opt_visualBell))
1841	{	1868	{
1842	scr_rvideo_mode (!rvideo); /* refresh also done */	1869	scr_rvideo_mode (!rvideo); /* refresh also done */
		1870	display->flush ();
1843	rxvt_usleep (VISUAL_BELL_DURATION);	1871	rxvt_usleep (VISUAL_BELL_DURATION);
1844	scr_rvideo_mode (!rvideo); /* refresh also done */	1872	scr_rvideo_mode (!rvideo); /* refresh also done */
1845	}	1873	}
1846	else	1874	else
1847	XBell (display->display, 0);	1875	XBell (display->display, 0);
…		…
1861	if ((fd = popen_printer ()) == NULL)	1889	if ((fd = popen_printer ()) == NULL)
1862	return;	1890	return;
1863		1891
1864	if (fullhist)	1892	if (fullhist)
1865	{	1893	{
1866	nrows = nrow + nsaved;	1894	nrows = nrow - top_row;
1867	row_start = -nsaved;	1895	row_start = top_row;
1868	}	1896	}
1869	else	1897	else
1870	{	1898	{
1871	nrows = nrow;	1899	nrows = nrow;
1872	row_start = -view_start;	1900	row_start = view_start;
1873	}	1901	}
1874		1902
1875	wctomb (0, 0);	1903	wctomb (0, 0);
1876		1904
1877	for (int r1 = 0; r1 < nrows; r1++)	1905	for (int r1 = 0; r1 < nrows; r1++)
…		…
1909	* Refresh the screen	1937	* Refresh the screen
1910	* drawn_text/drawn_rend contain the screen information before the update.	1938	* drawn_text/drawn_rend contain the screen information before the update.
1911	* screen.text/screen.rend contain what the screen will change to.	1939	* screen.text/screen.rend contain what the screen will change to.
1912	*/	1940	*/
1913	void	1941	void
1914	rxvt_term::scr_refresh (unsigned char refresh_type)	1942	rxvt_term::scr_refresh ()
1915	{	1943	{
1916	unsigned char must_clear, /* use draw_string not draw_image_string */	1944	unsigned char must_clear, /* use draw_string not draw_image_string */
1917	showcursor; /* show the cursor */	1945	showcursor; /* show the cursor */
1918	int16_t col, row, /* column/row we're processing */	1946	int16_t col, row, /* column/row we're processing */
1919	ocrow; /* old cursor row */	1947	ocrow; /* old cursor row */
…		…
1936		1964
1937	#if XPM_BACKGROUND	1965	#if XPM_BACKGROUND
1938	must_clear |= bgPixmap.pixmap != None;	1966	must_clear |= bgPixmap.pixmap != None;
1939	#endif	1967	#endif
1940	#if TRANSPARENT	1968	#if TRANSPARENT
1941	must_clear |= (options & Opt_transparent) && am_transparent;	1969	must_clear |= OPTION (Opt_transparent) && am_transparent;
1942	#endif	1970	#endif
1943	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1971	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1944		1972
1945	/*	1973	/*
1946	* B: reverse any characters which are selected	1974	* B: reverse any characters which are selected
…		…
1970		1998
1971	crp = &ROW(screen.cur.row).r[col];	1999	crp = &ROW(screen.cur.row).r[col];
1972		2000
1973	if (showcursor && focus)	2001	if (showcursor && focus)
1974	{	2002	{
1975	if (options & Opt_cursorUnderline)	2003	if (OPTION (Opt_cursorUnderline))
1976	*crp ^= RS_Uline;	2004	*crp ^= RS_Uline;
1977	else	2005	else
1978	{	2006	{
1979	*crp ^= RS_RVid;	2007	*crp ^= RS_RVid;
1980		2008
…		…
1982	cc1 = *crp & (RS_fgMask | RS_bgMask);	2010	cc1 = *crp & (RS_fgMask | RS_bgMask);
1983	if (ISSET_PIXCOLOR (Color_cursor))	2011	if (ISSET_PIXCOLOR (Color_cursor))
1984	ccol1 = Color_cursor;	2012	ccol1 = Color_cursor;
1985	else	2013	else
1986	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2014	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1987	ccol1 = GET_FGCOLOR (rstyle);	2015	ccol1 = fgcolor_of (rstyle);
1988	#else	2016	#else
1989	ccol1 = Color_fg;	2017	ccol1 = Color_fg;
1990	#endif	2018	#endif
1991	if (ISSET_PIXCOLOR (Color_cursor2))	2019	if (ISSET_PIXCOLOR (Color_cursor2))
1992	ccol2 = Color_cursor2;	2020	ccol2 = Color_cursor2;
1993	else	2021	else
1994	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2022	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1995	ccol2 = GET_BGCOLOR (rstyle);	2023	ccol2 = bgcolor_of (rstyle);
1996	#else	2024	#else
1997	ccol2 = Color_bg;	2025	ccol2 = Color_bg;
1998	#endif	2026	#endif
1999	*crp = SET_FGCOLOR (*crp, ccol1);	2027	*crp = SET_FGCOLOR (*crp, ccol1);
2000	*crp = SET_BGCOLOR (*crp, ccol2);	2028	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
2005		2033
2006	/* make sure no outline cursor is left around */	2034	/* make sure no outline cursor is left around */
2007	setoldcursor = 0;	2035	setoldcursor = 0;
2008	if (ocrow != -1)	2036	if (ocrow != -1)
2009	{	2037	{
2010	if (screen.cur.row + view_start != ocrow	2038	if (screen.cur.row - view_start != ocrow
2011	|| screen.cur.col != oldcursor.col)	2039	|| screen.cur.col != oldcursor.col)
2012	{	2040	{
2013	if (ocrow < nrow	2041	if (ocrow < nrow
2014	&& oldcursor.col < ncol)	2042	&& oldcursor.col < ncol)
2015	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2043	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
2023	else if (!focus)	2051	else if (!focus)
2024	setoldcursor = 1;	2052	setoldcursor = 1;
2025		2053
2026	if (setoldcursor)	2054	if (setoldcursor)
2027	{	2055	{
2028	if (screen.cur.row + view_start >= nrow)	2056	if (screen.cur.row - view_start >= nrow)
2029	oldcursor.row = -1;	2057	oldcursor.row = -1;
2030	else	2058	else
2031	{	2059	{
2032	oldcursor.row = screen.cur.row + view_start;	2060	oldcursor.row = screen.cur.row - view_start;
2033	oldcursor.col = screen.cur.col;	2061	oldcursor.col = screen.cur.col;
2034	}	2062	}
2035	}	2063	}
2036	}	2064	}
2037		2065
		2066	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038	#if ENABLE_OVERLAY	2067	#if ENABLE_OVERLAY
2039	scr_swap_overlay ();	2068	scr_swap_overlay ();
2040	#endif	2069	#endif
2041		2070
2042	#ifndef NO_SLOW_LINK_SUPPORT	2071	#ifndef NO_SLOW_LINK_SUPPORT
2043	/*	2072	/*
2044	* D: CopyArea pass - very useful for slower links	2073	* D: CopyArea pass - very useful for slower links
2045	* This has been deliberately kept simple.	2074	* This has been deliberately kept simple.
2046	*/	2075	*/
2047	i = num_scr;
2048	if (!display->is_local	2076	if (!display->is_local
2049	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2077	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2050	&& abs (num_scr) < nrow && !must_clear)	2078	&& abs (num_scr) < nrow && !must_clear)
2051	{	2079	{
2052	int16_t nits;	2080	int16_t nits;
2053	int j;	2081	int j;
2054	int len, wlen;	2082	int len, wlen;
		2083	dLocal (int, num_scr);
2055		2084
2056	j = nrow;	2085	j = nrow;
2057	wlen = len = -1;	2086	wlen = len = -1;
2058	row = i > 0 ? 0 : j - 1;	2087	row = i > 0 ? 0 : j - 1;
2059	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2088	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2060	{	2089	{
2061	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2090	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2062	{	2091	{
2063	line_t s = ROW(row - view_start);	2092	line_t s = ROW(view_start + row);
2064	line_t d = drawn_buf[row];	2093	line_t d = drawn_buf[row];
2065	line_t d2 = drawn_buf[row + i];	2094	line_t d2 = drawn_buf[row + i];
2066		2095
2067	for (nits = 0, col = ncol; col--; )	2096	for (nits = 0, col = ncol; col--; )
2068	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2097	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2092	if (wlen < len)	2121	if (wlen < len)
2093	::swap (wlen, len);	2122	::swap (wlen, len);
2094		2123
2095	XCopyArea (display->display, vt, vt,	2124	XCopyArea (display->display, vt, vt,
2096	gc, 0, Row2Pixel (len + i),	2125	gc, 0, Row2Pixel (len + i),
2097	(unsigned int)TermWin_TotalWidth (),	2126	(unsigned int)this->width,
2098	(unsigned int)Height2Pixel (wlen - len + 1),	2127	(unsigned int)Height2Pixel (wlen - len + 1),
2099	0, Row2Pixel (len));	2128	0, Row2Pixel (len));
2100	len = -1;	2129	len = -1;
2101	}	2130	}
2102	}	2131	}
…		…
2106	/*	2135	/*
2107	* E: main pass across every character	2136	* E: main pass across every character
2108	*/	2137	*/
2109	for (row = 0; row < nrow; row++)	2138	for (row = 0; row < nrow; row++)
2110	{	2139	{
2111	text_t *stp = ROW(row - view_start).t;	2140	text_t *stp = ROW(view_start + row).t;
2112	rend_t *srp = ROW(row - view_start).r;	2141	rend_t *srp = ROW(view_start + row).r;
2113	text_t *dtp = drawn_buf[row].t;	2142	text_t *dtp = drawn_buf[row].t;
2114	rend_t *drp = drawn_buf[row].r;	2143	rend_t *drp = drawn_buf[row].r;
2115		2144
2116	/*	2145	/*
2117	* E2: OK, now the real pass	2146	* E2: OK, now the real pass
…		…
2181	count++, i--;	2210	count++, i--;
2182		2211
2183	/*	2212	/*
2184	* Determine the attributes for the string	2213	* Determine the attributes for the string
2185	*/	2214	*/
2186	int fore = GET_FGCOLOR (rend); // desired foreground	2215	int fore = fgcolor_of (rend); // desired foreground
2187	int back = GET_BGCOLOR (rend); // desired background	2216	int back = bgcolor_of (rend); // desired background
2188		2217
2189	// only do special processing if any attributes are set, which is rare	2218	// only do special processing if any attributes are set, which is unlikely
2190	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2219	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2191	{	2220	{
2192	#if ENABLE_STYLES	2221	#if ENABLE_STYLES
2193	// force redraw after "careful" characters to avoid pixel droppings	2222	// force redraw after "careful" characters to avoid pixel droppings
2194	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2223	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2305	} /* for (row....) */	2334	} /* for (row....) */
2306		2335
2307	#if ENABLE_OVERLAY	2336	#if ENABLE_OVERLAY
2308	scr_swap_overlay ();	2337	scr_swap_overlay ();
2309	#endif	2338	#endif
		2339	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2310		2340
2311	/*	2341	/*
2312	* G: cleanup cursor and display outline cursor if necessary	2342	* G: cleanup cursor and display outline cursor if necessary
2313	*/	2343	*/
2314	if (showcursor)	2344	if (showcursor)
2315	{	2345	{
2316	if (focus)	2346	if (focus)
2317	{	2347	{
2318	if (options & Opt_cursorUnderline)	2348	if (OPTION (Opt_cursorUnderline))
2319	*crp ^= RS_Uline;	2349	*crp ^= RS_Uline;
2320	else	2350	else
2321	{	2351	{
2322	*crp ^= RS_RVid;	2352	*crp ^= RS_RVid;
2323	#ifndef NO_CURSORCOLOR	2353	#ifndef NO_CURSORCOLOR
…		…
2353	/*	2383	/*
2354	* H: cleanup selection	2384	* H: cleanup selection
2355	*/	2385	*/
2356	scr_reverse_selection ();	2386	scr_reverse_selection ();
2357		2387
2358	if (refresh_type & SMOOTH_REFRESH)
2359	XFlush (display->display);
2360
2361	num_scr = 0;	2388	num_scr = 0;
2362	num_scr_allow = 1;	2389	num_scr_allow = 1;
2363	}	2390	}
2364		2391
2365	void	2392	void
2366	rxvt_term::scr_remap_chars (const line_t &l)	2393	rxvt_term::scr_remap_chars (line_t &l)
2367	{	2394	{
2368	if (!l.t)	2395	if (!l.t)
2369	return;	2396	return;
		2397
		2398	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2370		2399
2371	for (int i = ncol; i--; )	2400	for (int i = ncol; i--; )
2372	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2401	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2373	}	2402	}
2374		2403
…		…
2427		2456
2428	if (really)	2457	if (really)
2429	XClearWindow (display->display, vt);	2458	XClearWindow (display->display, vt);
2430	}	2459	}
2431		2460
		2461	void
		2462	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
		2463	{
		2464	int view_end = view_start + nrow;
		2465	int row, col;
		2466
		2467	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
		2468	{
		2469	text_t *stp = ROW(row).t;
		2470	rend_t *srp = ROW(row).r;
		2471
		2472	for (col = beg_col; col < end_col; col++)
		2473	srp[col] ^= rstyle1;
		2474
		2475	while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2476	srp[col] ^= rstyle2;
		2477
		2478	if (++col < end_col)
		2479	srp[col] ^= rstyle2;
		2480	}
		2481	}
		2482
		2483	void
		2484	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
		2485	{
		2486	int view_end = view_start + nrow;
		2487	int row, col;
		2488
		2489	if (beg_row >= view_start)
		2490	{
		2491	col = beg_col;
		2492	row = beg_row;
		2493	}
		2494	else
		2495	{
		2496	col = 0;
		2497	row = view_start;
		2498	}
		2499
		2500	for (; row < min (end_row, view_end); row++, col = 0)
		2501	for (rend_t *srp = ROW(row).r; col < ncol; col++)
		2502	srp[col] ^= rstyle;
		2503
		2504	if (row == end_row)
		2505	for (rend_t *srp = ROW(row).r; col < end_col; col++)
		2506	srp[col] ^= rstyle;
		2507	}
		2508
2432	/* ------------------------------------------------------------------------- */	2509	/* ------------------------------------------------------------------------- */
2433	void	2510	void
2434	rxvt_term::scr_reverse_selection ()	2511	rxvt_term::scr_reverse_selection ()
2435	{	2512	{
2436	if (selection.op	2513	if (selection.op
2437	&& current_screen == selection.screen	2514	&& current_screen == selection.screen
2438	&& selection.end.row >= -view_start)	2515	&& selection.end.row >= view_start)
2439	{	2516	{
2440	int view_end = -view_start + nrow;
2441	int row, col;
2442
2443	#if ENABLE_FRILLS	2517	#if ENABLE_FRILLS
2444	if (selection.rect)	2518	if (selection.rect)
2445	{	2519	scr_xor_rect (selection.beg.row, selection.beg.col,
2446	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2520	selection.end.row, selection.end.col,
2447	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2521	RS_RVid, RS_RVid | RS_Uline);
2448	srp[col] ^= RS_RVid;
2449	}
2450	else	2522	else
2451	#endif	2523	#endif
2452	{	2524	scr_xor_span (selection.beg.row, selection.beg.col,
2453	if (selection.beg.row >= -view_start)	2525	selection.end.row, selection.end.col,
2454	{	2526	RS_RVid);
2455	col = selection.beg.col;
2456	row = selection.beg.row;
2457	}
2458	else
2459	{
2460	col = 0;
2461	row = -view_start;
2462	}
2463
2464	for (; row < min (selection.end.row, view_end); row++, col = 0)
2465	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2466	srp[col] ^= RS_RVid;
2467
2468	if (row == selection.end.row)
2469	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2470	srp[col] ^= RS_RVid;
2471	}
2472	}	2527	}
2473	}	2528	}
2474		2529
2475	/* ------------------------------------------------------------------------- */	2530	/* ------------------------------------------------------------------------- */
2476	/*	2531	/*
…		…
2514		2569
2515	if (!selection.op)	2570	if (!selection.op)
2516	return;	2571	return;
2517		2572
2518	pos.row = pos.col = 0;	2573	pos.row = pos.col = 0;
2519	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2574	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2520	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2575	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2521	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2576	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2522	|| (check_more == 1	2577	|| (check_more == 1
2523	&& current_screen == selection.screen	2578	&& current_screen == selection.screen
2524	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2579	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2525	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2580	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2526	|| (check_more == 2	2581	|| (check_more == 2
…		…
2537	/* ------------------------------------------------------------------------- */	2592	/* ------------------------------------------------------------------------- */
2538	/*	2593	/*
2539	* Paste a selection direct to the command fd	2594	* Paste a selection direct to the command fd
2540	*/	2595	*/
2541	void	2596	void
2542	rxvt_term::paste (unsigned char *data, unsigned int len)	2597	rxvt_term::paste (char *data, unsigned int len)
2543	{	2598	{
2544	/* convert normal newline chars into common keyboard Return key sequence */	2599	/* convert normal newline chars into common keyboard Return key sequence */
2545	for (unsigned int i = 0; i < len; i++)	2600	for (unsigned int i = 0; i < len; i++)
2546	if (data[i] == C0_LF)	2601	if (data[i] == C0_LF)
2547	data[i] = C0_CR;	2602	data[i] = C0_CR;
…		…
2691	{	2746	{
2692	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2747	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2693	char *s = rxvt_wcstombs (w);	2748	char *s = rxvt_wcstombs (w);
2694	free (w);	2749	free (w);
2695	// TODO: strlen == only the first element will be converted. well...	2750	// TODO: strlen == only the first element will be converted. well...
2696	paste ((unsigned char *)s, strlen (s));	2751	paste (s, strlen (s));
2697	free (s);	2752	free (s);
2698	}	2753	}
2699	else	2754	else
2700	#endif	2755	#endif
2701	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2756	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2702	&& cl)	2757	&& cl)
2703	{	2758	{
2704	for (int i = 0; i < cr; i++)	2759	for (int i = 0; i < cr; i++)
2705	paste ((unsigned char *)cl[i], strlen (cl[i]));	2760	paste (cl[i], strlen (cl[i]));
2706		2761
2707	XFreeStringList (cl);	2762	XFreeStringList (cl);
2708	}	2763	}
2709	else	2764	else
2710	paste (ct.value, ct.nitems); // paste raw	2765	paste ((char *)ct.value, ct.nitems); // paste raw
2711		2766
2712	bailout:	2767	bailout:
2713	XFree (ct.value);	2768	XFree (ct.value);
2714		2769
2715	if (selection_wait == Sel_normal)	2770	if (selection_wait == Sel_normal)
…		…
2753	return; /* outside window */	2808	return; /* outside window */
2754		2809
2755	if (selection.text)	2810	if (selection.text)
2756	{ /* internal selection */	2811	{ /* internal selection */
2757	char *str = rxvt_wcstombs (selection.text, selection.len);	2812	char *str = rxvt_wcstombs (selection.text, selection.len);
2758	paste ((unsigned char *)str, strlen (str));	2813	paste (str, strlen (str));
2759	free (str);	2814	free (str);
2760	return;	2815	return;
2761	}	2816	}
2762	else	2817	else
2763	{	2818	{
…		…
2855	selection.op = SELECTION_DONE;	2910	selection.op = SELECTION_DONE;
2856		2911
2857	if (selection.clicks == 4)	2912	if (selection.clicks == 4)
2858	return; /* nothing selected, go away */	2913	return; /* nothing selected, go away */
2859		2914
		2915	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2916	return;
		2917
2860	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2918	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2861	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2919	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2862		2920
2863	int ofs = 0;	2921	int ofs = 0;
2864	int extra = 0;	2922	int extra = 0;
…		…
2876	col = selection.beg.col;	2934	col = selection.beg.col;
2877	end_col = ncol + 1;	2935	end_col = ncol + 1;
2878	}	2936	}
2879	else	2937	else
2880	#endif	2938	#endif
2881	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2939	end_col = ROW(row).l;
2882		2940
2883	col = max (col, 0);	2941	col = max (col, 0);
2884		2942
2885	if (row == selection.end.row || selection.rect)	2943	if (row == selection.end.row
		2944	#if ENABLE_FRILLS
		2945	|| selection.rect
		2946	#endif
		2947	)
2886	end_col = min (end_col, selection.end.col);	2948	min_it (end_col, selection.end.col);
2887		2949
2888	t = ROW(row).t + col;	2950	t = ROW(row).t + col;
		2951
2889	for (; col < end_col; col++)	2952	for (; col < end_col; col++)
2890	{	2953	{
2891	if (*t == NOCHAR)	2954	if (*t == NOCHAR)
2892	t++;	2955	t++;
2893	#if ENABLE_COMBINING	2956	#if ENABLE_COMBINING
…		…
2909	#endif	2972	#endif
2910	else	2973	else
2911	new_selection_text[ofs++] = *t++;	2974	new_selection_text[ofs++] = *t++;
2912	}	2975	}
2913		2976
		2977	#if ENABLE_FRILLS
		2978	if (selection.rect)
		2979	{
		2980	while (ofs
		2981	&& new_selection_text[ofs - 1] != C0_LF
		2982	&& unicode::is_space (new_selection_text[ofs - 1]))
		2983	--ofs;
		2984
		2985	new_selection_text[ofs++] = C0_LF;
		2986	}
		2987	else
		2988	#endif
2914	if (!ROW(row).is_longer () && row != selection.end.row)	2989	if (!ROW(row).is_longer () && row != selection.end.row)
2915	new_selection_text[ofs++] = C0_LF;	2990	new_selection_text[ofs++] = C0_LF;
2916	}	2991	}
2917		2992
2918	if (end_col != selection.end.col)	2993	if (end_col != selection.end.col)
2919	new_selection_text[ofs++] = C0_LF;	2994	new_selection_text[ofs++] = C0_LF;
2920		2995
…		…
2930		3005
2931	// we usually allocate much more than necessary, so realloc it smaller again	3006	// we usually allocate much more than necessary, so realloc it smaller again
2932	selection.len = ofs;	3007	selection.len = ofs;
2933	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	3008	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2934		3009
		3010	if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		3011	return;
		3012
		3013	selection_grab (tm);
		3014	}
		3015
		3016	bool
		3017	rxvt_term::selection_grab (Time tm)
		3018	{
		3019	selection_time = tm;
		3020
2935	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3021	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2936	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3022	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		3023	{
2937	display->set_selection_owner (this);	3024	display->set_selection_owner (this);
		3025	return true;
		3026	}
2938	else	3027	else
2939	rxvt_warn ("can't get primary selection, ignoring.\n");	3028	{
		3029	selection_clear ();
		3030	return false;
		3031	}
2940		3032
2941	#if 0	3033	#if 0
2942	XTextProperty ct;	3034	XTextProperty ct;
2943		3035
2944	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3036	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2945	{	3037	{
2946	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3038	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2947	XFree (ct.value);	3039	XFree (ct.value);
2948	}	3040	}
2949	#endif	3041	#endif
2950
2951	selection_time = tm;
2952	}	3042	}
2953		3043
2954	/* ------------------------------------------------------------------------- */	3044	/* ------------------------------------------------------------------------- */
2955	/*	3045	/*
2956	* Mark or select text based upon number of clicks: 1, 2, or 3	3046	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
2960	rxvt_term::selection_click (int clicks, int x, int y)	3050	rxvt_term::selection_click (int clicks, int x, int y)
2961	{	3051	{
2962	clicks = ((clicks - 1) % 3) + 1;	3052	clicks = ((clicks - 1) % 3) + 1;
2963	selection.clicks = clicks; /* save clicks so extend will work */	3053	selection.clicks = clicks; /* save clicks so extend will work */
2964		3054
		3055	if (clicks == 2 && !selection.rect
		3056	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3057	{
		3058	MEvent.clicks = 1; // what a mess
		3059	selection.screen = current_screen;
		3060	selection.op = SELECTION_CONT;
		3061	return;
		3062	}
		3063
2965	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3064	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2966		3065
2967	if (clicks == 2 || clicks == 3)	3066	if (clicks == 2 || clicks == 3)
2968	selection_extend_colrow (selection.mark.col,	3067	selection_extend_colrow (selection.mark.col,
2969	selection.mark.row + view_start,	3068	selection.mark.row - view_start,
2970	0, /* button 3 */	3069	0, /* button 3 */
2971	1, /* button press */	3070	1, /* button press */
2972	0); /* click change */	3071	0); /* click change */
2973	}	3072	}
2974		3073
…		…
2979	void	3078	void
2980	rxvt_term::selection_start_colrow (int col, int row)	3079	rxvt_term::selection_start_colrow (int col, int row)
2981	{	3080	{
2982	want_refresh = 1;	3081	want_refresh = 1;
2983		3082
2984	selection.mark.row = row - view_start;	3083	selection.mark.row = row + view_start;
2985	selection.mark.col = col;	3084	selection.mark.col = col;
2986		3085
2987	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3086	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2988	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3087	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2989		3088
2990	while (selection.mark.col > 0	3089	while (selection.mark.col > 0
2991	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3090	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2992	--selection.mark.col;	3091	--selection.mark.col;
…		…
3020	text_t *stp;	3119	text_t *stp;
3021	rend_t *srp;	3120	rend_t *srp;
3022		3121
3023	if (dirn == UP)	3122	if (dirn == UP)
3024	{	3123	{
3025	bound.row = - nsaved - 1;	3124	bound.row = top_row - 1;
3026	bound.col = 0;	3125	bound.col = 0;
3027	dirnadd = -1;	3126	dirnadd = -1;
3028	}	3127	}
3029	else	3128	else
3030	{	3129	{
…		…
3078	}	3177	}
3079	}	3178	}
3080	break;	3179	break;
3081	}	3180	}
3082		3181
3083	Old_Word_Selection_You_Die:
3084	if (dirn == DN)	3182	if (dirn == DN)
3085	col++; /* put us on one past the end */	3183	col++; /* put us on one past the end */
3086		3184
3087	/* Poke the values back in */	3185	/* Poke the values back in */
3088	ret->row = row;	3186	ret->row = row;
…		…
3109	* select nothing. Otherwise, if we're to the right of the mark, you have to	3207	* select nothing. Otherwise, if we're to the right of the mark, you have to
3110	* be _past_ a character for it to be selected.	3208	* be _past_ a character for it to be selected.
3111	*/	3209	*/
3112	if (((selection.clicks % 3) == 1) && !flag	3210	if (((selection.clicks % 3) == 1) && !flag
3113	&& (col == selection.mark.col	3211	&& (col == selection.mark.col
3114	&& (row == selection.mark.row + view_start)))	3212	&& (row == selection.mark.row - view_start)))
3115	{	3213	{
3116	/* select nothing */	3214	/* select nothing */
3117	selection.beg.row = selection.end.row = 0;	3215	selection.beg.row = selection.end.row = 0;
3118	selection.beg.col = selection.end.col = 0;	3216	selection.beg.col = selection.end.col = 0;
3119	selection.clicks = 4;	3217	selection.clicks = 4;
…		…
3174	selection.beg.col = selection.end.col = selection.mark.col;	3272	selection.beg.col = selection.end.col = selection.mark.col;
3175	selection.beg.row = selection.end.row = selection.mark.row;	3273	selection.beg.row = selection.end.row = selection.mark.row;
3176	}	3274	}
3177		3275
3178	pos.col = col;	3276	pos.col = col;
3179	pos.row = row - view_start;	3277	pos.row = view_start + row;
3180		3278
3181	/*	3279	/*
3182	* This is mainly xterm style selection with a couple of differences, mainly	3280	* This is mainly xterm style selection with a couple of differences, mainly
3183	* in the way button3 drag extension works.	3281	* in the way button3 drag extension works.
3184	* We're either doing: button1 drag; button3 press; or button3 drag	3282	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3271	selection_delimit_word (DN, &selection.end, &selection.end);	3369	selection_delimit_word (DN, &selection.end, &selection.end);
3272	}	3370	}
3273	else if (selection.clicks == 3)	3371	else if (selection.clicks == 3)
3274	{	3372	{
3275	#if ENABLE_FRILLS	3373	#if ENABLE_FRILLS
3276	if (options & Opt_tripleclickwords)	3374	if (OPTION (Opt_tripleclickwords))
3277	{	3375	{
3278	selection_delimit_word (UP, &selection.beg, &selection.beg);	3376	selection_delimit_word (UP, &selection.beg, &selection.beg);
3279		3377
3280	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3378	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3281	{	3379	{
…		…
3342	{	3440	{
3343	stp = ROW(end_row).t;	3441	stp = ROW(end_row).t;
3344		3442
3345	while (--end_col >= 0)	3443	while (--end_col >= 0)
3346	{	3444	{
3347	if (stp[end_col] != ' '	3445	if (stp[end_col] != NOCHAR
3348	&& stp[end_col] != '\t'	3446	&& !unicode::is_space (stp[end_col]))
3349	&& stp[end_col] != NOCHAR)
3350	break;	3447	break;
3351	}	3448	}
3352		3449
3353	if (end_col >= 0	3450	if (end_col >= 0
3354	|| !ROW(end_row - 1).is_longer ())	3451	|| !ROW(end_row - 1).is_longer ())
…		…
3553		3650
3554	#if ENABLE_OVERLAY	3651	#if ENABLE_OVERLAY
3555	void	3652	void
3556	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3653	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3557	{	3654	{
3558	if (nrow < 3 || ncol < 3)	3655	if (nrow < 1 || ncol < 1)
3559	return;	3656	return;
3560		3657
3561	want_refresh = 1;	3658	want_refresh = 1;
3562		3659
3563	scr_overlay_off ();	3660	scr_overlay_off ();
…		…
3670	for (int y = ov_h; y--; )	3767	for (int y = ov_h; y--; )
3671	{	3768	{
3672	text_t *t1 = ov_text[y];	3769	text_t *t1 = ov_text[y];
3673	rend_t *r1 = ov_rend[y];	3770	rend_t *r1 = ov_rend[y];
3674		3771
3675	text_t *t2 = ROW(y - view_start).t + ov_x;	3772	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3676	rend_t *r2 = ROW(y - view_start).r + ov_x;	3773	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3677		3774
3678	for (int x = ov_w; x--; )	3775	for (int x = ov_w; x--; )
3679	{	3776	{
3680	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3777	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3681	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3778	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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