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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 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);
…		…
235	CLEAR_ALL_SELECTION ();	239	CLEAR_ALL_SELECTION ();
236	rvideo = 0;	240	rvideo = 0;
237	}	241	}
238	else	242	else
239	{	243	{
		244	CLEAR_ALL_SELECTION ();
		245
240	/*	246	/*
241	* add or delete rows as appropriate	247	* add or delete rows as appropriate
242	*/	248	*/
243
244	printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245		249
246	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));	250	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	251	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248		252
249	#if 0	253	#if 0
…		…
255	lfree (drawn_buf[row]);	259	lfree (drawn_buf[row]);
256	}	260	}
257	}	261	}
258	#endif	262	#endif
259		263
260	drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t));	264	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261	temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262	swap_buf = (line_t *) rxvt_realloc (swap_buf , nrow * sizeof (line_t));	265	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263		266
264	for (int row = min (nrow, prev_nrow); row--; )	267	for (int row = min (nrow, prev_nrow); row--; )
265	{	268	{
266	lresize (drawn_buf[row]);	269	lresize (drawn_buf[row]);
267	lresize (swap_buf [row]);	270	lresize (swap_buf [row]);
…		…
271	{	274	{
272	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	275	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274	}	277	}
275		278
		279	line_t *old_buf = row_buf;
276	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277		281
278	// re-wrap lines, this is rather ugly, possibly because I am too dumb
279	// to come up with a lean and mean algorithm.
280
281	int p = MOD (term_start + nrow , prev_total_rows); // previous row	282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282	int pend = MOD (term_start - nsaved, prev_total_rows);	283	int pend = MOD (term_start + top_row , prev_total_rows);
283	int q = total_rows; // rewrapped row	284	int q = total_rows; // rewrapped row
284		285
285	while (p != pend && q > 0)	286	if (top_row)
		287	{
		288	// re-wrap lines, this is rather ugly, possibly because I am too dumb
		289	// to come up with a lean and mean algorithm.
		290
		291	row_col_t ocur = screen.cur;
		292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
		293
286	{	294	do
287	p = MOD (p - 1, prev_total_rows);
288
289	assert (old_buf [MOD (p, prev_total_rows)].t);
290	assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292	int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295	{	295	{
296	p = MOD (p - 1, prev_total_rows);	296	p = MOD (p - 1, prev_total_rows);
297		297	#ifdef DEBUG_STRICT
298	llen += prev_ncol;	298	assert (old_buf [MOD (p, prev_total_rows)].t);
299	}	299	#endif
300
301	int qlines = llen / ncol + 1;
302	int lofs = 0;	300	int plines = 1;
		301	int llen = old_buf [MOD (p, prev_total_rows)].l;
303		302
304	q -= qlines;	303	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305
306	int qrow = q;
307
308	for (; qlines--; qrow++)
309	{
310	if (qrow >= 0)
311	{	304	{
		305	p = MOD (p - 1, prev_total_rows);
		306
		307	plines++;
		308	llen += prev_ncol;
		309	}
		310
		311	int qlines = max (0, (llen - 1) / ncol) + 1;
		312
		313	// drop partial lines completely
		314	if (q < qlines)
		315	break;
		316
		317	q -= qlines;
		318
		319	int lofs = 0;
		320	line_t *qline;
		321
		322	// re-assemble the full line by destination lines
		323	for (int qrow = q; qlines--; qrow++)
		324	{
312	line_t &qline = row_buf [qrow];	325	qline = row_buf + qrow;
313
314	lalloc (qline);	326	lalloc (*qline);
		327	qline->l = ncol;
315	qline.set_is_longer ();	328	qline->is_longer (1);
316		329
317	int qcol = 0;	330	int qcol = 0;
318		331
		332	// see below for cursor adjustment rationale
		333	if (p == ocur.row)
		334	screen.cur.row = q - (total_rows - nrow);
319	for (;;)	335
		336	// fill a single destination line
		337	while (lofs < llen && qcol < ncol)
320	{	338	{
321	int prow = lofs / prev_ncol + p;	339	int prow = lofs / prev_ncol;
322	int pcol = lofs % prev_ncol;	340	int pcol = lofs % prev_ncol;
323		341
		342	prow = MOD (p + prow, prev_total_rows);
		343
		344	// we only adjust the cursor _row_ and put it into
		345	// the topmost line of "long line" it was in, as
		346	// this seems to upset applications/shells/readline
		347	// least.
		348	if (prow == ocur.row)
		349	screen.cur.row = q - (total_rows - nrow);
		350
324	line_t &pline = old_buf [p];	351	line_t &pline = old_buf [prow];
325		352
326	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	353	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327		354
328	printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
329
330	if (len <= 0)
331	{
332	qline.l = qcol;
333	scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334	break;
335	}
336
337	assert (lofs < 1000);	355	assert (len);
		356	assert (pline.t);
338		357
339	memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t));	358	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340	memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t));	359	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341		360
342	lofs += len;	361	lofs += len;
343	qcol += len;	362	qcol += len;
344
345	if (qcol == ncol)
346	break;
347	}	363	}
348	}	364	}
349	else	365
350	lofs += ncol;	366	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
		367	qline->is_longer (0);
		368	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351	}	369	}
		370	while (p != pend && q > 0);
		371
		372	term_start = total_rows - nrow;
		373	top_row = q - term_start;
		374
		375	// make sure all terminal lines exist
		376	while (top_row > 0)
		377	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
		378	}
		379	else
		380	{
		381	// if no scrollback exists (yet), wing, instead of wrap
		382
		383	for (int row = min (nrow, prev_nrow); row--; )
		384	{
		385	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
		386	line_t &qline = row_buf [row];
		387
		388	qline = pline;
		389	lresize (qline);
		390	}
		391
		392	for (int row = prev_nrow; row < nrow; row++)
		393	{
		394	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
		395	}
		396
		397	term_start = 0;
352	}	398	}
353		399
354	free (old_buf);	400	free (old_buf);
355	delete old_ta;	401	delete old_ta;
356	delete old_ra;	402	delete old_ra;
357		403
358	min_it (screen.cur.row, nrow - 1);	404	clamp_it (screen.cur.row, 0, nrow - 1);
359	min_it (screen.cur.col, ncol - 1);	405	clamp_it (screen.cur.col, 0, ncol - 1);
360		406
361	if (tabs)	407	if (tabs)
362	free (tabs);	408	free (tabs);
363	}	409	}
364		410
…		…
369		415
370	for (int col = ncol; col--; )	416	for (int col = ncol; col--; )
371	tabs [col] = col % TABSIZE == 0;	417	tabs [col] = col % TABSIZE == 0;
372		418
373	tt_winch ();	419	tt_winch ();
		420
		421	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374	}	422	}
