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

Diff Legend

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