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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.229 by root, Sun Jan 15 06:39:19 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() \
…		…
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;
…		…
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)
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	while (p != pend && q > 0)	289	row_col_t ocur = screen.cur;
		290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
		291
		292	do
286	{	293	{
287	p = MOD (p - 1, prev_total_rows);	294	p = MOD (p - 1, prev_total_rows);
288	#ifdef DEBUG_STRICT	295	#ifdef DEBUG_STRICT
289	assert (old_buf [MOD (p, prev_total_rows)].t);	296	assert (old_buf [MOD (p, prev_total_rows)].t);
290	#endif	297	#endif
291		298	int plines = 1;
292	int llen = old_buf [MOD (p, prev_total_rows)].l;	299	int llen = old_buf [MOD (p, prev_total_rows)].l;
293		300
294	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 ())
295	{	302	{
296	p = MOD (p - 1, prev_total_rows);	303	p = MOD (p - 1, prev_total_rows);
297		304
		305	plines++;
298	llen += prev_ncol;	306	llen += prev_ncol;
299	}	307	}
300		308
301	int qlines = max (0, (llen - 1) / ncol) + 1;	309	int qlines = max (0, (llen - 1) / ncol) + 1;
302		310
…		…
312	// re-assemble the full line by destination lines	320	// re-assemble the full line by destination lines
313	for (int qrow = q; qlines--; qrow++)	321	for (int qrow = q; qlines--; qrow++)
314	{	322	{
315	qline = row_buf + qrow;	323	qline = row_buf + qrow;
316	lalloc (*qline);	324	lalloc (*qline);
		325	qline->l = ncol;
317	qline->set_is_longer ();	326	qline->is_longer (1);
318		327
319	int qcol = 0;	328	int qcol = 0;
320		329
321	// fill a single destination line	330	// fill a single destination line
322	while (lofs < llen && qcol < ncol)	331	while (lofs < llen && qcol < ncol)
323	{	332	{
324	int prow = lofs / prev_ncol;	333	int prow = lofs / prev_ncol;
325	int pcol = lofs % prev_ncol;	334	int pcol = lofs % prev_ncol;
326		335
327	line_t &pline = old_buf [MOD (p + prow, prev_total_rows)];	336	prow = MOD (p + prow, prev_total_rows);
		337
		338	// we only adjust the cursor _row_ and put it into
		339	// the topmost line of "long line" it was in, as
		340	// this seems to upset applications/shells/readline
		341	// least.
		342	if (prow == ocur.row)
		343	screen.cur.row = q - (total_rows - nrow);
		344
		345	line_t &pline = old_buf [prow];
328		346
329	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	347	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
330		348
331	assert (len);	349	assert (len);
332	assert (pline.t);	350	assert (pline.t);
…		…
337	lofs += len;	355	lofs += len;
338	qcol += len;	356	qcol += len;
339	}	357	}
340	}	358	}
341		359
342	qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;	360	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
		361	qline->is_longer (0);
343	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);	362	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
344	}	363	}
		364	while (p != pend && q > 0);
345		365
346	term_start = total_rows - nrow;	366	term_start = total_rows - nrow;
347	view_start = 0;	367	top_row = q - term_start;
348	nsaved = term_start - q;
349		368
350	// make sure all terminal lines exist	369	// make sure all terminal lines exist
351	while (nsaved < 0)	370	while (top_row > 0)
352	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);	371	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
353
354	}	372	}
355	else	373	else
356	{	374	{
357	// if no scrollback exists (yet), wing, instead of wrap	375	// if no scrollback exists (yet), wing, instead of wrap
358		376
…		…
369	{	387	{
370	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	388	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
371	}	389	}
372		390
373	term_start = 0;	391	term_start = 0;
374	view_start = 0;
375	}	392	}
376		393
377	#ifdef DEBUG_STRICT	394	#ifdef DEBUG_STRICT //TODO: remove
378	for (int i = -nsaved; i < nrow; i++)	395	for (int i = top_row; i < nrow; i++)
379	assert (ROW (i).t);	396	assert (ROW (i).t);
380	#endif	397	#endif
381		398
382	free (old_buf);	399	free (old_buf);
383	delete old_ta;	400	delete old_ta;
…		…
397		414
398	for (int col = ncol; col--; )	415	for (int col = ncol; col--; )
399	tabs [col] = col % TABSIZE == 0;	416	tabs [col] = col % TABSIZE == 0;
400		417
401	tt_winch ();	418	tt_winch ();
		419
		420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
