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