375		423
376	/* ------------------------------------------------------------------------- */	424	/* ------------------------------------------------------------------------- */
377	/*	425	/*
378	* Free everything. That way malloc debugging can find leakage.	426	* Free everything. That way malloc debugging can find leakage.
…		…
384	delete ralloc; ralloc = 0;	432	delete ralloc; ralloc = 0;
385		433
386	free (row_buf);	434	free (row_buf);
387	free (swap_buf);	435	free (swap_buf);
388	free (drawn_buf);	436	free (drawn_buf);
389	free (temp_buf);
390	free (tabs);	437	free (tabs);
		438
		439	row_buf = 0; // signal that we freed all the arrays
391	}	440	}
392		441
393	/* ------------------------------------------------------------------------- */	442	/* ------------------------------------------------------------------------- */
394	/*	443	/*
395	* Hard reset	444	* Hard reset
…		…
400	scr_release ();	449	scr_release ();
401	prev_nrow = prev_ncol = 0;	450	prev_nrow = prev_ncol = 0;
402	scr_reset ();	451	scr_reset ();
403		452
404	scr_clear (true);	453	scr_clear (true);
405	scr_refresh (SLOW_REFRESH);	454	scr_refresh ();
406	}	455	}
407		456
408	/* ------------------------------------------------------------------------- *	457	/* ------------------------------------------------------------------------- *
409	* PROCESS SCREEN COMMANDS *	458	* PROCESS SCREEN COMMANDS *
410	* ------------------------------------------------------------------------- */	459	* ------------------------------------------------------------------------- */
…		…
451	min_it (s->cur.row, nrow - 1);	500	min_it (s->cur.row, nrow - 1);
452	min_it (s->cur.col, ncol - 1);	501	min_it (s->cur.col, ncol - 1);
453	#ifdef DEBUG_STRICT	502	#ifdef DEBUG_STRICT
454	assert (s->cur.row >= 0);	503	assert (s->cur.row >= 0);
455	assert (s->cur.col >= 0);	504	assert (s->cur.col >= 0);
456	#else /* drive with your eyes closed */
457	max_it (s->cur.row, 0);
458	max_it (s->cur.col, 0);
459	#endif	505	#endif
460	}	506	}
461		507
462	/* ------------------------------------------------------------------------- */	508	/* ------------------------------------------------------------------------- */
463	/*	509	/*
…		…
483		529
484	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);	530	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);	531	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486		532
487	#if NSCREENS	533	#if NSCREENS
488	if (options & Opt_secondaryScreen)	534	if (OPTION (Opt_secondaryScreen))
489	{	535	{
490	num_scr = 0;	536	num_scr = 0;
491		537
492	for (int i = nrow; i--; )	538	for (int i = prev_nrow; i--; )
493	::swap (ROW(i), swap_buf [i]);	539	::swap (ROW(i), swap_buf [i]);
494		540
495	::swap (screen.charset, swap.charset);	541	::swap (screen.charset, swap.charset);
496	::swap (screen.flags, swap.flags);	542	::swap (screen.flags, swap.flags);
497	screen.flags |= Screen_VisibleCursor;	543	screen.flags |= Screen_VisibleCursor;
498	swap.flags |= Screen_VisibleCursor;	544	swap.flags |= Screen_VisibleCursor;
499	}	545	}
500	else	546	else
501	#endif	547	#endif
502	if (options & Opt_secondaryScroll)	548	if (OPTION (Opt_secondaryScroll))
503	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	549	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504		550
505	return scrn;	551	return scrn;
506	}	552	}
507		553
…		…
527	* Change the colour for following text	573	* Change the colour for following text
528	*/	574	*/
529	void	575	void
530	rxvt_term::scr_color (unsigned int color, int fgbg)	576	rxvt_term::scr_color (unsigned int color, int fgbg)
531	{	577	{
532	if (color > maxTermCOLOR)	578	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533	color = fgbg;	579	color = fgbg;
534		580
535	if (fgbg == Color_fg)	581	if (fgbg == Color_fg)
536	rstyle = SET_FGCOLOR (rstyle, color);	582	rstyle = SET_FGCOLOR (rstyle, color);
537	else	583	else
…		…
568	want_refresh = 1;	614	want_refresh = 1;
569	num_scr += count;	615	num_scr += count;
570		616
571	if (count > 0	617	if (count > 0
572	&& row1 == 0	618	&& row1 == 0
573	&& row2 == nrow - 1
574	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	619	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575	{	620	{
576	nsaved = min (nsaved + count, saveLines);	621	top_row = max (top_row - count, -saveLines);
		622
		623	// scroll everything up 'count' lines
577	term_start = (term_start + count) % total_rows;	624	term_start = (term_start + count) % total_rows;
578		625
		626	// sever bottommost line
		627	{
		628	line_t &l = ROW(row2 - count);
		629	l.is_longer (0);
		630	l.touch ();
		631	}
		632
		633	// erase newly scrolled-in lines
		634	for (int i = count; i--; )
		635	{
		636	// basically this is a slightly optimized scr_blank_screen_mem
		637	// it is worth the effort on slower machines
		638	line_t &l = ROW(nrow - 1 - i);
		639
		640	scr_blank_line (l, 0, l.l, rstyle);
		641
		642	l.l = 0;
		643	l.f = 0;
		644	}
		645
		646	// now copy lines below the scroll region bottom to the
		647	// bottom of the screen again, so they look as if they
		648	// hadn't moved.
		649	for (int i = nrow; --i > row2; )
		650	{
		651	line_t &l1 = ROW(i - count);
		652	line_t &l2 = ROW(i);
		653
		654	::swap (l1, l2);
		655	l2.touch ();
		656	}
		657
		658	// move and/or clear selection, if any
579	if (selection.op && current_screen == selection.screen)	659	if (selection.op && current_screen == selection.screen)
580	{	660	{
581	selection.beg.row -= count;	661	selection.beg.row -= count;
582	selection.end.row -= count;	662	selection.end.row -= count;
583	selection.mark.row -= count;	663	selection.mark.row -= count;
584		664
585	selection_check (0);	665	if (selection.beg.row < top_row
586	}	666	|| selection.end.row < top_row
587		667	|| selection.mark.row < top_row)
588	for (int i = count; i--; )
589	scr_blank_screen_mem (ROW(row2 - i), rstyle);
590
591	if ((options & Opt_scrollWithBuffer)
592	&& view_start != 0
593	&& view_start != saveLines)
594	scr_page (UP, count);
595	}
596	else
597	{
598	if (selection.op && current_screen == selection.screen)
599	{
600	int i = selection.beg.row;
601	int j = selection.end.row;
602
603	if ((i < row1 && j > row1)
604	|| (i < row2 && j > row2)
605	|| (i - count < row1 && i >= row1)
606	|| (i - count > row2 && i <= row2)
607	|| (j - count < row1 && j >= row1)
608	|| (j - count > row2 && j <= row2))
609	{	668	{
610	CLEAR_ALL_SELECTION ();	669	CLEAR_ALL_SELECTION ();
611	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	670	selection.op = SELECTION_CLEAR;
612	}	671	}
613	else if (j >= row1 && j <= row2)	672	}
		673
		674	// finally move the view window, if desired
		675	if (OPTION (Opt_scrollWithBuffer)
		676	&& view_start != 0
		677	&& view_start != -saveLines)
		678	scr_page (UP, count);
		679
		680	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
		681	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
		682	}
		683	else
		684	{
		685	if (selection.op && current_screen == selection.screen)
		686	{
		687	if ((selection.beg.row < row1 && selection.end.row > row1)
		688	|| (selection.beg.row < row2 && selection.end.row > row2)
		689	|| (selection.beg.row - count < row1 && selection.beg.row >= row1)
		690	|| (selection.beg.row - count > row2 && selection.beg.row <= row2)
		691	|| (selection.end.row - count < row1 && selection.end.row >= row1)
		692	|| (selection.end.row - count > row2 && selection.end.row <= row2))
		693	{
		694	CLEAR_ALL_SELECTION ();
		695	selection.op = SELECTION_CLEAR;
		696	}
		697	else if (selection.end.row >= row1 && selection.end.row <= row2)
614	{	698	{
615	/* move selected region too */	699	/* move selected region too */
616	selection.beg.row -= count;	700	selection.beg.row -= count;
617	selection.end.row -= count;	701	selection.end.row -= count;
618	selection.mark.row -= count;	702	selection.mark.row -= count;
…		…
626		710
627	int rows = row2 - row1 + 1;	711	int rows = row2 - row1 + 1;
628		712
629	min_it (count, rows);	713	min_it (count, rows);
630		714
		715	line_t *temp_buf = row_buf + total_rows;
		716
631	for (int row = 0; row < rows; row++)	717	for (int row = 0; row < rows; row++)
632	{	718	{
633	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	719	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634		720
635	if (!IN_RANGE_EXC (row + count, 0, rows))	721	if (!IN_RANGE_EXC (row + count, 0, rows))
…		…
646	/* ------------------------------------------------------------------------- */	732	/* ------------------------------------------------------------------------- */
647	/*	733	/*
648	* Add text given in <str> of length <len> to screen struct	734	* Add text given in <str> of length <len> to screen struct
649	*/	735	*/
650	void	736	void
651	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	737	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652	{	738	{
653	if (len <= 0) /* sanity */	739	if (len <= 0) /* sanity */
654	return;	740	return;
655		741
656	unsigned char checksel;	742	unsigned char checksel;
657	unicode_t c;	743	unicode_t c;
658	int row, last_col;	744	int ncol = this->ncol;
659	const unicode_t *strend = str + len;	745	const wchar_t *strend = str + len;
660		746
661	want_refresh = 1;	747	want_refresh = 1;
662	ZERO_SCROLLBACK ();	748	ZERO_SCROLLBACK ();
663	last_col = ncol;
664		749
665	if (nlines > 0)	750	if (minlines > 0)
666	{	751	{
667	nlines += screen.cur.row - screen.bscroll;	752	minlines += screen.cur.row - screen.bscroll;
		753
668	if (nlines > 0	754	if (minlines > 0
669	&& screen.tscroll == 0	755	&& screen.tscroll == 0
670	&& screen.bscroll == (nrow - 1))	756	&& screen.bscroll == nrow - 1)
671	{	757	{
672	/* _at least_ this many lines need to be scrolled */	758	/* _at least_ this many lines need to be scrolled */
673	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	759	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674	screen.cur.row -= nlines;	760	screen.cur.row -= minlines;
675	}	761	}
676	}	762	}
677		763
678	#ifdef DEBUG_STRICT	764	#ifdef DEBUG_STRICT
679	assert (screen.cur.col < last_col);	765	assert (screen.cur.col < ncol);
680	assert (screen.cur.row < nrow	766	assert (screen.cur.row < nrow
681	&& screen.cur.row >= -nsaved);	767	&& screen.cur.row >= top_row);
682	#else /* drive with your eyes closed */
683	min_it (screen.cur.col, last_col - 1);
684	clamp_it (screen.cur.row, -nsaved, nrow - 1);
685	#endif	768	#endif
686	row = screen.cur.row;	769	int row = screen.cur.row;
687		770
688	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	771	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689		772
690	line_t *line = &ROW(row);	773	line_t *line = &ROW(row);
691		774
692	while (str < strend)	775	while (str < strend)
693	{	776	{
694	c = *str++;	777	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695		778
696	if (c < 0x20)	779	if (c < 0x20)
697	if (c == C0_LF)	780	if (c == C0_LF)
698	{	781	{
699	if (!line->is_longer ()) /* XXX: think about this */
700	max_it (line->l, screen.cur.col);	782	max_it (line->l, screen.cur.col);
701		783
702	screen.flags &= ~Screen_WrapNext;	784	screen.flags &= ~Screen_WrapNext;
703		785
704	if (screen.cur.row == screen.bscroll)	786	if (screen.cur.row == screen.bscroll)
705	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	787	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
709	line = &ROW(row); /* _must_ refresh */	791	line = &ROW(row); /* _must_ refresh */
710	continue;	792	continue;
711	}	793	}
712	else if (c == C0_CR)	794	else if (c == C0_CR)
713	{	795	{
714	if (!line->is_longer ()) /* XXX: think about this */
715	max_it (line->l, screen.cur.col);	796	max_it (line->l, screen.cur.col);
716		797
717	screen.flags &= ~Screen_WrapNext;	798	screen.flags &= ~Screen_WrapNext;
718	screen.cur.col = 0;	799	screen.cur.col = 0;
719	continue;	800	continue;
720	}	801	}
…		…
737	CLEAR_SELECTION ();	818	CLEAR_SELECTION ();
738	}	819	}
739		820
740	if (screen.flags & Screen_WrapNext)	821	if (screen.flags & Screen_WrapNext)
741	{	822	{
742	line->set_is_longer ();
743
744	scr_do_wrap ();	823	scr_do_wrap ();
745		824
		825	line->l = ncol;
		826	line->is_longer (1);
		827
746	row = screen.cur.row;	828	row = screen.cur.row;
747	line = &ROW(row); /* _must_ refresh */	829	line = &ROW(row); /* _must_ refresh */
748	}	830	}
749		831
750	// some utf-8 decoders "decode" surrogate characters: let's fix this.	832	// some utf-8 decoders "decode" surrogate characters: let's fix this.
…		…
755	// do wcwidth before further replacements, as wcwidth might return -1	837	// do wcwidth before further replacements, as wcwidth might return -1
756	// for the line drawing characters below as they might be invalid in the current	838	// for the line drawing characters below as they might be invalid in the current
757	// locale.	839	// locale.
758	int width = c < 0x100 ? 1 : wcwidth (c);	840	int width = c < 0x100 ? 1 : wcwidth (c);
759		841
760	if (charsets[screen.charset] == '0') // DEC SPECIAL	842	if (charsets [screen.charset] == '0') // DEC SPECIAL
761	{	843	{
762	// vt100 special graphics and line drawing	844	// vt100 special graphics and line drawing
763	// 5f-7e standard vt100	845	// 5f-7e standard vt100
764	// 40-5e rxvt extension for extra curses acs chars	846	// 40-5e rxvt extension for extra curses acs chars
765	static uint16_t vt100_0[62] = { // 41 .. 7e	847	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
817	}	899	}
818		900
819	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	901	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820		902
821	// if the character doesn't fit into the remaining columns...	903	// if the character doesn't fit into the remaining columns...
822	if (screen.cur.col > last_col - width && last_col >= width)	904	if (screen.cur.col > ncol - width && ncol >= width)
823	{	905	{
824	// ...output spaces	906	// ...output spaces
825	c = ' ';	907	c = ' ';
826	// and try the same character next loop iteration	908	// and try the same character next loop iteration
827	--str;	909	--str;
828	}	910	}
829		911
		912	line->touch ();
		913
830	do	914	do
831	{	915	{
832	line->t[screen.cur.col] = c;	916	line->t[screen.cur.col] = c;
833	line->r[screen.cur.col] = rend;	917	line->r[screen.cur.col] = rend;
834		918
835	if (screen.cur.col < last_col - 1)	919	if (screen.cur.col < ncol - 1)
836	screen.cur.col++;	920	screen.cur.col++;
837	else	921	else
838	{	922	{
839	line->l = last_col;	923	line->l = ncol;
840	if (screen.flags & Screen_Autowrap)	924	if (screen.flags & Screen_Autowrap)
841	screen.flags |= Screen_WrapNext;	925	screen.flags |= Screen_WrapNext;
842	break;	926	break;
843	}	927	}
844		928
…		…
846	}	930	}
847	while (--width > 0);	931	while (--width > 0);
848		932
849	// pad with spaces when overwriting wide character with smaller one	933	// pad with spaces when overwriting wide character with smaller one
850	if (!width)	934	if (!width)
		935	{
		936	line->touch ();
		937
851	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)	938	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852	{	939	{
853	line->t[c] = ' ';	940	line->t[c] = ' ';
854	line->r[c] = rend;	941	line->r[c] = rend;
855	}	942	}
		943	}
856	}	944	}
857	else // width == 0	945	else // width == 0
858	{	946	{
859	#if ENABLE_COMBINING	947	#if ENABLE_COMBINING
860	// handle combining characters	948	// handle combining characters
861	// we just tag the accent on the previous on-screen character.	949	// we just tag the accent on the previous on-screen character.
862	// this is arguably not correct, but also arguably not wrong.	950	// this is arguably not correct, but also arguably not wrong.
863	// we don't handle double-width characters nicely yet.	951	// we don't handle double-width characters nicely yet.
		952	line_t *linep;
864	text_t *tp;	953	text_t *tp;
865	rend_t *rp;	954	rend_t *rp;
866		955
867	if (screen.cur.col > 0)	956	if (screen.cur.col > 0)
868	{	957	{
		958	linep = line;
869	tp = line->t + screen.cur.col - 1;	959	tp = line->t + screen.cur.col - 1;
870	rp = line->r + screen.cur.col - 1;	960	rp = line->r + screen.cur.col - 1;
871
872	while (*tp == NOCHAR && tp > line->t)
873	tp--, rp--;
874	}	961	}
875	else if (screen.cur.row > 0	962	else if (screen.cur.row > 0
876	&& ROW(screen.cur.row - 1).is_longer ())	963	&& ROW(screen.cur.row - 1).is_longer ())
877	{	964	{
878	line_t *line = &ROW(screen.cur.row - 1);	965	linep = &ROW(screen.cur.row - 1);
879
880	tp = line->t + last_col - 1;	966	tp = line->t + ncol - 1;
881	rp = line->r + last_col - 1;	967	rp = line->r + ncol - 1;
882
883	while (*tp == NOCHAR && tp > line->t)
884	tp--, rp--;
885	}	968	}
886	else	969	else
887	continue;	970	continue;
		971
		972	linep->touch ();
		973
		974	while (*tp == NOCHAR && tp > linep->t)
		975	tp--, rp--;
888		976
889	// first try to find a precomposed character	977	// first try to find a precomposed character
890	unicode_t n = rxvt_compose (*tp, c);	978	unicode_t n = rxvt_compose (*tp, c);
891	if (n == NOCHAR)	979	if (n == NOCHAR)
892	n = rxvt_composite.compose (*tp, c);	980	n = rxvt_composite.compose (*tp, c);
…		…
895	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	983	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896	#endif	984	#endif
897	}	985	}
898	}	986	}
899		987
900	if (!line->is_longer ()) /* XXX: think about this */
901	max_it (line->l, screen.cur.col);	988	max_it (line->l, screen.cur.col);
902		989
903	#ifdef DEBUG_STRICT	990	#ifdef DEBUG_STRICT
904	assert (screen.cur.row >= 0);	991	assert (screen.cur.row >= 0);
905	#else /* drive with your eyes closed */
906	max_it (screen.cur.row, 0);
907	#endif	992	#endif
908	}	993	}
909		994
910	/* ------------------------------------------------------------------------- */	995	/* ------------------------------------------------------------------------- */
911	/*	996	/*
…		…
950		1035
951	if (count == 0)	1036	if (count == 0)
952	return;	1037	return;
953	else if (count > 0)	1038	else if (count > 0)
954	{	1039	{
955	int row = screen.cur.row;
956
957	line_t &l = ROW(row);	1040	line_t &l = ROW(screen.cur.row);
958	rend_t base_rend = l.r[i];	1041	rend_t base_rend = l.r[i];
959	ht &= l.t[i] == ' ';	1042	ht &= l.t[i] == ' ';
960		1043
961	for (; ++i < ncol; )	1044	for (; ++i < ncol; )
962	if (tabs[i])	1045	if (tabs[i])
963	{	1046	{
964	x = i;	1047	x = i;
		1048
965	if (!--count)	1049	if (!--count)
966	break;	1050	break;
967	}	1051	}
968	else	1052	else
969	ht &= l.t[i] == ' '	1053	ht &= l.t[i] == ' '
…		…
972	if (count)	1056	if (count)
973	x = ncol - 1;	1057	x = ncol - 1;
974		1058
975	// store horizontal tab commands as characters inside the text	1059	// store horizontal tab commands as characters inside the text
976	// buffer so they can be selected and pasted.	1060	// buffer so they can be selected and pasted.
977	if (ht && options & Opt_pastableTabs)	1061	if (ht && OPTION (Opt_pastableTabs))
978	{	1062	{
979	base_rend = SET_FONT (base_rend, 0);	1063	base_rend = SET_FONT (base_rend, 0);
980		1064
981	if (!l.is_longer ()) /* XXX: think about this */	1065	l.touch (x);
982	max_it (l.l, x);
983		1066
984	i = screen.cur.col;	1067	i = screen.cur.col;
985		1068
986	l.t[i] = '\t';	1069	l.t[i] = '\t';
987	l.r[i] = base_rend;	1070	l.r[i] = base_rend;
…		…
1037	*/	1120	*/
1038	#if ENABLE_FRILLS	1121	#if ENABLE_FRILLS
1039	void	1122	void
1040	rxvt_term::scr_forwardindex ()	1123	rxvt_term::scr_forwardindex ()
1041	{	1124	{
1042	int row;
1043
1044	if (screen.cur.col < ncol - 1)	1125	if (screen.cur.col < ncol - 1)
1045	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1126	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046	else	1127	else
1047	{	1128	{
1048	row = screen.cur.row;	1129	line_t &l = ROW(screen.cur.row);
1049		1130
1050	if (ROW(row).is_longer ()) //TODO//FIXME//LEN	1131	l.touch ();
1051	ROW(row).l = ncol;	1132	l.is_longer (0);
1052		1133
1053	scr_gotorc (0, 0, R_RELATIVE);	1134	scr_gotorc (0, 0, R_RELATIVE);
1054	scr_insdel_chars (1, DELETE);	1135	scr_insdel_chars (1, DELETE);
1055	scr_gotorc (0, ncol - 1, R_RELATIVE);	1136	scr_gotorc (0, ncol - 1, R_RELATIVE);
1056	}	1137	}
…		…
1139	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1220	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1140	*/	1221	*/
1141	void	1222	void
1142	rxvt_term::scr_erase_line (int mode)	1223	rxvt_term::scr_erase_line (int mode)
1143	{	1224	{
1144	unsigned int row, col, num;	1225	unsigned int col, num;
1145		1226
1146	want_refresh = 1;	1227	want_refresh = 1;
1147	ZERO_SCROLLBACK ();	1228	ZERO_SCROLLBACK ();
1148		1229
1149	selection_check (1);	1230	selection_check (1);
1150		1231
1151	row = screen.cur.row;	1232	line_t &line = ROW(screen.cur.row);
		1233
		1234	line.touch ();
		1235	line.is_longer (0);
1152		1236
1153	switch (mode)	1237	switch (mode)
1154	{	1238	{
1155	case 0: /* erase to end of line */	1239	case 0: /* erase to end of line */
1156	col = screen.cur.col;	1240	col = screen.cur.col;
1157	num = ncol - col;	1241	num = ncol - col;
1158	min_it (ROW(row).l, col);	1242	min_it (line.l, col);
1159	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1243	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1244	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161	CLEAR_SELECTION ();	1245	CLEAR_SELECTION ();
1162	break;	1246	break;
1163	case 1: /* erase to beginning of line */	1247	case 1: /* erase to beginning of line */
…		…
1168	CLEAR_SELECTION ();	1252	CLEAR_SELECTION ();
1169	break;	1253	break;
1170	case 2: /* erase whole line */	1254	case 2: /* erase whole line */
1171	col = 0;	1255	col = 0;
1172	num = ncol;	1256	num = ncol;
1173	ROW(row).l = 0;	1257	line.l = 0;
1174	if (selection.beg.row <= screen.cur.row	1258	if (selection.beg.row <= screen.cur.row
1175	&& selection.end.row >= screen.cur.row)	1259	&& selection.end.row >= screen.cur.row)
1176	CLEAR_SELECTION ();	1260	CLEAR_SELECTION ();
1177	break;	1261	break;
1178	default:	1262	default:
1179	return;	1263	return;
1180	}	1264	}
1181		1265
1182	scr_blank_line (ROW(row), col, num, rstyle);	1266	scr_blank_line (line, col, num, rstyle);
1183	}	1267	}
1184		1268
1185	/* ------------------------------------------------------------------------- */	1269	/* ------------------------------------------------------------------------- */
1186	/*	1270	/*
1187	* Erase part of whole of the screen	1271	* Erase part of whole of the screen
…		…
1242	CLEAR_ROWS (row, num);	1326	CLEAR_ROWS (row, num);
1243	}	1327	}
1244	else	1328	else
1245	{	1329	{
1246	ren = rstyle & (RS_fgMask | RS_bgMask);	1330	ren = rstyle & (RS_fgMask | RS_bgMask);
1247	gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];	1331	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1332	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249	ERASE_ROWS (row, num);	1333	ERASE_ROWS (row, num);
1250	gcvalue.foreground = pix_colors[Color_fg];	1334	gcvalue.foreground = pix_colors[Color_fg];
1251	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1335	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252	}	1336	}
1253		1337
1254	for (; num--; row++)	1338	for (; num--; row++)
1255	{	1339	{
1256	scr_blank_screen_mem (ROW (row), rstyle);	1340	scr_blank_screen_mem (ROW(row), rstyle);
1257	ROW (row).l = 0;
1258	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1341	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259	}	1342	}
1260	}	1343	}
1261		1344
1262	#if ENABLE_FRILLS	1345	#if ENABLE_FRILLS
…		…
1264	rxvt_term::scr_erase_savelines ()	1347	rxvt_term::scr_erase_savelines ()
1265	{	1348	{
1266	want_refresh = 1;	1349	want_refresh = 1;
1267	ZERO_SCROLLBACK ();	1350	ZERO_SCROLLBACK ();
1268		1351
1269	nsaved = 0;	1352	top_row = 0;
1270	}	1353	}
1271	#endif	1354	#endif
1272		1355
1273	/* ------------------------------------------------------------------------- */	1356	/* ------------------------------------------------------------------------- */
1274	/*	1357	/*
…		…
1295	rend_t *r1 = line.r;	1378	rend_t *r1 = line.r;
1296		1379
1297	for (int j = ncol; j--; )	1380	for (int j = ncol; j--; )
1298	*r1++ = fs;	1381	*r1++ = fs;
1299		1382
1300	line.l = ncol; /* make the `E's selectable */	1383	line.is_longer (0);
		1384	line.touch (ncol);
1301	}	1385	}
1302	}	1386	}
1303		1387
1304	/* ------------------------------------------------------------------------- */	1388	/* ------------------------------------------------------------------------- */
1305	/*	1389	/*
…		…
1353	min_it (count, ncol - screen.cur.col);	1437	min_it (count, ncol - screen.cur.col);
1354		1438
1355	row = screen.cur.row;	1439	row = screen.cur.row;
1356		1440
1357	line_t *line = &ROW(row);	1441	line_t *line = &ROW(row);
		1442
		1443	line->touch ();
		1444	line->is_longer (0);
1358		1445
1359	switch (insdel)	1446	switch (insdel)
1360	{	1447	{
1361	case INSERT:	1448	case INSERT:
1362	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1449	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363	{	1450	{
1364	line->t[col] = line->t[col - count];	1451	line->t[col] = line->t[col - count];
1365	line->r[col] = line->r[col - count];	1452	line->r[col] = line->r[col - count];
1366	}	1453	}
1367		1454
1368	if (!line->is_longer ())	1455	line->l = min (line->l + count, ncol);
1369	{
1370	line->l += count;
1371	min_it (line->l, ncol);
1372	}
1373		1456
1374	if (selection.op && current_screen == selection.screen	1457	if (selection.op && current_screen == selection.screen
1375	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1458	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376	{	1459	{
1377	if (selection.end.row != screen.cur.row	1460	if (selection.end.row != screen.cur.row
…		…
1390		1473
1391	case ERASE:	1474	case ERASE:
1392	screen.cur.col += count; /* don't worry if > ncol */	1475	screen.cur.col += count; /* don't worry if > ncol */
1393	selection_check (1);	1476	selection_check (1);
1394	screen.cur.col -= count;	1477	screen.cur.col -= count;
		1478
		1479	line->l = max (line->l - count, 0);
1395	scr_blank_line (*line, screen.cur.col, count, rstyle);	1480	scr_blank_line (*line, screen.cur.col, count, rstyle);
1396	break;	1481	break;
1397		1482
1398	case DELETE:	1483	case DELETE:
1399	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1484	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1402	{	1487	{
1403	line->t[col] = line->t[col + count];	1488	line->t[col] = line->t[col + count];
1404	line->r[col] = line->r[col + count];	1489	line->r[col] = line->r[col + count];
1405	}	1490	}
1406		1491
		1492	line->l = max (line->l - count, 0);
1407	scr_blank_line (*line, ncol - count, count, tr);	1493	scr_blank_line (*line, ncol - count, count, tr);
1408
1409	if (line->is_longer ()) /* break line continuation */
1410	line->l = ncol;
1411
1412	line->l = max (line->l - count, 0);
1413		1494
1414	if (selection.op && current_screen == selection.screen	1495	if (selection.op && current_screen == selection.screen
1415	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1496	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416	{	1497	{
1417	if (selection.end.row != screen.cur.row	1498	if (selection.end.row != screen.cur.row
…		…
1529	rxvt_term::scr_set_tab (int mode)	1610	rxvt_term::scr_set_tab (int mode)
1530	{	1611	{
1531	if (mode < 0)	1612	if (mode < 0)
1532	memset (tabs, 0, ncol * sizeof (char));	1613	memset (tabs, 0, ncol * sizeof (char));
1533	else if (screen.cur.col < ncol)	1614	else if (screen.cur.col < ncol)
1534	tabs[screen.cur.col] = (mode ? 1 : 0);	1615	tabs [screen.cur.col] = !!mode;
1535	}	1616	}
1536		1617
1537	/* ------------------------------------------------------------------------- */	1618	/* ------------------------------------------------------------------------- */
1538	/*	1619	/*
1539	* Set reverse/normal video	1620	* Set reverse/normal video
…		…
1551	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1632	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552	#if XPM_BACKGROUND	1633	#if XPM_BACKGROUND
1553	if (bgPixmap.pixmap == None)	1634	if (bgPixmap.pixmap == None)
1554	#endif	1635	#endif
1555	#if TRANSPARENT	1636	#if TRANSPARENT
1556	if (! (options & Opt_transparent) || am_transparent == 0)	1637	if (! OPTION (Opt_transparent) || am_transparent == 0)
1557	#endif	1638	#endif
1558	XSetWindowBackground (display->display, vt,	1639	XSetWindowBackground (display->display, vt,
1559	pix_colors[Color_bg]);	1640	pix_colors[Color_bg]);
1560		1641
1561	gcvalue.foreground = pix_colors[Color_fg];	1642	gcvalue.foreground = pix_colors[Color_fg];
…		…
1586	* Set font style	1667	* Set font style
1587	*/	1668	*/
1588	void	1669	void
1589	rxvt_term::set_font_style ()	1670	rxvt_term::set_font_style ()
1590	{	1671	{
		1672	#if 0
1591	switch (charsets[screen.charset])	1673	switch (charsets [screen.charset])
1592	{	1674	{
1593	case '0': /* DEC Special Character & Line Drawing Set */	1675	case '0': /* DEC Special Character & Line Drawing Set */
1594	break;	1676	break;
1595	case 'A': /* United Kingdom (UK) */	1677	case 'A': /* United Kingdom (UK) */
1596	break;	1678	break;
…		…
1603	case 'C': /* Finnish character set */	1685	case 'C': /* Finnish character set */
1604	break;	1686	break;
1605	case 'K': /* German character set */	1687	case 'K': /* German character set */
1606	break;	1688	break;
1607	}	1689	}
		1690	#endif
1608	}	1691	}
1609		1692
1610	/* ------------------------------------------------------------------------- */	1693	/* ------------------------------------------------------------------------- */
1611	/*	1694	/*
1612	* Choose a font	1695	* Choose a font
…		…
1691	y = 0;	1774	y = 0;
1692	eheight = height;	1775	eheight = height;
1693	}	1776	}
1694	#endif	1777	#endif
1695		1778
1696	#ifdef DEBUG_STRICT
1697	#if 0
1698	// that's not debugging //TODO //FIXME
1699	clamp_it (x, 0, width);
1700	clamp_it (y, 0, height);
1701	#endif
1702	#endif
1703
1704	/* round down */	1779	/* round down */
1705	rc[PART_BEG].col = Pixel2Col (x);	1780	rc[PART_BEG].col = Pixel2Col (x);
1706	rc[PART_BEG].row = Pixel2Row (y);	1781	rc[PART_BEG].row = Pixel2Row (y);
1707	/* round up */	1782	/* round up */
1708	rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);	1783	rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
…		…
1716	}	1791	}
1717		1792
1718	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1793	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1719	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1794	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1720		1795
		1796	num_scr_allow = 0;
		1797
1721	if (refresh)	1798	if (refresh)
1722	scr_refresh (SLOW_REFRESH);	1799	scr_refresh ();
1723	}	1800	}
1724		1801
1725	/* ------------------------------------------------------------------------- */	1802	/* ------------------------------------------------------------------------- */
1726	/*	1803	/*
1727	* Refresh the entire screen	1804	* Refresh the entire screen
…		…
1735	/* ------------------------------------------------------------------------- */	1812	/* ------------------------------------------------------------------------- */
1736	/*	1813	/*
1737	* Move the display so that the line represented by scrollbar value Y is at	1814	* Move the display so that the line represented by scrollbar value Y is at
1738	* the top of the screen	1815	* the top of the screen
1739	*/	1816	*/
1740	int	1817	void
1741	rxvt_term::scr_move_to (int y, int len)	1818	rxvt_term::scr_move_to (int y, int len)
1742	{	1819	{
1743	long p = 0;	1820	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1744	unsigned int oldviewstart;
1745
1746	oldviewstart = view_start;
1747
1748	if (y < len)
1749	{
1750	p = (nrow + nsaved) * (len - y) / len;
1751	p -= (long) (nrow - 1);
1752	p = max (p, 0);
1753	}
1754
1755	view_start = (unsigned int)min (p, nsaved);
1756
1757	return scr_changeview (oldviewstart);
1758	}	1821	}
1759		1822
1760	/* ------------------------------------------------------------------------- */	1823	/* ------------------------------------------------------------------------- */
1761	/*	1824	/*
1762	* Page the screen up/down nlines	1825	* Page the screen up/down nlines
1763	* direction should be UP or DN	1826	* direction should be UP or DN
1764	*/	1827	*/
1765	int	1828	bool
1766	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1829	rxvt_term::scr_page (enum page_dirn direction, int nlines)
1767	{	1830	{
1768	int n;	1831	int new_view_start =
1769	unsigned int oldviewstart;
1770
1771	oldviewstart = view_start;
1772
1773	if (direction == UP)
1774	{
1775	n = view_start + nlines;
1776	view_start = min (n, nsaved);
1777	}
1778	else
1779	{
1780	n = view_start - nlines;	1832	direction == UP ? view_start - nlines
1781	view_start = max (n, 0);	1833	: view_start + nlines;
1782	}
1783		1834
1784	return scr_changeview (oldviewstart);	1835	return scr_changeview (new_view_start);
1785	}	1836	}
1786		1837
1787	int	1838	bool
1788	rxvt_term::scr_changeview (unsigned int oldviewstart)	1839	rxvt_term::scr_changeview (int new_view_start)
1789	{	1840	{
		1841	clamp_it (new_view_start, top_row, 0);
		1842
1790	if (view_start != oldviewstart)	1843	if (new_view_start == view_start)
1791	{	1844	return false;
		1845
		1846	num_scr += new_view_start - view_start;
		1847	view_start = new_view_start;
1792	want_refresh = 1;	1848	want_refresh = 1;
1793	num_scr -= (view_start - oldviewstart);
1794	}
1795		1849
1796	return (int) (view_start - oldviewstart);	1850	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
		1851
		1852	return true;
1797	}	1853	}
1798		1854
1799	/* ------------------------------------------------------------------------- */	1855	/* ------------------------------------------------------------------------- */
1800	void	1856	void
1801	rxvt_term::scr_bell ()	1857	rxvt_term::scr_bell ()
1802	{	1858	{
1803	#ifndef NO_BELL	1859	#ifndef NO_BELL
1804		1860
1805	# ifndef NO_MAPALERT	1861	# ifndef NO_MAPALERT
1806	# ifdef MAPALERT_OPTION	1862	# ifdef MAPALERT_OPTION
1807	if (options & Opt_mapAlert)	1863	if (OPTION (Opt_mapAlert))
1808	# endif	1864	# endif
1809	XMapWindow (display->display, parent[0]);	1865	XMapWindow (display->display, parent[0]);
1810	# endif	1866	# endif
1811		1867
1812	if (options & Opt_visualBell)	1868	if (OPTION (Opt_visualBell))
1813	{	1869	{
1814	scr_rvideo_mode (!rvideo); /* refresh also done */	1870	scr_rvideo_mode (!rvideo); /* refresh also done */
		1871	display->flush ();
1815	rxvt_usleep (VISUAL_BELL_DURATION);	1872	rxvt_usleep (VISUAL_BELL_DURATION);
1816	scr_rvideo_mode (!rvideo); /* refresh also done */	1873	scr_rvideo_mode (!rvideo); /* refresh also done */
1817	}	1874	}
1818	else	1875	else
1819	XBell (display->display, 0);	1876	XBell (display->display, 0);
…		…
1833	if ((fd = popen_printer ()) == NULL)	1890	if ((fd = popen_printer ()) == NULL)
1834	return;	1891	return;
1835		1892
1836	if (fullhist)	1893	if (fullhist)
1837	{	1894	{
1838	nrows = nrow + nsaved;	1895	nrows = nrow - top_row;
1839	row_start = -nsaved;	1896	row_start = top_row;
1840	}	1897	}
1841	else	1898	else
1842	{	1899	{
1843	nrows = nrow;	1900	nrows = nrow;
1844	row_start = -view_start;	1901	row_start = view_start;
1845	}	1902	}
1846		1903
1847	wctomb (0, 0);	1904	wctomb (0, 0);
1848		1905
1849	for (int r1 = 0; r1 < nrows; r1++)	1906	for (int r1 = 0; r1 < nrows; r1++)
…		…
1881	* Refresh the screen	1938	* Refresh the screen
1882	* drawn_text/drawn_rend contain the screen information before the update.	1939	* drawn_text/drawn_rend contain the screen information before the update.
1883	* screen.text/screen.rend contain what the screen will change to.	1940	* screen.text/screen.rend contain what the screen will change to.
1884	*/	1941	*/
1885	void	1942	void
1886	rxvt_term::scr_refresh (unsigned char refresh_type)	1943	rxvt_term::scr_refresh ()
1887	{	1944	{
1888	unsigned char must_clear, /* use draw_string not draw_image_string */	1945	unsigned char must_clear, /* use draw_string not draw_image_string */
1889	showcursor; /* show the cursor */	1946	showcursor; /* show the cursor */
1890	int16_t col, row, /* column/row we're processing */	1947	int16_t col, row, /* column/row we're processing */
1891	ocrow; /* old cursor row */	1948	ocrow; /* old cursor row */
…		…
1908		1965
1909	#if XPM_BACKGROUND	1966	#if XPM_BACKGROUND
1910	must_clear |= bgPixmap.pixmap != None;	1967	must_clear |= bgPixmap.pixmap != None;
1911	#endif	1968	#endif
1912	#if TRANSPARENT	1969	#if TRANSPARENT
1913	must_clear |= (options & Opt_transparent) && am_transparent;	1970	must_clear |= OPTION (Opt_transparent) && am_transparent;
1914	#endif	1971	#endif
1915	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	1972	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916		1973
1917	/*	1974	/*
1918	* B: reverse any characters which are selected	1975	* B: reverse any characters which are selected
…		…
1942		1999
1943	crp = &ROW(screen.cur.row).r[col];	2000	crp = &ROW(screen.cur.row).r[col];
1944		2001
1945	if (showcursor && focus)	2002	if (showcursor && focus)
1946	{	2003	{
1947	if (options & Opt_cursorUnderline)	2004	if (OPTION (Opt_cursorUnderline))
1948	*crp ^= RS_Uline;	2005	*crp ^= RS_Uline;
1949	else	2006	else
1950	{	2007	{
1951	*crp ^= RS_RVid;	2008	*crp ^= RS_RVid;
1952		2009
…		…
1954	cc1 = *crp & (RS_fgMask | RS_bgMask);	2011	cc1 = *crp & (RS_fgMask | RS_bgMask);
1955	if (ISSET_PIXCOLOR (Color_cursor))	2012	if (ISSET_PIXCOLOR (Color_cursor))
1956	ccol1 = Color_cursor;	2013	ccol1 = Color_cursor;
1957	else	2014	else
1958	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2015	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959	ccol1 = GET_FGCOLOR (rstyle);	2016	ccol1 = fgcolor_of (rstyle);
1960	#else	2017	#else
1961	ccol1 = Color_fg;	2018	ccol1 = Color_fg;
1962	#endif	2019	#endif
1963	if (ISSET_PIXCOLOR (Color_cursor2))	2020	if (ISSET_PIXCOLOR (Color_cursor2))
1964	ccol2 = Color_cursor2;	2021	ccol2 = Color_cursor2;
1965	else	2022	else
1966	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2023	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967	ccol2 = GET_BGCOLOR (rstyle);	2024	ccol2 = bgcolor_of (rstyle);
1968	#else	2025	#else
1969	ccol2 = Color_bg;	2026	ccol2 = Color_bg;
1970	#endif	2027	#endif
1971	*crp = SET_FGCOLOR (*crp, ccol1);	2028	*crp = SET_FGCOLOR (*crp, ccol1);
1972	*crp = SET_BGCOLOR (*crp, ccol2);	2029	*crp = SET_BGCOLOR (*crp, ccol2);
…		…
1977		2034
1978	/* make sure no outline cursor is left around */	2035	/* make sure no outline cursor is left around */
1979	setoldcursor = 0;	2036	setoldcursor = 0;
1980	if (ocrow != -1)	2037	if (ocrow != -1)
1981	{	2038	{
1982	if (screen.cur.row + view_start != ocrow	2039	if (screen.cur.row - view_start != ocrow
1983	|| screen.cur.col != oldcursor.col)	2040	|| screen.cur.col != oldcursor.col)
1984	{	2041	{
1985	if (ocrow < nrow	2042	if (ocrow < nrow
1986	&& oldcursor.col < ncol)	2043	&& oldcursor.col < ncol)
1987	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2044	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
1995	else if (!focus)	2052	else if (!focus)
1996	setoldcursor = 1;	2053	setoldcursor = 1;
1997		2054
1998	if (setoldcursor)	2055	if (setoldcursor)
1999	{	2056	{
2000	if (screen.cur.row + view_start >= nrow)	2057	if (screen.cur.row - view_start >= nrow)
2001	oldcursor.row = -1;	2058	oldcursor.row = -1;
2002	else	2059	else
2003	{	2060	{
2004	oldcursor.row = screen.cur.row + view_start;	2061	oldcursor.row = screen.cur.row - view_start;
2005	oldcursor.col = screen.cur.col;	2062	oldcursor.col = screen.cur.col;
2006	}	2063	}
2007	}	2064	}
2008	}	2065	}
2009		2066
		2067	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010	#if ENABLE_OVERLAY	2068	#if ENABLE_OVERLAY
2011	scr_swap_overlay ();	2069	scr_swap_overlay ();
2012	#endif	2070	#endif
2013		2071
2014	#ifndef NO_SLOW_LINK_SUPPORT	2072	#ifndef NO_SLOW_LINK_SUPPORT
2015	/*	2073	/*
2016	* D: CopyArea pass - very useful for slower links	2074	* D: CopyArea pass - very useful for slower links
2017	* This has been deliberately kept simple.	2075	* This has been deliberately kept simple.
2018	*/	2076	*/
2019	i = num_scr;
2020	if (!display->is_local	2077	if (!display->is_local
2021	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2078	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2022	&& abs (num_scr) < nrow && !must_clear)	2079	&& abs (num_scr) < nrow && !must_clear)
2023	{	2080	{
2024	int16_t nits;	2081	int16_t nits;
2025	int j;	2082	int j;
2026	int len, wlen;	2083	int len, wlen;
		2084	dLocal (int, num_scr);
2027		2085
2028	j = nrow;	2086	j = nrow;
2029	wlen = len = -1;	2087	wlen = len = -1;
2030	row = i > 0 ? 0 : j - 1;	2088	row = i > 0 ? 0 : j - 1;
2031	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2089	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2032	{	2090	{
2033	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2091	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2034	{	2092	{
2035	line_t s = ROW(row - view_start);	2093	line_t s = ROW(view_start + row);
2036	line_t d = drawn_buf[row];	2094	line_t d = drawn_buf[row];
2037	line_t d2 = drawn_buf[row + i];	2095	line_t d2 = drawn_buf[row + i];
2038		2096
2039	for (nits = 0, col = ncol; col--; )	2097	for (nits = 0, col = ncol; col--; )
2040	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2098	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2064	if (wlen < len)	2122	if (wlen < len)
2065	::swap (wlen, len);	2123	::swap (wlen, len);
2066		2124
2067	XCopyArea (display->display, vt, vt,	2125	XCopyArea (display->display, vt, vt,
2068	gc, 0, Row2Pixel (len + i),	2126	gc, 0, Row2Pixel (len + i),
2069	(unsigned int)TermWin_TotalWidth (),	2127	(unsigned int)this->width,
2070	(unsigned int)Height2Pixel (wlen - len + 1),	2128	(unsigned int)Height2Pixel (wlen - len + 1),
2071	0, Row2Pixel (len));	2129	0, Row2Pixel (len));
2072	len = -1;	2130	len = -1;
2073	}	2131	}
2074	}	2132	}
…		…
2078	/*	2136	/*
2079	* E: main pass across every character	2137	* E: main pass across every character
2080	*/	2138	*/
2081	for (row = 0; row < nrow; row++)	2139	for (row = 0; row < nrow; row++)
2082	{	2140	{
2083	text_t *stp = ROW(row - view_start).t;	2141	text_t *stp = ROW(view_start + row).t;
2084	rend_t *srp = ROW(row - view_start).r;	2142	rend_t *srp = ROW(view_start + row).r;
2085	text_t *dtp = drawn_buf[row].t;	2143	text_t *dtp = drawn_buf[row].t;
2086	rend_t *drp = drawn_buf[row].r;	2144	rend_t *drp = drawn_buf[row].r;
2087		2145
2088	/*	2146	/*
2089	* E2: OK, now the real pass	2147	* E2: OK, now the real pass
…		…
2153	count++, i--;	2211	count++, i--;
2154		2212
2155	/*	2213	/*
2156	* Determine the attributes for the string	2214	* Determine the attributes for the string
2157	*/	2215	*/
2158	int fore = GET_FGCOLOR (rend); // desired foreground	2216	int fore = fgcolor_of (rend); // desired foreground
2159	int back = GET_BGCOLOR (rend); // desired background	2217	int back = bgcolor_of (rend); // desired background
2160		2218
2161	// only do special processing if any attributes are set, which is rare	2219	// only do special processing if any attributes are set, which is unlikely
2162	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2220	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163	{	2221	{
2164	#if ENABLE_STYLES	2222	#if ENABLE_STYLES
2165	// force redraw after "careful" characters to avoid pixel droppings	2223	// force redraw after "careful" characters to avoid pixel droppings
2166	if (srp[col] & RS_Careful && col < ncol - 1 && 0)	2224	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
…		…
2277	} /* for (row....) */	2335	} /* for (row....) */
2278		2336
2279	#if ENABLE_OVERLAY	2337	#if ENABLE_OVERLAY
2280	scr_swap_overlay ();	2338	scr_swap_overlay ();
2281	#endif	2339	#endif
		2340	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282		2341
2283	/*	2342	/*
2284	* G: cleanup cursor and display outline cursor if necessary	2343	* G: cleanup cursor and display outline cursor if necessary
2285	*/	2344	*/
2286	if (showcursor)	2345	if (showcursor)
2287	{	2346	{
2288	if (focus)	2347	if (focus)
2289	{	2348	{
2290	if (options & Opt_cursorUnderline)	2349	if (OPTION (Opt_cursorUnderline))
2291	*crp ^= RS_Uline;	2350	*crp ^= RS_Uline;
2292	else	2351	else
2293	{	2352	{
2294	*crp ^= RS_RVid;	2353	*crp ^= RS_RVid;
2295	#ifndef NO_CURSORCOLOR	2354	#ifndef NO_CURSORCOLOR
…		…
2325	/*	2384	/*
2326	* H: cleanup selection	2385	* H: cleanup selection
2327	*/	2386	*/
2328	scr_reverse_selection ();	2387	scr_reverse_selection ();
2329		2388
2330	if (refresh_type & SMOOTH_REFRESH)
2331	XFlush (display->display);
2332
2333	num_scr = 0;	2389	num_scr = 0;
2334	num_scr_allow = 1;	2390	num_scr_allow = 1;
2335	}	2391	}
2336		2392
2337	void	2393	void
2338	rxvt_term::scr_remap_chars (const line_t &l)	2394	rxvt_term::scr_remap_chars (line_t &l)
2339	{	2395	{
2340	if (!l.t)	2396	if (!l.t)
2341	return;	2397	return;
		2398
		2399	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2342		2400
2343	for (int i = ncol; i--; )	2401	for (int i = ncol; i--; )
2344	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2402	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345	}	2403	}
2346		2404
…		…
2399		2457
2400	if (really)	2458	if (really)
2401	XClearWindow (display->display, vt);	2459	XClearWindow (display->display, vt);
2402	}	2460	}
2403		2461
		2462	void
		2463	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
		2464	{
		2465	int view_end = view_start + nrow;
		2466	int row, col;
		2467
		2468	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
		2469	{
		2470	text_t *stp = ROW(row).t;
		2471	rend_t *srp = ROW(row).r;
		2472
		2473	for (col = beg_col; col < end_col; col++)
		2474	srp[col] ^= rstyle1;
		2475
		2476	while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2477	srp[col] ^= rstyle2;
		2478
		2479	if (++col < end_col)
		2480	srp[col] ^= rstyle2;
		2481	}
		2482	}
		2483
		2484	void
		2485	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
		2486	{
		2487	int view_end = view_start + nrow;
		2488	int row, col;
		2489
		2490	if (beg_row >= view_start)
		2491	{
		2492	col = beg_col;
		2493	row = beg_row;
		2494	}
		2495	else
		2496	{
		2497	col = 0;
		2498	row = view_start;
		2499	}
		2500
		2501	for (; row < min (end_row, view_end); row++, col = 0)
		2502	for (rend_t *srp = ROW(row).r; col < ncol; col++)
		2503	srp[col] ^= rstyle;
		2504
		2505	if (row == end_row)
		2506	for (rend_t *srp = ROW(row).r; col < end_col; col++)
		2507	srp[col] ^= rstyle;
		2508	}
		2509
2404	/* ------------------------------------------------------------------------- */	2510	/* ------------------------------------------------------------------------- */
2405	void	2511	void
2406	rxvt_term::scr_reverse_selection ()	2512	rxvt_term::scr_reverse_selection ()
2407	{	2513	{
2408	if (selection.op	2514	if (selection.op
2409	&& current_screen == selection.screen	2515	&& current_screen == selection.screen
2410	&& selection.end.row >= -view_start)	2516	&& selection.end.row >= view_start)
2411	{	2517	{
2412	int view_end = -view_start + nrow;
2413	int row, col;
2414
2415	#if ENABLE_FRILLS	2518	#if ENABLE_FRILLS
2416	if (selection.rect)	2519	if (selection.rect)
2417	{	2520	scr_xor_rect (selection.beg.row, selection.beg.col,
2418	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2521	selection.end.row, selection.end.col,
2419	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)	2522	RS_RVid, RS_RVid | RS_Uline);
2420	srp[col] ^= RS_RVid;
2421	}
2422	else	2523	else
2423	#endif	2524	#endif
2424	{	2525	scr_xor_span (selection.beg.row, selection.beg.col,
2425	if (selection.beg.row >= -view_start)	2526	selection.end.row, selection.end.col,
2426	{	2527	RS_RVid);
2427	col = selection.beg.col;
2428	row = selection.beg.row;
2429	}
2430	else
2431	{
2432	col = 0;
2433	row = view_start;
2434	}
2435
2436	for (; row < min (selection.end.row, view_end); row++, col = 0)
2437	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438	srp[col] ^= RS_RVid;
2439
2440	if (row == selection.end.row)
2441	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2442	srp[col] ^= RS_RVid;
2443	}
2444	}	2528	}
2445	}	2529	}
2446		2530
2447	/* ------------------------------------------------------------------------- */	2531	/* ------------------------------------------------------------------------- */
2448	/*	2532	/*
…		…
2486		2570
2487	if (!selection.op)	2571	if (!selection.op)
2488	return;	2572	return;
2489		2573
2490	pos.row = pos.col = 0;	2574	pos.row = pos.col = 0;
2491	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2575	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2492	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2576	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2493	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2577	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2494	|| (check_more == 1	2578	|| (check_more == 1
2495	&& current_screen == selection.screen	2579	&& current_screen == selection.screen
2496	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2580	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2497	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2581	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2498	|| (check_more == 2	2582	|| (check_more == 2
…		…
2509	/* ------------------------------------------------------------------------- */	2593	/* ------------------------------------------------------------------------- */
2510	/*	2594	/*
2511	* Paste a selection direct to the command fd	2595	* Paste a selection direct to the command fd
2512	*/	2596	*/
2513	void	2597	void
2514	rxvt_term::paste (unsigned char *data, unsigned int len)	2598	rxvt_term::paste (char *data, unsigned int len)
2515	{	2599	{
2516	/* convert normal newline chars into common keyboard Return key sequence */	2600	/* convert normal newline chars into common keyboard Return key sequence */
2517	for (unsigned int i = 0; i < len; i++)	2601	for (unsigned int i = 0; i < len; i++)
2518	if (data[i] == C0_LF)	2602	if (data[i] == C0_LF)
2519	data[i] = C0_CR;	2603	data[i] = C0_CR;
…		…
2663	{	2747	{
2664	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2748	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665	char *s = rxvt_wcstombs (w);	2749	char *s = rxvt_wcstombs (w);
2666	free (w);	2750	free (w);
2667	// TODO: strlen == only the first element will be converted. well...	2751	// TODO: strlen == only the first element will be converted. well...
2668	paste ((unsigned char *)s, strlen (s));	2752	paste (s, strlen (s));
2669	free (s);	2753	free (s);
2670	}	2754	}
2671	else	2755	else
2672	#endif	2756	#endif
2673	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2757	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674	&& cl)	2758	&& cl)
2675	{	2759	{
2676	for (int i = 0; i < cr; i++)	2760	for (int i = 0; i < cr; i++)
2677	paste ((unsigned char *)cl[i], strlen (cl[i]));	2761	paste (cl[i], strlen (cl[i]));
2678		2762
2679	XFreeStringList (cl);	2763	XFreeStringList (cl);
2680	}	2764	}
2681	else	2765	else
2682	paste (ct.value, ct.nitems); // paste raw	2766	paste ((char *)ct.value, ct.nitems); // paste raw
2683		2767
2684	bailout:	2768	bailout:
2685	XFree (ct.value);	2769	XFree (ct.value);
2686		2770
2687	if (selection_wait == Sel_normal)	2771	if (selection_wait == Sel_normal)
…		…
2717	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2801	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2718	* will auto fallback to CUT_BUFFER0	2802	* will auto fallback to CUT_BUFFER0
2719	* EXT: button 2 release	2803	* EXT: button 2 release
2720	*/	2804	*/
2721	void	2805	void
2722	rxvt_term::selection_request (Time tm, int x, int y)	2806	rxvt_term::selection_request (Time tm)
2723	{	2807	{
2724	if (x < 0 || x >= width || y < 0 || y >= height)
2725	return; /* outside window */
2726
2727	if (selection.text)	2808	if (selection.text)
2728	{ /* internal selection */	2809	{ /* internal selection */
2729	char *str = rxvt_wcstombs (selection.text, selection.len);	2810	char *str = rxvt_wcstombs (selection.text, selection.len);
2730	paste ((unsigned char *)str, strlen (str));	2811	paste (str, strlen (str));
2731	free (str);	2812	free (str);
2732	return;	2813	return;
2733	}	2814	}
2734	else	2815	else
2735	{	2816	{
…		…
2827	selection.op = SELECTION_DONE;	2908	selection.op = SELECTION_DONE;
2828		2909
2829	if (selection.clicks == 4)	2910	if (selection.clicks == 4)
2830	return; /* nothing selected, go away */	2911	return; /* nothing selected, go away */
2831		2912
		2913	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
		2914	return;
		2915
2832	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2916	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2917	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834		2918
2835	int ofs = 0;	2919	int ofs = 0;
2836	int extra = 0;	2920	int extra = 0;
…		…
2848	col = selection.beg.col;	2932	col = selection.beg.col;
2849	end_col = ncol + 1;	2933	end_col = ncol + 1;
2850	}	2934	}
2851	else	2935	else
2852	#endif	2936	#endif
2853	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2937	end_col = ROW(row).l;
2854		2938
2855	col = max (col, 0);	2939	col = max (col, 0);
2856		2940
2857	if (row == selection.end.row || selection.rect)	2941	if (row == selection.end.row
		2942	#if ENABLE_FRILLS
		2943	|| selection.rect
		2944	#endif
		2945	)
2858	end_col = min (end_col, selection.end.col);	2946	min_it (end_col, selection.end.col);
2859		2947
2860	t = ROW(row).t + col;	2948	t = ROW(row).t + col;
		2949
2861	for (; col < end_col; col++)	2950	for (; col < end_col; col++)
2862	{	2951	{
2863	if (*t == NOCHAR)	2952	if (*t == NOCHAR)
2864	t++;	2953	t++;
2865	#if ENABLE_COMBINING	2954	#if ENABLE_COMBINING
…		…
2881	#endif	2970	#endif
2882	else	2971	else
2883	new_selection_text[ofs++] = *t++;	2972	new_selection_text[ofs++] = *t++;
2884	}	2973	}
2885		2974
		2975	#if ENABLE_FRILLS
		2976	if (selection.rect)
		2977	{
		2978	while (ofs
		2979	&& new_selection_text[ofs - 1] != C0_LF
		2980	&& unicode::is_space (new_selection_text[ofs - 1]))
		2981	--ofs;
		2982
		2983	new_selection_text[ofs++] = C0_LF;
		2984	}
		2985	else
		2986	#endif
2886	if (!ROW(row).is_longer () && row != selection.end.row)	2987	if (!ROW(row).is_longer () && row != selection.end.row)
2887	new_selection_text[ofs++] = C0_LF;	2988	new_selection_text[ofs++] = C0_LF;
2888	}	2989	}
2889		2990
2890	if (end_col != selection.end.col)	2991	if (end_col != selection.end.col)
2891	new_selection_text[ofs++] = C0_LF;	2992	new_selection_text[ofs++] = C0_LF;
2892		2993
…		…
2902		3003
2903	// we usually allocate much more than necessary, so realloc it smaller again	3004	// we usually allocate much more than necessary, so realloc it smaller again
2904	selection.len = ofs;	3005	selection.len = ofs;
2905	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	3006	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906		3007
		3008	if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
		3009	return;
		3010
		3011	selection_grab (tm);
		3012	}
		3013
		3014	bool
		3015	rxvt_term::selection_grab (Time tm)
		3016	{
		3017	selection_time = tm;
		3018
2907	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3019	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3020	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
		3021	{
2909	display->set_selection_owner (this);	3022	display->set_selection_owner (this);
		3023	return true;
		3024	}
2910	else	3025	else
2911	rxvt_warn ("can't get primary selection, ignoring.\n");	3026	{
		3027	selection_clear ();
		3028	return false;
		3029	}
2912		3030
2913	#if 0	3031	#if 0
2914	XTextProperty ct;	3032	XTextProperty ct;
2915		3033
2916	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3034	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917	{	3035	{
2918	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3036	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919	XFree (ct.value);	3037	XFree (ct.value);
2920	}	3038	}
2921	#endif	3039	#endif
2922
2923	selection_time = tm;
2924	}	3040	}
2925		3041
2926	/* ------------------------------------------------------------------------- */	3042	/* ------------------------------------------------------------------------- */
2927	/*	3043	/*
2928	* Mark or select text based upon number of clicks: 1, 2, or 3	3044	* Mark or select text based upon number of clicks: 1, 2, or 3
…		…
2932	rxvt_term::selection_click (int clicks, int x, int y)	3048	rxvt_term::selection_click (int clicks, int x, int y)
2933	{	3049	{
2934	clicks = ((clicks - 1) % 3) + 1;	3050	clicks = ((clicks - 1) % 3) + 1;
2935	selection.clicks = clicks; /* save clicks so extend will work */	3051	selection.clicks = clicks; /* save clicks so extend will work */
2936		3052
		3053	if (clicks == 2 && !selection.rect
		3054	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3055	{
		3056	MEvent.clicks = 1; // what a mess
		3057	selection.screen = current_screen;
		3058	selection.op = SELECTION_CONT;
		3059	return;
		3060	}
		3061
2937	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3062	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2938		3063
2939	if (clicks == 2 || clicks == 3)	3064	if (clicks == 2 || clicks == 3)
2940	selection_extend_colrow (selection.mark.col,	3065	selection_extend_colrow (selection.mark.col,
2941	selection.mark.row + view_start,	3066	selection.mark.row - view_start,
2942	0, /* button 3 */	3067	0, /* button 3 */
2943	1, /* button press */	3068	1, /* button press */
2944	0); /* click change */	3069	0); /* click change */
2945	}	3070	}
2946		3071
…		…
2951	void	3076	void
2952	rxvt_term::selection_start_colrow (int col, int row)	3077	rxvt_term::selection_start_colrow (int col, int row)
2953	{	3078	{
2954	want_refresh = 1;	3079	want_refresh = 1;
2955		3080
2956	selection.mark.row = row - view_start;	3081	selection.mark.row = row + view_start;
2957	selection.mark.col = col;	3082	selection.mark.col = col;
2958		3083
2959	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3084	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2960	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3085	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2961		3086
2962	while (selection.mark.col > 0	3087	while (selection.mark.col > 0
2963	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3088	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2964	--selection.mark.col;	3089	--selection.mark.col;
…		…
2992	text_t *stp;	3117	text_t *stp;
2993	rend_t *srp;	3118	rend_t *srp;
2994		3119
2995	if (dirn == UP)	3120	if (dirn == UP)
2996	{	3121	{
2997	bound.row = - nsaved - 1;	3122	bound.row = top_row - 1;
2998	bound.col = 0;	3123	bound.col = 0;
2999	dirnadd = -1;	3124	dirnadd = -1;
3000	}	3125	}
3001	else	3126	else
3002	{	3127	{
…		…
3050	}	3175	}
3051	}	3176	}
3052	break;	3177	break;
3053	}	3178	}
3054		3179
3055	Old_Word_Selection_You_Die:
3056	if (dirn == DN)	3180	if (dirn == DN)
3057	col++; /* put us on one past the end */	3181	col++; /* put us on one past the end */
3058		3182
3059	/* Poke the values back in */	3183	/* Poke the values back in */
3060	ret->row = row;	3184	ret->row = row;
…		…
3081	* select nothing. Otherwise, if we're to the right of the mark, you have to	3205	* select nothing. Otherwise, if we're to the right of the mark, you have to
3082	* be _past_ a character for it to be selected.	3206	* be _past_ a character for it to be selected.
3083	*/	3207	*/
3084	if (((selection.clicks % 3) == 1) && !flag	3208	if (((selection.clicks % 3) == 1) && !flag
3085	&& (col == selection.mark.col	3209	&& (col == selection.mark.col
3086	&& (row == selection.mark.row + view_start)))	3210	&& (row == selection.mark.row - view_start)))
3087	{	3211	{
3088	/* select nothing */	3212	/* select nothing */
3089	selection.beg.row = selection.end.row = 0;	3213	selection.beg.row = selection.end.row = 0;
3090	selection.beg.col = selection.end.col = 0;	3214	selection.beg.col = selection.end.col = 0;
3091	selection.clicks = 4;	3215	selection.clicks = 4;
…		…
3146	selection.beg.col = selection.end.col = selection.mark.col;	3270	selection.beg.col = selection.end.col = selection.mark.col;
3147	selection.beg.row = selection.end.row = selection.mark.row;	3271	selection.beg.row = selection.end.row = selection.mark.row;
3148	}	3272	}
3149		3273
3150	pos.col = col;	3274	pos.col = col;
3151	pos.row = row - view_start;	3275	pos.row = view_start + row;
3152		3276
3153	/*	3277	/*
3154	* This is mainly xterm style selection with a couple of differences, mainly	3278	* This is mainly xterm style selection with a couple of differences, mainly
3155	* in the way button3 drag extension works.	3279	* in the way button3 drag extension works.
3156	* We're either doing: button1 drag; button3 press; or button3 drag	3280	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3243	selection_delimit_word (DN, &selection.end, &selection.end);	3367	selection_delimit_word (DN, &selection.end, &selection.end);
3244	}	3368	}
3245	else if (selection.clicks == 3)	3369	else if (selection.clicks == 3)
3246	{	3370	{
3247	#if ENABLE_FRILLS	3371	#if ENABLE_FRILLS
3248	if (options & Opt_tripleclickwords)	3372	if (OPTION (Opt_tripleclickwords))
3249	{	3373	{
3250	selection_delimit_word (UP, &selection.beg, &selection.beg);	3374	selection_delimit_word (UP, &selection.beg, &selection.beg);
3251		3375
3252	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3376	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253	{	3377	{
…		…
3314	{	3438	{
3315	stp = ROW(end_row).t;	3439	stp = ROW(end_row).t;
3316		3440
3317	while (--end_col >= 0)	3441	while (--end_col >= 0)
3318	{	3442	{
3319	if (stp[end_col] != ' '	3443	if (stp[end_col] != NOCHAR
3320	&& stp[end_col] != '\t'	3444	&& !unicode::is_space (stp[end_col]))
3321	&& stp[end_col] != NOCHAR)
3322	break;	3445	break;
3323	}	3446	}
3324		3447
3325	if (end_col >= 0	3448	if (end_col >= 0
3326	|| !ROW(end_row - 1).is_longer ())	3449	|| !ROW(end_row - 1).is_longer ())
…		…
3525		3648
3526	#if ENABLE_OVERLAY	3649	#if ENABLE_OVERLAY
3527	void	3650	void
3528	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3651	rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3529	{	3652	{
3530	if (nrow < 3 || ncol < 3)	3653	if (nrow < 1 || ncol < 1)
3531	return;	3654	return;
3532		3655
3533	want_refresh = 1;	3656	want_refresh = 1;
3534		3657
3535	scr_overlay_off ();	3658	scr_overlay_off ();
…		…
3642	for (int y = ov_h; y--; )	3765	for (int y = ov_h; y--; )
3643	{	3766	{
3644	text_t *t1 = ov_text[y];	3767	text_t *t1 = ov_text[y];
3645	rend_t *r1 = ov_rend[y];	3768	rend_t *r1 = ov_rend[y];
3646		3769
3647	text_t *t2 = ROW(y - view_start).t + ov_x;	3770	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3648	rend_t *r2 = ROW(y - view_start).r + ov_x;	3771	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3649		3772
3650	for (int x = ov_w; x--; )	3773	for (int x = ov_w; x--; )
3651	{	3774	{
3652	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3775	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3776	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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