402	}	421	}
403		422
404	/* ------------------------------------------------------------------------- */	423	/* ------------------------------------------------------------------------- */
405	/*	424	/*
406	* Free everything. That way malloc debugging can find leakage.	425	* Free everything. That way malloc debugging can find leakage.
…		…
412	delete ralloc; ralloc = 0;	431	delete ralloc; ralloc = 0;
413		432
414	free (row_buf);	433	free (row_buf);
415	free (swap_buf);	434	free (swap_buf);
416	free (drawn_buf);	435	free (drawn_buf);
417	free (temp_buf);
418	free (tabs);	436	free (tabs);
419		437
420	row_buf = 0; // signal that we freed all the arrays	438	row_buf = 0; // signal that we freed all the arrays
421	}	439	}
422		440
…		…
510		528
511	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);	529	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
512	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);	530	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
513		531
514	#if NSCREENS	532	#if NSCREENS
515	if (options & Opt_secondaryScreen)	533	if (OPTION (Opt_secondaryScreen))
516	{	534	{
517	num_scr = 0;	535	num_scr = 0;
518		536
519	for (int i = prev_nrow; i--; )	537	for (int i = prev_nrow; i--; )
520	::swap (ROW(i), swap_buf [i]);	538	::swap (ROW(i), swap_buf [i]);
…		…
524	screen.flags |= Screen_VisibleCursor;	542	screen.flags |= Screen_VisibleCursor;
525	swap.flags |= Screen_VisibleCursor;	543	swap.flags |= Screen_VisibleCursor;
526	}	544	}
527	else	545	else
528	#endif	546	#endif
529	if (options & Opt_secondaryScroll)	547	if (OPTION (Opt_secondaryScroll))
530	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	548	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
531		549
532	return scrn;	550	return scrn;
533	}	551	}
534		552
…		…
554	* Change the colour for following text	572	* Change the colour for following text
555	*/	573	*/
556	void	574	void
557	rxvt_term::scr_color (unsigned int color, int fgbg)	575	rxvt_term::scr_color (unsigned int color, int fgbg)
558	{	576	{
559	if (color > maxTermCOLOR)	577	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
560	color = fgbg;	578	color = fgbg;
561		579
562	if (fgbg == Color_fg)	580	if (fgbg == Color_fg)
563	rstyle = SET_FGCOLOR (rstyle, color);	581	rstyle = SET_FGCOLOR (rstyle, color);
564	else	582	else
…		…
595	want_refresh = 1;	613	want_refresh = 1;
596	num_scr += count;	614	num_scr += count;
597		615
598	if (count > 0	616	if (count > 0
599	&& row1 == 0	617	&& row1 == 0
600	&& row2 == nrow - 1
601	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	618	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
602	{	619	{
603	nsaved = min (nsaved + count, saveLines);	620	top_row = max (top_row - count, -saveLines);
		621
		622	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
		623
		624	// scroll everything up 'count' lines
604	term_start = (term_start + count) % total_rows;	625	term_start = (term_start + count) % total_rows;
605		626
		627	{
		628	// severe bottommost scrolled line
		629	line_t &l = ROW(row2 - count);
		630	l.touch ();
		631	l.is_longer (0);
		632	}
		633
		634	// erase newly scorlled-in lines
		635	for (int i = count; i; --i )
		636	{
		637	// basically this is a slightly optimized scr_blank_screen_mem
		638	// it is worth the effort on slower machines
		639	line_t &l = ROW(nrow - i);
		640
		641	scr_blank_line (l, 0, l.l, rstyle);
		642
		643	l.l = 0;
		644	l.f = 0;
		645	}
		646
		647	// now copy lines below the scroll region bottom to the
		648	// bottom of the screen again, so they look as if they
		649	// hadn't moved.
		650	for (int i = nrow; --i > row2; )
		651	{
		652	line_t &l1 = ROW(i - count);
		653	line_t &l2 = ROW(i);
		654
		655	::swap (l1, l2);
		656	l2.touch ();
		657	}
		658
		659	// move and/or clear selection, if any
606	if (selection.op && current_screen == selection.screen)	660	if (selection.op && current_screen == selection.screen)
607	{	661	{
608	selection.beg.row -= count;	662	selection.beg.row -= count;
609	selection.end.row -= count;	663	selection.end.row -= count;
610	selection.mark.row -= count;	664	selection.mark.row -= count;
611		665
612	selection_check (0);	666	if (selection.beg.row < top_row
613	}	667	|| selection.end.row < top_row
614		668	|| selection.mark.row < top_row)
615	for (int i = count; i--; )
616	scr_blank_screen_mem (ROW(row2 - i), rstyle);
617
618	if ((options & Opt_scrollWithBuffer)
619	&& view_start != 0
620	&& view_start != saveLines)
621	scr_page (UP, count);
622	}
623	else
624	{
625	if (selection.op && current_screen == selection.screen)
626	{
627	int i = selection.beg.row;
628	int j = selection.end.row;
629
630	if ((i < row1 && j > row1)
631	|| (i < row2 && j > row2)
632	|| (i - count < row1 && i >= row1)
633	|| (i - count > row2 && i <= row2)
634	|| (j - count < row1 && j >= row1)
635	|| (j - count > row2 && j <= row2))
636	{	669	{
637	CLEAR_ALL_SELECTION ();	670	CLEAR_ALL_SELECTION ();
638	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	671	selection.op = SELECTION_CLEAR;
639	}	672	}
640	else if (j >= row1 && j <= row2)	673	}
		674
		675	// finally move the view window, if desired
		676	if (OPTION (Opt_scrollWithBuffer)
		677	&& view_start != 0
		678	&& view_start != -saveLines)
		679	scr_page (UP, count);
		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)
641	{	696	{
642	/* move selected region too */	697	/* move selected region too */
643	selection.beg.row -= count;	698	selection.beg.row -= count;
644	selection.end.row -= count;	699	selection.end.row -= count;
645	selection.mark.row -= count;	700	selection.mark.row -= count;
…		…
653		708
654	int rows = row2 - row1 + 1;	709	int rows = row2 - row1 + 1;
655		710
656	min_it (count, rows);	711	min_it (count, rows);
657		712
		713	line_t *temp_buf = row_buf + total_rows;
		714
658	for (int row = 0; row < rows; row++)	715	for (int row = 0; row < rows; row++)
659	{	716	{
660	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	717	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
661		718
662	if (!IN_RANGE_EXC (row + count, 0, rows))	719	if (!IN_RANGE_EXC (row + count, 0, rows))
…		…
673	/* ------------------------------------------------------------------------- */	730	/* ------------------------------------------------------------------------- */
674	/*	731	/*
675	* Add text given in <str> of length <len> to screen struct	732	* Add text given in <str> of length <len> to screen struct
676	*/	733	*/
677	void	734	void
678	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)
679	{	736	{
680	if (len <= 0) /* sanity */	737	if (len <= 0) /* sanity */
681	return;	738	return;
682		739
683	unsigned char checksel;	740	unsigned char checksel;
684	unicode_t c;	741	unicode_t c;
685	int row, last_col;	742	int ncol = this->ncol;
686	const unicode_t *strend = str + len;	743	const wchar_t *strend = str + len;
687		744
688	want_refresh = 1;	745	want_refresh = 1;
689	ZERO_SCROLLBACK ();	746	ZERO_SCROLLBACK ();
690	last_col = ncol;
691		747
692	if (nlines > 0)	748	if (minlines > 0)
693	{	749	{
694	nlines += screen.cur.row - screen.bscroll;	750	minlines += screen.cur.row - screen.bscroll;
		751
695	if (nlines > 0	752	if (minlines > 0
696	&& screen.tscroll == 0	753	&& screen.tscroll == 0
697	&& screen.bscroll == (nrow - 1))	754	&& screen.bscroll == nrow - 1)
698	{	755	{
699	/* _at least_ this many lines need to be scrolled */	756	/* _at least_ this many lines need to be scrolled */
700	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	757	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
701	screen.cur.row -= nlines;	758	screen.cur.row -= minlines;
702	}	759	}
703	}	760	}
704		761
705	#ifdef DEBUG_STRICT	762	#ifdef DEBUG_STRICT
706	assert (screen.cur.col < last_col);	763	assert (screen.cur.col < ncol);
707	assert (screen.cur.row < nrow	764	assert (screen.cur.row < nrow
708	&& screen.cur.row >= -nsaved);	765	&& screen.cur.row >= top_row);
709	#endif	766	#endif
710	row = screen.cur.row;	767	int row = screen.cur.row;
711		768
712	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	769	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
713		770
714	line_t *line = &ROW(row);	771	line_t *line = &ROW(row);
715		772
716	while (str < strend)	773	while (str < strend)
717	{	774	{
718	c = *str++;	775	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
719		776
720	if (c < 0x20)	777	if (c < 0x20)
721	if (c == C0_LF)	778	if (c == C0_LF)
722	{	779	{
723	if (!line->is_longer ()) /* XXX: think about this */
724	max_it (line->l, screen.cur.col);	780	max_it (line->l, screen.cur.col);
725		781
726	screen.flags &= ~Screen_WrapNext;	782	screen.flags &= ~Screen_WrapNext;
727		783
728	if (screen.cur.row == screen.bscroll)	784	if (screen.cur.row == screen.bscroll)
729	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	785	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
733	line = &ROW(row); /* _must_ refresh */	789	line = &ROW(row); /* _must_ refresh */
734	continue;	790	continue;
735	}	791	}
736	else if (c == C0_CR)	792	else if (c == C0_CR)
737	{	793	{
738	if (!line->is_longer ()) /* XXX: think about this */
739	max_it (line->l, screen.cur.col);	794	max_it (line->l, screen.cur.col);
740		795
741	screen.flags &= ~Screen_WrapNext;	796	screen.flags &= ~Screen_WrapNext;
742	screen.cur.col = 0;	797	screen.cur.col = 0;
743	continue;	798	continue;
744	}	799	}
…		…
761	CLEAR_SELECTION ();	816	CLEAR_SELECTION ();
762	}	817	}
763		818
764	if (screen.flags & Screen_WrapNext)	819	if (screen.flags & Screen_WrapNext)
765	{	820	{
		821	max_it (line->l, ncol);
766	line->set_is_longer ();	822	line->is_longer (1);
767		823
768	scr_do_wrap ();	824	scr_do_wrap ();
769		825
770	row = screen.cur.row;	826	row = screen.cur.row;
771	line = &ROW(row); /* _must_ refresh */	827	line = &ROW(row); /* _must_ refresh */
…		…
779	// do wcwidth before further replacements, as wcwidth might return -1	835	// do wcwidth before further replacements, as wcwidth might return -1
780	// 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
781	// locale.	837	// locale.
782	int width = c < 0x100 ? 1 : wcwidth (c);	838	int width = c < 0x100 ? 1 : wcwidth (c);
783		839
784	if (charsets[screen.charset] == '0') // DEC SPECIAL	840	if (charsets [screen.charset] == '0') // DEC SPECIAL
785	{	841	{
786	// vt100 special graphics and line drawing	842	// vt100 special graphics and line drawing
787	// 5f-7e standard vt100	843	// 5f-7e standard vt100
788	// 40-5e rxvt extension for extra curses acs chars	844	// 40-5e rxvt extension for extra curses acs chars
789	static uint16_t vt100_0[62] = { // 41 .. 7e	845	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
841	}	897	}
842		898
843	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	899	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
844		900
845	// if the character doesn't fit into the remaining columns...	901	// if the character doesn't fit into the remaining columns...
846	if (screen.cur.col > last_col - width && last_col >= width)	902	if (screen.cur.col > ncol - width && ncol >= width)
847	{	903	{
848	// ...output spaces	904	// ...output spaces
849	c = ' ';	905	c = ' ';
850	// and try the same character next loop iteration	906	// and try the same character next loop iteration
851	--str;	907	--str;
852	}	908	}
853		909
		910	line->touch ();
		911
854	do	912	do
855	{	913	{
856	line->t[screen.cur.col] = c;	914	line->t[screen.cur.col] = c;
857	line->r[screen.cur.col] = rend;	915	line->r[screen.cur.col] = rend;
858		916
859	if (screen.cur.col < last_col - 1)	917	if (screen.cur.col < ncol - 1)
860	screen.cur.col++;	918	screen.cur.col++;
861	else	919	else
862	{	920	{
863	line->l = last_col;	921	line->l = ncol;
864	if (screen.flags & Screen_Autowrap)	922	if (screen.flags & Screen_Autowrap)
865	screen.flags |= Screen_WrapNext;	923	screen.flags |= Screen_WrapNext;
866	break;	924	break;
867	}	925	}
868		926
…		…
870	}	928	}
871	while (--width > 0);	929	while (--width > 0);
872		930
873	// pad with spaces when overwriting wide character with smaller one	931	// pad with spaces when overwriting wide character with smaller one
874	if (!width)	932	if (!width)
		933	{
		934	line->touch ();
		935
875	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++)
876	{	937	{
877	line->t[c] = ' ';	938	line->t[c] = ' ';
878	line->r[c] = rend;	939	line->r[c] = rend;
879	}	940	}
		941	}
880	}	942	}
881	else // width == 0	943	else // width == 0
882	{	944	{
883	#if ENABLE_COMBINING	945	#if ENABLE_COMBINING
884	// handle combining characters	946	// handle combining characters
885	// we just tag the accent on the previous on-screen character.	947	// we just tag the accent on the previous on-screen character.
886	// this is arguably not correct, but also arguably not wrong.	948	// this is arguably not correct, but also arguably not wrong.
887	// we don't handle double-width characters nicely yet.	949	// we don't handle double-width characters nicely yet.
		950	line_t *linep;
888	text_t *tp;	951	text_t *tp;
889	rend_t *rp;	952	rend_t *rp;
890		953
891	if (screen.cur.col > 0)	954	if (screen.cur.col > 0)
892	{	955	{
		956	linep = line;
893	tp = line->t + screen.cur.col - 1;	957	tp = line->t + screen.cur.col - 1;
894	rp = line->r + screen.cur.col - 1;	958	rp = line->r + screen.cur.col - 1;
895
896	while (*tp == NOCHAR && tp > line->t)
897	tp--, rp--;
898	}	959	}
899	else if (screen.cur.row > 0	960	else if (screen.cur.row > 0
900	&& ROW(screen.cur.row - 1).is_longer ())	961	&& ROW(screen.cur.row - 1).is_longer ())
901	{	962	{
902	line_t *line = &ROW(screen.cur.row - 1);	963	linep = &ROW(screen.cur.row - 1);
903
904	tp = line->t + last_col - 1;	964	tp = line->t + ncol - 1;
905	rp = line->r + last_col - 1;	965	rp = line->r + ncol - 1;
906
907	while (*tp == NOCHAR && tp > line->t)
908	tp--, rp--;
909	}	966	}
910	else	967	else
911	continue;	968	continue;
		969
		970	linep->touch ();
		971
		972	while (*tp == NOCHAR && tp > linep->t)
		973	tp--, rp--;
912		974
913	// first try to find a precomposed character	975	// first try to find a precomposed character
914	unicode_t n = rxvt_compose (*tp, c);	976	unicode_t n = rxvt_compose (*tp, c);
915	if (n == NOCHAR)	977	if (n == NOCHAR)
916	n = rxvt_composite.compose (*tp, c);	978	n = rxvt_composite.compose (*tp, c);
…		…
919	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	981	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
920	#endif	982	#endif
921	}	983	}
922	}	984	}
923		985
924	if (!line->is_longer ()) /* XXX: think about this */
925	max_it (line->l, screen.cur.col);	986	max_it (line->l, screen.cur.col);
926		987
927	#ifdef DEBUG_STRICT	988	#ifdef DEBUG_STRICT
928	assert (screen.cur.row >= 0);	989	assert (screen.cur.row >= 0);
929	#endif	990	#endif
930	}	991	}
…		…
972		1033
973	if (count == 0)	1034	if (count == 0)
974	return;	1035	return;
975	else if (count > 0)	1036	else if (count > 0)
976	{	1037	{
977	int row = screen.cur.row;
978
979	line_t &l = ROW(row);	1038	line_t &l = ROW(screen.cur.row);
980	rend_t base_rend = l.r[i];	1039	rend_t base_rend = l.r[i];
981	ht &= l.t[i] == ' ';	1040	ht &= l.t[i] == ' ';
982		1041
983	for (; ++i < ncol; )	1042	for (; ++i < ncol; )
984	if (tabs[i])	1043	if (tabs[i])
985	{	1044	{
986	x = i;	1045	x = i;
		1046
987	if (!--count)	1047	if (!--count)
988	break;	1048	break;
989	}	1049	}
990	else	1050	else
991	ht &= l.t[i] == ' '	1051	ht &= l.t[i] == ' '
…		…
994	if (count)	1054	if (count)
995	x = ncol - 1;	1055	x = ncol - 1;
996		1056
997	// store horizontal tab commands as characters inside the text	1057	// store horizontal tab commands as characters inside the text
998	// buffer so they can be selected and pasted.	1058	// buffer so they can be selected and pasted.
999	if (ht && options & Opt_pastableTabs)	1059	if (ht && OPTION (Opt_pastableTabs))
1000	{	1060	{
1001	base_rend = SET_FONT (base_rend, 0);	1061	base_rend = SET_FONT (base_rend, 0);
1002		1062
1003	if (!l.is_longer ()) /* XXX: think about this */	1063	l.touch (x);
1004	max_it (l.l, x);
1005		1064
1006	i = screen.cur.col;	1065	i = screen.cur.col;
1007		1066
1008	l.t[i] = '\t';	1067	l.t[i] = '\t';
1009	l.r[i] = base_rend;	1068	l.r[i] = base_rend;
…		…
1059	*/	1118	*/
1060	#if ENABLE_FRILLS	1119	#if ENABLE_FRILLS
1061	void	1120	void
1062	rxvt_term::scr_forwardindex ()	1121	rxvt_term::scr_forwardindex ()
1063	{	1122	{
1064	int row;
1065
1066	if (screen.cur.col < ncol - 1)	1123	if (screen.cur.col < ncol - 1)
1067	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1124	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1068	else	1125	else
1069	{	1126	{
1070	row = screen.cur.row;	1127	line_t &l = ROW(screen.cur.row);
1071		1128
1072	if (ROW(row).is_longer ()) //TODO//FIXME//LEN	1129	l.touch ();
1073	ROW(row).l = ncol;	1130	l.is_longer (0);
1074		1131
1075	scr_gotorc (0, 0, R_RELATIVE);	1132	scr_gotorc (0, 0, R_RELATIVE);
1076	scr_insdel_chars (1, DELETE);	1133	scr_insdel_chars (1, DELETE);
1077	scr_gotorc (0, ncol - 1, R_RELATIVE);	1134	scr_gotorc (0, ncol - 1, R_RELATIVE);
1078	}	1135	}
…		…
1161	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1218	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1162	*/	1219	*/
1163	void	1220	void
1164	rxvt_term::scr_erase_line (int mode)	1221	rxvt_term::scr_erase_line (int mode)
1165	{	1222	{
1166	unsigned int row, col, num;	1223	unsigned int col, num;
1167		1224
1168	want_refresh = 1;	1225	want_refresh = 1;
1169	ZERO_SCROLLBACK ();	1226	ZERO_SCROLLBACK ();
1170		1227
1171	selection_check (1);	1228	selection_check (1);
1172		1229
1173	row = screen.cur.row;	1230	line_t &line = ROW(screen.cur.row);
		1231
		1232	line.touch ();
		1233	line.is_longer (0);
1174		1234
1175	switch (mode)	1235	switch (mode)
1176	{	1236	{
1177	case 0: /* erase to end of line */	1237	case 0: /* erase to end of line */
1178	col = screen.cur.col;	1238	col = screen.cur.col;
1179	num = ncol - col;	1239	num = ncol - col;
1180	min_it (ROW(row).l, col);	1240	min_it (line.l, col);
1181	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1241	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1182	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1242	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1183	CLEAR_SELECTION ();	1243	CLEAR_SELECTION ();
1184	break;	1244	break;
1185	case 1: /* erase to beginning of line */	1245	case 1: /* erase to beginning of line */
…		…
1190	CLEAR_SELECTION ();	1250	CLEAR_SELECTION ();
1191	break;	1251	break;
1192	case 2: /* erase whole line */	1252	case 2: /* erase whole line */
1193	col = 0;	1253	col = 0;
1194	num = ncol;	1254	num = ncol;
1195	ROW(row).l = 0;	1255	line.l = 0;
1196	if (selection.beg.row <= screen.cur.row	1256	if (selection.beg.row <= screen.cur.row
1197	&& selection.end.row >= screen.cur.row)	1257	&& selection.end.row >= screen.cur.row)
1198	CLEAR_SELECTION ();	1258	CLEAR_SELECTION ();
1199	break;	1259	break;
1200	default:	1260	default:
1201	return;	1261	return;
1202	}	1262	}
1203		1263
1204	scr_blank_line (ROW(row), col, num, rstyle);	1264	scr_blank_line (line, col, num, rstyle);
1205	}	1265	}
1206		1266
1207	/* ------------------------------------------------------------------------- */	1267	/* ------------------------------------------------------------------------- */
1208	/*	1268	/*
1209	* Erase part of whole of the screen	1269	* Erase part of whole of the screen
…		…
1264	CLEAR_ROWS (row, num);	1324	CLEAR_ROWS (row, num);
1265	}	1325	}
1266	else	1326	else
1267	{	1327	{
1268	ren = rstyle & (RS_fgMask | RS_bgMask);	1328	ren = rstyle & (RS_fgMask | RS_bgMask);
1269	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1329	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1270	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1330	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1271	ERASE_ROWS (row, num);	1331	ERASE_ROWS (row, num);
1272	gcvalue.foreground = pix_colors[Color_fg];	1332	gcvalue.foreground = pix_colors[Color_fg];
1273	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1333	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1274	}	1334	}
1275		1335
1276	for (; num--; row++)	1336	for (; num--; row++)
1277	{	1337	{
1278	scr_blank_screen_mem (ROW (row), rstyle);	1338	scr_blank_screen_mem (ROW(row), rstyle);
1279	ROW (row).l = 0;
1280	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1339	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1281	}	1340	}
1282	}	1341	}
1283		1342
1284	#if ENABLE_FRILLS	1343	#if ENABLE_FRILLS
…		…
1286	rxvt_term::scr_erase_savelines ()	1345	rxvt_term::scr_erase_savelines ()
1287	{	1346	{
1288	want_refresh = 1;	1347	want_refresh = 1;
1289	ZERO_SCROLLBACK ();	1348	ZERO_SCROLLBACK ();
1290		1349
1291	nsaved = 0;	1350	top_row = 0;
1292	}	1351	}
1293	#endif	1352	#endif
1294		1353
1295	/* ------------------------------------------------------------------------- */	1354	/* ------------------------------------------------------------------------- */
1296	/*	1355	/*
…		…
1317	rend_t *r1 = line.r;	1376	rend_t *r1 = line.r;
1318		1377
1319	for (int j = ncol; j--; )	1378	for (int j = ncol; j--; )
1320	*r1++ = fs;	1379	*r1++ = fs;
1321		1380
1322	line.l = ncol; /* make the `E's selectable */	1381	line.is_longer (0);
		1382	line.touch (ncol);
1323	}	1383	}
1324	}	1384	}
1325		1385
1326	/* ------------------------------------------------------------------------- */	1386	/* ------------------------------------------------------------------------- */
1327	/*	1387	/*
…		…
1375	min_it (count, ncol - screen.cur.col);	1435	min_it (count, ncol - screen.cur.col);
1376		1436
1377	row = screen.cur.row;	1437	row = screen.cur.row;
1378		1438
1379	line_t *line = &ROW(row);	1439	line_t *line = &ROW(row);
		1440
		1441	line->touch ();
		1442	line->is_longer (0);
1380		1443
1381	switch (insdel)	1444	switch (insdel)
1382	{	1445	{
1383	case INSERT:	1446	case INSERT:
1384	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1447	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1385	{	1448	{
1386	line->t[col] = line->t[col - count];	1449	line->t[col] = line->t[col - count];
1387	line->r[col] = line->r[col - count];	1450	line->r[col] = line->r[col - count];
1388	}	1451	}
1389		1452
1390	if (!line->is_longer ())	1453	line->l = min (line->l + count, ncol);
1391	{
1392	line->l += count;
1393	min_it (line->l, ncol);
1394	}
1395		1454
1396	if (selection.op && current_screen == selection.screen	1455	if (selection.op && current_screen == selection.screen
1397	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1456	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1398	{	1457	{
1399	if (selection.end.row != screen.cur.row	1458	if (selection.end.row != screen.cur.row
…		…
1412		1471
1413	case ERASE:	1472	case ERASE:
1414	screen.cur.col += count; /* don't worry if > ncol */	1473	screen.cur.col += count; /* don't worry if > ncol */
1415	selection_check (1);	1474	selection_check (1);
1416	screen.cur.col -= count;	1475	screen.cur.col -= count;
		1476
		1477	line->l = max (line->l - count, 0);
1417	scr_blank_line (*line, screen.cur.col, count, rstyle);	1478	scr_blank_line (*line, screen.cur.col, count, rstyle);
1418	break;	1479	break;
1419		1480
1420	case DELETE:	1481	case DELETE:
1421	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1482	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1424	{	1485	{
1425	line->t[col] = line->t[col + count];	1486	line->t[col] = line->t[col + count];
1426	line->r[col] = line->r[col + count];	1487	line->r[col] = line->r[col + count];
1427	}	1488	}
1428		1489
		1490	line->l = max (line->l - count, 0);
1429	scr_blank_line (*line, ncol - count, count, tr);	1491	scr_blank_line (*line, ncol - count, count, tr);
1430
1431	if (line->is_longer ()) /* break line continuation */
1432	line->l = ncol;
1433
1434	line->l = max (line->l - count, 0);
1435		1492
1436	if (selection.op && current_screen == selection.screen	1493	if (selection.op && current_screen == selection.screen
1437	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1494	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1438	{	1495	{
1439	if (selection.end.row != screen.cur.row	1496	if (selection.end.row != screen.cur.row
…		…
1551	rxvt_term::scr_set_tab (int mode)	1608	rxvt_term::scr_set_tab (int mode)
1552	{	1609	{
1553	if (mode < 0)	1610	if (mode < 0)
1554	memset (tabs, 0, ncol * sizeof (char));	1611	memset (tabs, 0, ncol * sizeof (char));
1555	else if (screen.cur.col < ncol)	1612	else if (screen.cur.col < ncol)
1556	tabs[screen.cur.col] = (mode ? 1 : 0);	1613	tabs [screen.cur.col] = !!mode;
1557	}	1614	}
1558		1615
1559	/* ------------------------------------------------------------------------- */	1616	/* ------------------------------------------------------------------------- */
1560	/*	1617	/*
1561	* Set reverse/normal video	1618	* Set reverse/normal video
…		…
1573	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1630	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1574	#if XPM_BACKGROUND	1631	#if XPM_BACKGROUND
1575	if (bgPixmap.pixmap == None)	1632	if (bgPixmap.pixmap == None)
1576	#endif	1633	#endif
1577	#if TRANSPARENT	1634	#if TRANSPARENT
1578	if (! (options & Opt_transparent) || am_transparent == 0)	1635	if (! OPTION (Opt_transparent) || am_transparent == 0)
1579	#endif	1636	#endif
1580	XSetWindowBackground (display->display, vt,	1637	XSetWindowBackground (display->display, vt,
1581	pix_colors[Color_bg]);	1638	pix_colors[Color_bg]);
1582		1639
1583	gcvalue.foreground = pix_colors[Color_fg];	1640	gcvalue.foreground = pix_colors[Color_fg];
…		…
1608	* Set font style	1665	* Set font style
1609	*/	1666	*/
1610	void	1667	void
1611	rxvt_term::set_font_style ()	1668	rxvt_term::set_font_style ()
1612	{	1669	{
		1670	#if 0
1613	switch (charsets[screen.charset])	1671	switch (charsets [screen.charset])
1614	{	1672	{
1615	case '0': /* DEC Special Character & Line Drawing Set */	1673	case '0': /* DEC Special Character & Line Drawing Set */
1616	break;	1674	break;
1617	case 'A': /* United Kingdom (UK) */	1675	case 'A': /* United Kingdom (UK) */
1618	break;	1676	break;
…		…
1625	case 'C': /* Finnish character set */	1683	case 'C': /* Finnish character set */
1626	break;	1684	break;
1627	case 'K': /* German character set */	1685	case 'K': /* German character set */
1628	break;	1686	break;
1629	}	1687	}
		1688	#endif
1630	}	1689	}
1631		1690
1632	/* ------------------------------------------------------------------------- */	1691	/* ------------------------------------------------------------------------- */
1633	/*	1692	/*
1634	* Choose a font	1693	* Choose a font
…		…
1749	/* ------------------------------------------------------------------------- */	1808	/* ------------------------------------------------------------------------- */
1750	/*	1809	/*
1751	* Move the display so that the line represented by scrollbar value Y is at	1810	* Move the display so that the line represented by scrollbar value Y is at
1752	* the top of the screen	1811	* the top of the screen
1753	*/	1812	*/
1754	int	1813	void
1755	rxvt_term::scr_move_to (int y, int len)	1814	rxvt_term::scr_move_to (int y, int len)
1756	{	1815	{
1757	long p = 0;	1816	int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1758	unsigned int oldviewstart;
1759		1817
1760	oldviewstart = view_start;	1818	scr_changeview (p);
1761
1762	if (y < len)
1763	{
1764	p = (nrow + nsaved) * (len - y) / len;
1765	p -= (long) (nrow - 1);
1766	p = max (p, 0);
1767	}
1768
1769	view_start = (unsigned int)min (p, nsaved);
1770
1771	return scr_changeview (oldviewstart);
1772	}	1819	}
1773		1820
1774	/* ------------------------------------------------------------------------- */	1821	/* ------------------------------------------------------------------------- */
1775	/*	1822	/*
1776	* Page the screen up/down nlines	1823	* Page the screen up/down nlines
1777	* direction should be UP or DN	1824	* direction should be UP or DN
1778	*/	1825	*/
1779	int	1826	bool
1780	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1827	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1781	{	1828	{
1782	int n;	1829	int new_view_start =
1783	unsigned int oldviewstart;
1784
1785	oldviewstart = view_start;
1786
1787	if (direction == UP)
1788	{
1789	n = view_start + nlines;
1790	view_start = min (n, nsaved);
1791	}
1792	else
1793	{
1794	n = view_start - nlines;	1830	direction == UP ? view_start - nlines
1795	view_start = max (n, 0);	1831	: view_start + nlines;
1796	}
1797		1832
1798	return scr_changeview (oldviewstart);	1833	return scr_changeview (new_view_start);
1799	}	1834	}
1800		1835
1801	int	1836	bool
1802	rxvt_term::scr_changeview (unsigned int oldviewstart)	1837	rxvt_term::scr_changeview (int new_view_start)
1803	{	1838	{
		1839	clamp_it (new_view_start, top_row, 0);
		1840
1804	if (view_start != oldviewstart)	1841	if (new_view_start == view_start)
1805	{	1842	return false;
		1843
		1844	num_scr += new_view_start - view_start;
		1845	view_start = new_view_start;
		1846	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1806	want_refresh = 1;	1847	want_refresh = 1;
1807	num_scr -= (view_start - oldviewstart);
1808	}
1809		1848
1810	return (int) (view_start - oldviewstart);	1849	return true;
1811	}	1850	}
1812		1851
1813	/* ------------------------------------------------------------------------- */	1852	/* ------------------------------------------------------------------------- */
1814	void	1853	void
1815	rxvt_term::scr_bell ()	1854	rxvt_term::scr_bell ()
1816	{	1855	{
1817	#ifndef NO_BELL	1856	#ifndef NO_BELL
1818		1857
1819	# ifndef NO_MAPALERT	1858	# ifndef NO_MAPALERT
1820	# ifdef MAPALERT_OPTION	1859	# ifdef MAPALERT_OPTION
1821	if (options & Opt_mapAlert)	1860	if (OPTION (Opt_mapAlert))
1822	# endif	1861	# endif
1823	XMapWindow (display->display, parent[0]);	1862	XMapWindow (display->display, parent[0]);
1824	# endif	1863	# endif
1825		1864
1826	if (options & Opt_visualBell)	1865	if (OPTION (Opt_visualBell))
1827	{	1866	{
1828	scr_rvideo_mode (!rvideo); /* refresh also done */	1867	scr_rvideo_mode (!rvideo); /* refresh also done */
		1868	display->flush ();
1829	rxvt_usleep (VISUAL_BELL_DURATION);	1869	rxvt_usleep (VISUAL_BELL_DURATION);
1830	scr_rvideo_mode (!rvideo); /* refresh also done */	1870	scr_rvideo_mode (!rvideo); /* refresh also done */
1831	}	1871	}
1832	else	1872	else
1833	XBell (display->display, 0);	1873	XBell (display->display, 0);
…		…
1847	if ((fd = popen_printer ()) == NULL)	1887	if ((fd = popen_printer ()) == NULL)
1848	return;	1888	return;
1849		1889
1850	if (fullhist)	1890	if (fullhist)
1851	{	1891	{
1852	nrows = nrow + nsaved;	1892	nrows = nrow - top_row;
1853	row_start = -nsaved;	1893	row_start = top_row;
1854	}	1894	}
1855	else	1895	else
1856	{	1896	{
1857	nrows = nrow;	1897	nrows = nrow;
1858	row_start = -view_start;	1898	row_start = view_start;
1859	}	1899	}
1860		1900
1861	wctomb (0, 0);	1901	wctomb (0, 0);
1862		1902
1863	for (int r1 = 0; r1 < nrows; r1++)	1903	for (int r1 = 0; r1 < nrows; r1++)
…		…
1922		1962
1923	#if XPM_BACKGROUND	1963	#if XPM_BACKGROUND
1924	must_clear |= bgPixmap.pixmap != None;	1964	must_clear |= bgPixmap.pixmap != None;
1925	#endif	1965	#endif
1926	#if TRANSPARENT	1966	#if TRANSPARENT
1927	must_clear |= (options & Opt_transparent) && am_transparent;	1967	must_clear |= OPTION (Opt_transparent) && am_transparent;
1928	#endif	1968	#endif
1929	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1969	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1930		1970
1931	/*	1971	/*
1932	* B: reverse any characters which are selected	1972	* B: reverse any characters which are selected
…		…
1956		1996
1957	crp = &ROW(screen.cur.row).r[col];	1997	crp = &ROW(screen.cur.row).r[col];
1958		1998
1959	if (showcursor && focus)	1999	if (showcursor && focus)
1960	{	2000	{
1961	if (options & Opt_cursorUnderline)	2001	if (OPTION (Opt_cursorUnderline))
1962	*crp ^= RS_Uline;	2002	*crp ^= RS_Uline;
1963	else	2003	else
1964	{	2004	{
1965	*crp ^= RS_RVid;	2005	*crp ^= RS_RVid;
1966		2006
…		…
1968	cc1 = *crp & (RS_fgMask | RS_bgMask);	2008	cc1 = *crp & (RS_fgMask | RS_bgMask);
1969	if (ISSET_PIXCOLOR (Color_cursor))	2009	if (ISSET_PIXCOLOR (Color_cursor))
1970	ccol1 = Color_cursor;	2010	ccol1 = Color_cursor;
1971	else	2011	else
1972	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2012	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1973	ccol1 = GET_FGCOLOR (rstyle);	2013	ccol1 = fgcolor_of (rstyle);
1974	#else	2014	#else
1975	ccol1 = Color_fg;	2015	ccol1 = Color_fg;
1976	#endif	2016	#endif
1977	if (ISSET_PIXCOLOR (Color_cursor2))	2017	if (ISSET_PIXCOLOR (Color_cursor2))
1978	ccol2 = Color_cursor2;	2018	ccol2 = Color_cursor2;
1979	else	2019	else
1980	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2020	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1981	ccol2 = GET_BGCOLOR (rstyle);	2021	ccol2 = bgcolor_of (rstyle);
1982	#else	2022	#else
1983	ccol2 = Color_bg;	2023	ccol2 = Color_bg;
1984	#endif	2024	#endif
1985	*crp = SET_FGCOLOR (*crp, ccol1);	2025	*crp = SET_FGCOLOR (*crp, ccol1);
1986	*crp = SET_BGCOLOR (*crp, ccol2);	2026	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
1991		2031
1992	/* make sure no outline cursor is left around */	2032	/* make sure no outline cursor is left around */
1993	setoldcursor = 0;	2033	setoldcursor = 0;
1994	if (ocrow != -1)	2034	if (ocrow != -1)
1995	{	2035	{
1996	if (screen.cur.row + view_start != ocrow	2036	if (screen.cur.row - view_start != ocrow
1997	|| screen.cur.col != oldcursor.col)	2037	|| screen.cur.col != oldcursor.col)
1998	{	2038	{
1999	if (ocrow < nrow	2039	if (ocrow < nrow
2000	&& oldcursor.col < ncol)	2040	&& oldcursor.col < ncol)
2001	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2041	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
2009	else if (!focus)	2049	else if (!focus)
2010	setoldcursor = 1;	2050	setoldcursor = 1;
2011		2051
2012	if (setoldcursor)	2052	if (setoldcursor)
2013	{	2053	{
2014	if (screen.cur.row + view_start >= nrow)	2054	if (screen.cur.row - view_start >= nrow)
2015	oldcursor.row = -1;	2055	oldcursor.row = -1;
2016	else	2056	else
2017	{	2057	{
2018	oldcursor.row = screen.cur.row + view_start;	2058	oldcursor.row = screen.cur.row - view_start;
2019	oldcursor.col = screen.cur.col;	2059	oldcursor.col = screen.cur.col;
2020	}	2060	}
2021	}	2061	}
2022	}	2062	}
2023		2063
		2064	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2024	#if ENABLE_OVERLAY	2065	#if ENABLE_OVERLAY
2025	scr_swap_overlay ();	2066	scr_swap_overlay ();
2026	#endif	2067	#endif
2027		2068
2028	#ifndef NO_SLOW_LINK_SUPPORT	2069	#ifndef NO_SLOW_LINK_SUPPORT
…		…
2044	row = i > 0 ? 0 : j - 1;	2085	row = i > 0 ? 0 : j - 1;
2045	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2086	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2046	{	2087	{
2047	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2088	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2048	{	2089	{
2049	line_t s = ROW(row - view_start);	2090	line_t s = ROW(view_start + row);
2050	line_t d = drawn_buf[row];	2091	line_t d = drawn_buf[row];
2051	line_t d2 = drawn_buf[row + i];	2092	line_t d2 = drawn_buf[row + i];
2052		2093
2053	for (nits = 0, col = ncol; col--; )	2094	for (nits = 0, col = ncol; col--; )
2054	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2095	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2078	if (wlen < len)	2119	if (wlen < len)
2079	::swap (wlen, len);	2120	::swap (wlen, len);
2080		2121
2081	XCopyArea (display->display, vt, vt,	2122	XCopyArea (display->display, vt, vt,
2082	gc, 0, Row2Pixel (len + i),	2123	gc, 0, Row2Pixel (len + i),
2083	(unsigned int)TermWin_TotalWidth (),	2124	(unsigned int)this->width,
2084	(unsigned int)Height2Pixel (wlen - len + 1),	2125	(unsigned int)Height2Pixel (wlen - len + 1),
2085	0, Row2Pixel (len));	2126	0, Row2Pixel (len));
2086	len = -1;	2127	len = -1;
2087	}	2128	}
2088	}	2129	}
…		…
2092	/*	2133	/*
2093	* E: main pass across every character	2134	* E: main pass across every character
2094	*/	2135	*/
2095	for (row = 0; row < nrow; row++)	2136	for (row = 0; row < nrow; row++)
2096	{	2137	{
2097	text_t *stp = ROW(row - view_start).t;	2138	text_t *stp = ROW(view_start + row).t;
2098	rend_t *srp = ROW(row - view_start).r;	2139	rend_t *srp = ROW(view_start + row).r;
2099	text_t *dtp = drawn_buf[row].t;	2140	text_t *dtp = drawn_buf[row].t;
2100	rend_t *drp = drawn_buf[row].r;	2141	rend_t *drp = drawn_buf[row].r;
2101		2142
2102	/*	2143	/*
2103	* E2: OK, now the real pass	2144	* E2: OK, now the real pass
…		…
2167	count++, i--;	2208	count++, i--;
2168		2209
2169	/*	2210	/*
2170	* Determine the attributes for the string	2211	* Determine the attributes for the string
2171	*/	2212	*/
2172	int fore = GET_FGCOLOR (rend); // desired foreground	2213	int fore = fgcolor_of (rend); // desired foreground
2173	int back = GET_BGCOLOR (rend); // desired background	2214	int back = bgcolor_of (rend); // desired background
2174		2215
2175	// only do special processing if any attributes are set, which is rare	2216	// only do special processing if any attributes are set, which is unlikely
2176	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2217	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2177	{	2218	{
2178	#if ENABLE_STYLES	2219	#if ENABLE_STYLES
2179	// force redraw after "careful" characters to avoid pixel droppings	2220	// force redraw after "careful" characters to avoid pixel droppings
2180	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2221	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2291	} /* for (row....) */	2332	} /* for (row....) */
2292		2333
2293	#if ENABLE_OVERLAY	2334	#if ENABLE_OVERLAY
2294	scr_swap_overlay ();	2335	scr_swap_overlay ();
2295	#endif	2336	#endif
		2337	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2296		2338
2297	/*	2339	/*
2298	* G: cleanup cursor and display outline cursor if necessary	2340	* G: cleanup cursor and display outline cursor if necessary
2299	*/	2341	*/
2300	if (showcursor)	2342	if (showcursor)
2301	{	2343	{
2302	if (focus)	2344	if (focus)
2303	{	2345	{
2304	if (options & Opt_cursorUnderline)	2346	if (OPTION (Opt_cursorUnderline))
2305	*crp ^= RS_Uline;	2347	*crp ^= RS_Uline;
2306	else	2348	else
2307	{	2349	{
2308	*crp ^= RS_RVid;	2350	*crp ^= RS_RVid;
2309	#ifndef NO_CURSORCOLOR	2351	#ifndef NO_CURSORCOLOR
…		…
2339	/*	2381	/*
2340	* H: cleanup selection	2382	* H: cleanup selection
2341	*/	2383	*/
2342	scr_reverse_selection ();	2384	scr_reverse_selection ();
2343		2385
2344	if (refresh_type & SMOOTH_REFRESH)
2345	XFlush (display->display);
2346
2347	num_scr = 0;	2386	num_scr = 0;
2348	num_scr_allow = 1;	2387	num_scr_allow = 1;
2349	}	2388	}
2350		2389
2351	void	2390	void
2352	rxvt_term::scr_remap_chars (const line_t &l)	2391	rxvt_term::scr_remap_chars (line_t &l)
2353	{	2392	{
2354	if (!l.t)	2393	if (!l.t)
2355	return;	2394	return;
		2395
		2396	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2356		2397
2357	for (int i = ncol; i--; )	2398	for (int i = ncol; i--; )
2358	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2399	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2359	}	2400	}
2360		2401
…		…
2413		2454
2414	if (really)	2455	if (really)
2415	XClearWindow (display->display, vt);	2456	XClearWindow (display->display, vt);
2416	}	2457	}
2417		2458
		2459	void
		2460	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
		2461	{
		2462	int view_end = view_start + nrow;
		2463	int row, col;
		2464
		2465	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
		2466	{
		2467	text_t *stp = ROW(row).t;
		2468	rend_t *srp = ROW(row).r;
		2469
		2470	for (col = beg_col; col < end_col; col++)
		2471	srp[col] ^= rstyle1;
		2472
		2473	while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2474	srp[col] ^= rstyle2;
		2475
		2476	if (++col < end_col)
		2477	srp[col] ^= rstyle2;
		2478	}
		2479	}
		2480
		2481	void
		2482	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
		2483	{
		2484	int view_end = view_start + nrow;
		2485	int row, col;
		2486
		2487	if (beg_row >= view_start)
		2488	{
		2489	col = beg_col;
		2490	row = beg_row;
		2491	}
		2492	else
		2493	{
		2494	col = 0;
		2495	row = view_start;
		2496	}
		2497
		2498	for (; row < min (end_row, view_end); row++, col = 0)
		2499	for (rend_t *srp = ROW(row).r; col < ncol; col++)
		2500	srp[col] ^= rstyle;
		2501
		2502	if (row == end_row)
		2503	for (rend_t *srp = ROW(row).r; col < end_col; col++)
		2504	srp[col] ^= rstyle;
		2505	}
		2506
2418	/* ------------------------------------------------------------------------- */	2507	/* ------------------------------------------------------------------------- */
2419	void	2508	void
2420	rxvt_term::scr_reverse_selection ()	2509	rxvt_term::scr_reverse_selection ()
2421	{	2510	{
2422	if (selection.op	2511	if (selection.op
2423	&& current_screen == selection.screen	2512	&& current_screen == selection.screen
2424	&& selection.end.row >= -view_start)	2513	&& selection.end.row >= view_start)
2425	{	2514	{
2426	int view_end = -view_start + nrow;
2427	int row, col;
2428
2429	#if ENABLE_FRILLS	2515	#if ENABLE_FRILLS
2430	if (selection.rect)	2516	if (selection.rect)
2431	{	2517	scr_xor_rect (selection.beg.row, selection.beg.col,
2432	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2518	selection.end.row, selection.end.col,
2433	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2519	RS_RVid, RS_RVid | RS_Uline);
2434	srp[col] ^= RS_RVid;
2435	}
2436	else	2520	else
2437	#endif	2521	#endif
2438	{	2522	scr_xor_span (selection.beg.row, selection.beg.col,
2439	if (selection.beg.row >= -view_start)	2523	selection.end.row, selection.end.col,
2440	{	2524	RS_RVid);
2441	col = selection.beg.col;
2442	row = selection.beg.row;
2443	}
2444	else
2445	{
2446	col = 0;
2447	row = view_start;
2448	}
2449
2450	for (; row < min (selection.end.row, view_end); row++, col = 0)
2451	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2452	srp[col] ^= RS_RVid;
2453
2454	if (row == selection.end.row)
2455	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2456	srp[col] ^= RS_RVid;
2457	}
2458	}	2525	}
2459	}	2526	}
2460		2527
2461	/* ------------------------------------------------------------------------- */	2528	/* ------------------------------------------------------------------------- */
2462	/*	2529	/*
…		…
2500		2567
2501	if (!selection.op)	2568	if (!selection.op)
2502	return;	2569	return;
2503		2570
2504	pos.row = pos.col = 0;	2571	pos.row = pos.col = 0;
2505	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2572	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2506	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2573	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2507	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2574	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2508	|| (check_more == 1	2575	|| (check_more == 1
2509	&& current_screen == selection.screen	2576	&& current_screen == selection.screen
2510	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2577	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2511	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2578	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2512	|| (check_more == 2	2579	|| (check_more == 2
…		…
2523	/* ------------------------------------------------------------------------- */	2590	/* ------------------------------------------------------------------------- */
2524	/*	2591	/*
2525	* Paste a selection direct to the command fd	2592	* Paste a selection direct to the command fd
2526	*/	2593	*/
2527	void	2594	void
2528	rxvt_term::paste (unsigned char *data, unsigned int len)	2595	rxvt_term::paste (char *data, unsigned int len)
2529	{	2596	{
2530	/* convert normal newline chars into common keyboard Return key sequence */	2597	/* convert normal newline chars into common keyboard Return key sequence */
2531	for (unsigned int i = 0; i < len; i++)	2598	for (unsigned int i = 0; i < len; i++)
2532	if (data[i] == C0_LF)	2599	if (data[i] == C0_LF)
2533	data[i] = C0_CR;	2600	data[i] = C0_CR;
…		…
2677	{	2744	{
2678	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2745	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2679	char *s = rxvt_wcstombs (w);	2746	char *s = rxvt_wcstombs (w);
2680	free (w);	2747	free (w);
2681	// TODO: strlen == only the first element will be converted. well...	2748	// TODO: strlen == only the first element will be converted. well...
2682	paste ((unsigned char *)s, strlen (s));	2749	paste (s, strlen (s));
2683	free (s);	2750	free (s);
2684	}	2751	}
2685	else	2752	else
2686	#endif	2753	#endif
2687	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2754	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2688	&& cl)	2755	&& cl)
2689	{	2756	{
2690	for (int i = 0; i < cr; i++)	2757	for (int i = 0; i < cr; i++)
2691	paste ((unsigned char *)cl[i], strlen (cl[i]));	2758	paste (cl[i], strlen (cl[i]));
2692		2759
2693	XFreeStringList (cl);	2760	XFreeStringList (cl);
2694	}	2761	}
2695	else	2762	else
2696	paste (ct.value, ct.nitems); // paste raw	2763	paste ((char *)ct.value, ct.nitems); // paste raw
2697		2764
2698	bailout:	2765	bailout:
2699	XFree (ct.value);	2766	XFree (ct.value);
2700		2767
2701	if (selection_wait == Sel_normal)	2768	if (selection_wait == Sel_normal)
…		…
2739	return; /* outside window */	2806	return; /* outside window */
2740		2807
2741	if (selection.text)	2808	if (selection.text)
2742	{ /* internal selection */	2809	{ /* internal selection */
2743	char *str = rxvt_wcstombs (selection.text, selection.len);	2810	char *str = rxvt_wcstombs (selection.text, selection.len);
2744	paste ((unsigned char *)str, strlen (str));	2811	paste (str, strlen (str));
2745	free (str);	2812	free (str);
2746	return;	2813	return;
2747	}	2814	}
2748	else	2815	else
2749	{	2816	{
…		…
2841	selection.op = SELECTION_DONE;	2908	selection.op = SELECTION_DONE;
2842		2909
2843	if (selection.clicks == 4)	2910	if (selection.clicks == 4)
2844	return; /* nothing selected, go away */	2911	return; /* nothing selected, go away */
2845		2912
		2913	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2914	return;
		2915
2846	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2916	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2847	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2917	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2848		2918
2849	int ofs = 0;	2919	int ofs = 0;
2850	int extra = 0;	2920	int extra = 0;
…		…
2862	col = selection.beg.col;	2932	col = selection.beg.col;
2863	end_col = ncol + 1;	2933	end_col = ncol + 1;
2864	}	2934	}
2865	else	2935	else
2866	#endif	2936	#endif
2867	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2937	end_col = ROW(row).l;
2868		2938
2869	col = max (col, 0);	2939	col = max (col, 0);
2870		2940
2871	if (row == selection.end.row || selection.rect)	2941	if (row == selection.end.row
		2942	#if ENABLE_FRILLS
		2943	|| selection.rect
		2944	#endif
		2945	)
2872	end_col = min (end_col, selection.end.col);	2946	min_it (end_col, selection.end.col);
2873		2947
2874	t = ROW(row).t + col;	2948	t = ROW(row).t + col;
		2949
2875	for (; col < end_col; col++)	2950	for (; col < end_col; col++)
2876	{	2951	{
2877	if (*t == NOCHAR)	2952	if (*t == NOCHAR)
2878	t++;	2953	t++;
2879	#if ENABLE_COMBINING	2954	#if ENABLE_COMBINING
…		…
2895	#endif	2970	#endif
2896	else	2971	else
2897	new_selection_text[ofs++] = *t++;	2972	new_selection_text[ofs++] = *t++;
2898	}	2973	}
2899		2974
		2975	#if ENABLE_FRILLS
		2976	if (selection.rect)
		2977	{
		2978	while (ofs
		2979	&& new_selection_text[ofs - 1] != C0_LF
		2980	&& unicode::is_space (new_selection_text[ofs - 1]))
		2981	--ofs;
		2982
		2983	new_selection_text[ofs++] = C0_LF;
		2984	}
		2985	else
		2986	#endif
2900	if (!ROW(row).is_longer () && row != selection.end.row)	2987	if (!ROW(row).is_longer () && row != selection.end.row)
2901	new_selection_text[ofs++] = C0_LF;	2988	new_selection_text[ofs++] = C0_LF;
2902	}	2989	}
2903		2990
2904	if (end_col != selection.end.col)	2991	if (end_col != selection.end.col)
2905	new_selection_text[ofs++] = C0_LF;	2992	new_selection_text[ofs++] = C0_LF;
2906		2993
…		…
2916		3003
2917	// we usually allocate much more than necessary, so realloc it smaller again	3004	// we usually allocate much more than necessary, so realloc it smaller again
2918	selection.len = ofs;	3005	selection.len = ofs;
2919	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	3006	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2920		3007
		3008	if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		3009	return;
		3010
		3011	selection_grab (tm);
		3012	}
		3013
		3014	bool
		3015	rxvt_term::selection_grab (Time tm)
		3016	{
		3017	selection_time = tm;
		3018
2921	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3019	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2922	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3020	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		3021	{
2923	display->set_selection_owner (this);	3022	display->set_selection_owner (this);
		3023	return true;
		3024	}
2924	else	3025	else
2925	rxvt_warn ("can't get primary selection, ignoring.\n");	3026	{
		3027	selection_clear ();
		3028	return false;
		3029	}
2926		3030
2927	#if 0	3031	#if 0
2928	XTextProperty ct;	3032	XTextProperty ct;
2929		3033
2930	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3034	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2931	{	3035	{
2932	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3036	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2933	XFree (ct.value);	3037	XFree (ct.value);
2934	}	3038	}
2935	#endif	3039	#endif
2936
2937	selection_time = tm;
2938	}	3040	}
2939		3041
2940	/* ------------------------------------------------------------------------- */	3042	/* ------------------------------------------------------------------------- */
2941	/*	3043	/*
2942	* Mark or select text based upon number of clicks: 1, 2, or 3	3044	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
2946	rxvt_term::selection_click (int clicks, int x, int y)	3048	rxvt_term::selection_click (int clicks, int x, int y)
2947	{	3049	{
2948	clicks = ((clicks - 1) % 3) + 1;	3050	clicks = ((clicks - 1) % 3) + 1;
2949	selection.clicks = clicks; /* save clicks so extend will work */	3051	selection.clicks = clicks; /* save clicks so extend will work */
2950		3052
		3053	if (clicks == 2 && !selection.rect
		3054	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3055	{
		3056	MEvent.clicks = 1; // what a mess
		3057	selection.screen = current_screen;
		3058	selection.op = SELECTION_CONT;
		3059	return;
		3060	}
		3061
2951	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3062	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2952		3063
2953	if (clicks == 2 || clicks == 3)	3064	if (clicks == 2 || clicks == 3)
2954	selection_extend_colrow (selection.mark.col,	3065	selection_extend_colrow (selection.mark.col,
2955	selection.mark.row + view_start,	3066	selection.mark.row - view_start,
2956	0, /* button 3 */	3067	0, /* button 3 */
2957	1, /* button press */	3068	1, /* button press */
2958	0); /* click change */	3069	0); /* click change */
2959	}	3070	}
2960		3071
…		…
2965	void	3076	void
2966	rxvt_term::selection_start_colrow (int col, int row)	3077	rxvt_term::selection_start_colrow (int col, int row)
2967	{	3078	{
2968	want_refresh = 1;	3079	want_refresh = 1;
2969		3080
2970	selection.mark.row = row - view_start;	3081	selection.mark.row = row + view_start;
2971	selection.mark.col = col;	3082	selection.mark.col = col;
2972		3083
2973	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3084	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2974	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3085	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2975		3086
2976	while (selection.mark.col > 0	3087	while (selection.mark.col > 0
2977	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3088	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2978	--selection.mark.col;	3089	--selection.mark.col;
…		…
3006	text_t *stp;	3117	text_t *stp;
3007	rend_t *srp;	3118	rend_t *srp;
3008		3119
3009	if (dirn == UP)	3120	if (dirn == UP)
3010	{	3121	{
3011	bound.row = - nsaved - 1;	3122	bound.row = top_row - 1;
3012	bound.col = 0;	3123	bound.col = 0;
3013	dirnadd = -1;	3124	dirnadd = -1;
3014	}	3125	}
3015	else	3126	else
3016	{	3127	{
…		…
3064	}	3175	}
3065	}	3176	}
3066	break;	3177	break;
3067	}	3178	}
3068		3179
3069	Old_Word_Selection_You_Die:
3070	if (dirn == DN)	3180	if (dirn == DN)
3071	col++; /* put us on one past the end */	3181	col++; /* put us on one past the end */
3072		3182
3073	/* Poke the values back in */	3183	/* Poke the values back in */
3074	ret->row = row;	3184	ret->row = row;
…		…
3095	* select nothing. Otherwise, if we're to the right of the mark, you have to	3205	* select nothing. Otherwise, if we're to the right of the mark, you have to
3096	* be _past_ a character for it to be selected.	3206	* be _past_ a character for it to be selected.
3097	*/	3207	*/
3098	if (((selection.clicks % 3) == 1) && !flag	3208	if (((selection.clicks % 3) == 1) && !flag
3099	&& (col == selection.mark.col	3209	&& (col == selection.mark.col
3100	&& (row == selection.mark.row + view_start)))	3210	&& (row == selection.mark.row - view_start)))
3101	{	3211	{
3102	/* select nothing */	3212	/* select nothing */
3103	selection.beg.row = selection.end.row = 0;	3213	selection.beg.row = selection.end.row = 0;
3104	selection.beg.col = selection.end.col = 0;	3214	selection.beg.col = selection.end.col = 0;
3105	selection.clicks = 4;	3215	selection.clicks = 4;
…		…
3160	selection.beg.col = selection.end.col = selection.mark.col;	3270	selection.beg.col = selection.end.col = selection.mark.col;
3161	selection.beg.row = selection.end.row = selection.mark.row;	3271	selection.beg.row = selection.end.row = selection.mark.row;
3162	}	3272	}
3163		3273
3164	pos.col = col;	3274	pos.col = col;
3165	pos.row = row - view_start;	3275	pos.row = view_start + row;
3166		3276
3167	/*	3277	/*
3168	* This is mainly xterm style selection with a couple of differences, mainly	3278	* This is mainly xterm style selection with a couple of differences, mainly
3169	* in the way button3 drag extension works.	3279	* in the way button3 drag extension works.
3170	* We're either doing: button1 drag; button3 press; or button3 drag	3280	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3257	selection_delimit_word (DN, &selection.end, &selection.end);	3367	selection_delimit_word (DN, &selection.end, &selection.end);
3258	}	3368	}
3259	else if (selection.clicks == 3)	3369	else if (selection.clicks == 3)
3260	{	3370	{
3261	#if ENABLE_FRILLS	3371	#if ENABLE_FRILLS
3262	if (options & Opt_tripleclickwords)	3372	if (OPTION (Opt_tripleclickwords))
3263	{	3373	{
3264	selection_delimit_word (UP, &selection.beg, &selection.beg);	3374	selection_delimit_word (UP, &selection.beg, &selection.beg);
3265		3375
3266	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3376	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3267	{	3377	{
…		…
3328	{	3438	{
3329	stp = ROW(end_row).t;	3439	stp = ROW(end_row).t;
3330		3440
3331	while (--end_col >= 0)	3441	while (--end_col >= 0)
3332	{	3442	{
3333	if (stp[end_col] != ' '	3443	if (stp[end_col] != NOCHAR
3334	&& stp[end_col] != '\t'	3444	&& !unicode::is_space (stp[end_col]))
3335	&& stp[end_col] != NOCHAR)
3336	break;	3445	break;
3337	}	3446	}
3338		3447
3339	if (end_col >= 0	3448	if (end_col >= 0
3340	|| !ROW(end_row - 1).is_longer ())	3449	|| !ROW(end_row - 1).is_longer ())
…		…
3539		3648
3540	#if ENABLE_OVERLAY	3649	#if ENABLE_OVERLAY
3541	void	3650	void
3542	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3651	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3543	{	3652	{
3544	if (nrow < 3 || ncol < 3)	3653	if (nrow < 1 || ncol < 1)
3545	return;	3654	return;
3546		3655
3547	want_refresh = 1;	3656	want_refresh = 1;
3548		3657
3549	scr_overlay_off ();	3658	scr_overlay_off ();
…		…
3656	for (int y = ov_h; y--; )	3765	for (int y = ov_h; y--; )
3657	{	3766	{
3658	text_t *t1 = ov_text[y];	3767	text_t *t1 = ov_text[y];
3659	rend_t *r1 = ov_rend[y];	3768	rend_t *r1 = ov_rend[y];
3660		3769
3661	text_t *t2 = ROW(y - view_start).t + ov_x;	3770	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3662	rend_t *r2 = ROW(y - view_start).r + ov_x;	3771	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3663		3772
3664	for (int x = ov_w; x--; )	3773	for (int x = ov_w; x--; )
3665	{	3774	{
3666	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3775	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3667	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3776	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