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