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.172 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 2005 UTC

…		…
116		116
117	/* Fill part/all of a line with blanks. */	117	/* Fill part/all of a line with blanks. */
118	void	118	void
119	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)	119	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120	{	120	{
		121	if (!l.t)
		122	{
		123	lalloc (l);
		124	col = 0;
		125	width = ncol;
		126	}
		127
121	efs &= ~RS_baseattrMask;	128	efs &= ~RS_baseattrMask;
122	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	129	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123		130
124	text_t *et = l.t + col;	131	text_t *et = l.t + col;
125	rend_t *er = l.r + col;	132	rend_t *er = l.r + col;
…		…
134	/* ------------------------------------------------------------------------- */	141	/* ------------------------------------------------------------------------- */
135	/* Fill a full line with blanks - make sure it is allocated first */	142	/* Fill a full line with blanks - make sure it is allocated first */
136	void	143	void
137	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)	144	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138	{	145	{
139	if (!l.t)
140	lalloc (l);
141
142	scr_blank_line (l, 0, ncol, efs);	146	scr_blank_line (l, 0, ncol, efs);
143	}	147	}
144		148
145	/* ------------------------------------------------------------------------- *	149	/* ------------------------------------------------------------------------- *
146	* SCREEN INITIALISATION *	150	* SCREEN INITIALISATION *
147	* ------------------------------------------------------------------------- */	151	* ------------------------------------------------------------------------- */
		152
148	void	153	void
149	rxvt_term::scr_reset ()	154	rxvt_term::scr_reset ()
150	{	155	{
151	unsigned int p, q;
152	int k;
153
154	#if ENABLE_OVERLAY	156	#if ENABLE_OVERLAY
155	scr_overlay_off ();	157	scr_overlay_off ();
156	#endif	158	#endif
157		159
158	view_start = 0;	160	view_start = 0;
…		…
168	return;	170	return;
169		171
170	// we need at least two lines for wrapping to work correctly	172	// we need at least two lines for wrapping to work correctly
171	if (nrow + saveLines < 2)	173	if (nrow + saveLines < 2)
172	{	174	{
		175	//TODO//FIXME
173	saveLines++;	176	saveLines++;
174	prev_nrow--;	177	prev_nrow--;
175	nscrolled++;	178	nsaved++;
176	}	179	}
177		180
178	want_refresh = 1;	181	want_refresh = 1;
179		182
180	int prev_total_rows = prev_nrow + saveLines;	183	int prev_total_rows = prev_nrow + saveLines;
181	int total_rows = nrow + saveLines;	184	total_rows = nrow + saveLines;
182		185
183	screen.tscroll = 0;	186	screen.tscroll = 0;
184	screen.bscroll = nrow - 1;	187	screen.bscroll = nrow - 1;
185		188
186	if (!save)	189	if (!row_buf)
187	{	190	{
188	/*	191	/*
189	* first time called so just malloc everything: don't rely on realloc	192	* first time called so just malloc everything: don't rely on realloc
190	* Note: this is still needed so that all the scrollback lines are NULL	193	* Note: this is still needed so that all the scrollback lines are NULL
191	*/	194	*/
192	nscrolled = 0; /* no saved lines */	195	nsaved = 0; /* no saved lines */
193	term_start = 0;	196	term_start = 0;
194	nsaved = 0;
195		197
196	talloc = new rxvt_salloc (ncol * sizeof (text_t));	198	talloc = new rxvt_salloc (ncol * sizeof (text_t));
197	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	199	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198		200
199	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	201	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
		202	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	203	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	204	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203		205
204	screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206	scr_update_term ();
207
208	for (p = nrow; p--; )	206	for (int row = nrow; row--; )
209	{	207	{
210	scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);	208	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	209	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);	210	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213	}	211	}
214		212
215	memset (charsets, 'B', sizeof (charsets));	213	memset (charsets, 'B', sizeof (charsets));
216	rstyle = DEFAULT_RSTYLE;	214	rstyle = DEFAULT_RSTYLE;
217	screen.flags = Screen_DefaultFlags;	215	screen.flags = Screen_DefaultFlags;
…		…
241	{	239	{
242	/*	240	/*
243	* add or delete rows as appropriate	241	* add or delete rows as appropriate
244	*/	242	*/
245		243
246	rxvt_salloc *old_ta;	244	printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
247	rxvt_salloc *old_ra;
248		245
		246	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));
		248
		249	#if 0
249	if (nrow < prev_nrow)	250	if (nrow < prev_nrow)
250	{	251	{
251	/* delete rows */
252	k = min (nscrolled, prev_nrow - nrow);
253	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256	for (p = nrow; p < prev_nrow; p++)	252	for (int row = nrow; row < prev_nrow; row++)
257	{	253	{
258	lfree (save[p + saveLines]);
259	lfree (swap_save[p]);	254	lfree (swap_buf [row]);
260	lfree (drawn[p]);	255	lfree (drawn_buf[row]);
261	}	256	}
		257	}
		258	#endif
262		259
263	/* we have fewer rows so fix up cursor position */	260	drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	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		263
266	scr_reset_realloc (); /* realloc _last_ */	264	for (int row = min (nrow, prev_nrow); row--; )
		265	{
		266	lresize (drawn_buf[row]);
		267	lresize (swap_buf [row]);
		268	}
		269
		270	for (int row = prev_nrow; row < nrow; row++)
		271	{
		272	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);
		274	}
		275
		276	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267	}	277
268	else if (nrow > prev_nrow)
269	{
270	/* add rows */
271	scr_reset_realloc (); /* realloc _first_ */
272
273	int ocol = ncol;
274	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275
276	k = min (nscrolled, nrow - prev_nrow);
277
278	for (p = prev_total_rows; p < total_rows; p++)
279	save[p].clear ();
280
281	for (p = prev_total_rows; p < total_rows - k; p++)
282	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284	scr_update_term ();
285
286	for (p = prev_nrow; p < nrow; p++)
287	{
288	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
289	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290	}
291
292	if (k > 0)
293	{
294	scr_scroll_text (0, (int)nrow - 1, -k, 1);
295	screen.cur.row += k;
296	screen.s_cur.row += k;
297	nscrolled -= k;
298	}
299
300	#ifdef DEBUG_STRICT
301	assert (screen.cur.row < nrow);
302	#else /* drive with your eyes closed */
303	MIN_IT (screen.cur.row, nrow - 1);
304	#endif
305	ncol = ocol; // save b/c scr_blank_screen_mem uses this
306	}
307
308	/* resize columns */
309	if (ncol != prev_ncol)
310	{
311	old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312	old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314	for (p = total_rows; p--; )
315	lresize (save[p]);
316
317	for (p = nrow; p--; )
318	{
319	lresize (drawn[p]);
320	lresize (swap_save[p]);
321	}
322
323	MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325	delete old_ta;
326	delete old_ra;
327	}
328
329	#if 0
330	// re-wrap lines, this is rather ugly, possibly because I am too dumb	278	// re-wrap lines, this is rather ugly, possibly because I am too dumb
331	// to come up with a lean and mean algorithm.	279	// to come up with a lean and mean algorithm.
332	rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333	rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335	text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336	rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337	tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338		280
339	for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	281	int p = MOD (term_start + nrow , prev_total_rows); // previous row
		282	int pend = MOD (term_start - nsaved, prev_total_rows);
		283	int q = total_rows; // rewrapped row
340		284
341	p = prev_total_rows;
342	q = total_rows;
343
344	while (p > 0 && q > 0)	285	while (p != pend && q > 0)
345	{	286	{
346	--p;	287	p = MOD (p - 1, prev_total_rows);
347		288
348	printf ("pq %d:%d\n", p, q);	289	assert (old_buf [MOD (p, prev_total_rows)].t);
349	if (save[p].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 ())
350	{	295	{
351	int llen = save[p].l;	296	p = MOD (p - 1, prev_total_rows);
352		297
353	assert (llen >= 0);	298	llen += prev_ncol;
		299	}
354		300
355	while (p && save[p - 1].l < 0)	301	int qlines = llen / ncol + 1;
		302	int lofs = 0;
		303
		304	q -= qlines;
		305
		306	int qrow = q;
		307
		308	for (; qlines--; qrow++)
		309	{
		310	if (qrow >= 0)
356	{	311	{
		312	line_t &qline = row_buf [qrow];
		313
		314	lalloc (qline);
		315	qline.set_is_longer ();
		316
		317	int qcol = 0;
		318
		319	for (;;)
357	--p;	320	{
358	llen += prev_ncol;	321	int prow = lofs / prev_ncol + p;
		322	int pcol = lofs % prev_ncol;
		323
		324	line_t &pline = old_buf [p];
		325
		326	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
		327
		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);
		338
		339	memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t));
		340	memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t));
		341
		342	lofs += len;
		343	qcol += len;
		344
		345	if (qcol == ncol)
		346	break;
		347	}
359	}	348	}
360
361	int qlines = llen / ncol + 1;
362	int lofs = 0;
363
364	q -= qlines;
365
366	int qrow = q;
367
368	printf ("QL %d llen %d\n", qlines, llen);//D
369	for (; qlines--; qrow++)
370	{
371	if (qrow >= 0)
372	{
373	tp [qrow] = (text_t *)ta->alloc ();
374	rp [qrow] = (rend_t *)ra->alloc ();
375	tl [qrow] = -1;
376
377	int qcol = 0;
378
379	for (;;)
380	{
381	int prow = lofs / prev_ncol + p;
382	int pcol = lofs % prev_ncol;
383
384	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385
386	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);
387
388	if (len <= 0)
389	{
390	tl [qrow] = qcol;
391
392	TODO
393	scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394	ncol - qcol, DEFAULT_RSTYLE);
395
396	break;
397	}
398
399	assert (lofs < 1000);
400
401	memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
402	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
403
404	lofs += len;
405	qcol += len;
406
407	if (qcol == ncol)
408	break;
409	}
410	}
411	else	349	else
412	lofs += ncol;	350	lofs += ncol;
413	}
414	}	351	}
415	}	352	}
416		353
417	free (screen.text); screen.text = tp;	354	free (old_buf);
418	free (screen.rend); screen.rend = rp;	355	delete old_ta;
419	free (screen.tlen); screen.tlen = tl;	356	delete old_ra;
420		357
421	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	358	min_it (screen.cur.row, nrow - 1);
422	#endif	359	min_it (screen.cur.col, ncol - 1);
423		360
424	if (tabs)	361	if (tabs)
425	free (tabs);	362	free (tabs);
426	}	363	}
427		364
428	prev_nrow = nrow;	365	prev_nrow = nrow;
429	prev_ncol = ncol;	366	prev_ncol = ncol;
430		367
431	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	368	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432		369
433	for (p = 0; p < ncol; p++)	370	for (int col = ncol; col--; )
434	tabs[p] = (p % TABSIZE == 0) ? 1 : 0;	371	tabs [col] = col % TABSIZE == 0;
435		372
436	tt_winch ();	373	tt_winch ();
437	}	374	}
438		375
439	void
440	rxvt_term::scr_reset_realloc ()
441	{
442	unsigned int total_rows = nrow + saveLines;
443
444	screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
447	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448	buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449	}
450
451	/* ------------------------------------------------------------------------- */	376	/* ------------------------------------------------------------------------- */
452	/*	377	/*
453	* Free everything. That way malloc debugging can find leakage.	378	* Free everything. That way malloc debugging can find leakage.
454	*/	379	*/
455	void	380	void
456	rxvt_term::scr_release ()	381	rxvt_term::scr_release ()
457	{	382	{
458	unsigned int total_rows;
459
460	total_rows = nrow + saveLines;
461
462	delete talloc; talloc = 0;	383	delete talloc; talloc = 0;
463	delete ralloc; ralloc = 0;	384	delete ralloc; ralloc = 0;
464		385
465	free (screen.line);	386	free (row_buf);
466	free (save);
467	free (swap_save);	387	free (swap_buf);
468	free (drawn);	388	free (drawn_buf);
469	free (buf);	389	free (temp_buf);
470	free (tabs);	390	free (tabs);
471	}	391	}
472		392
473	/* ------------------------------------------------------------------------- */	393	/* ------------------------------------------------------------------------- */
474	/*	394	/*
…		…
526	set_font_style ();	446	set_font_style ();
527	break;	447	break;
528	}	448	}
529		449
530	/* boundary check in case screen size changed between SAVE and RESTORE */	450	/* boundary check in case screen size changed between SAVE and RESTORE */
531	MIN_IT (s->cur.row, nrow - 1);	451	min_it (s->cur.row, nrow - 1);
532	MIN_IT (s->cur.col, ncol - 1);	452	min_it (s->cur.col, ncol - 1);
533	#ifdef DEBUG_STRICT	453	#ifdef DEBUG_STRICT
534	assert (s->cur.row >= 0);	454	assert (s->cur.row >= 0);
535	assert (s->cur.col >= 0);	455	assert (s->cur.col >= 0);
536	#else /* drive with your eyes closed */	456	#else /* drive with your eyes closed */
537	MAX_IT (s->cur.row, 0);	457	max_it (s->cur.row, 0);
538	MAX_IT (s->cur.col, 0);	458	max_it (s->cur.col, 0);
539	#endif	459	#endif
540	}	460	}
541		461
542	/* ------------------------------------------------------------------------- */	462	/* ------------------------------------------------------------------------- */
543	/*	463	/*
…		…
546	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	466	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547	*/	467	*/
548	int	468	int
549	rxvt_term::scr_change_screen (int scrn)	469	rxvt_term::scr_change_screen (int scrn)
550	{	470	{
551	int i;
552	#if NSCREENS
553	int offset;
554	#endif
555
556	want_refresh = 1;	471	want_refresh = 1;
557
558	view_start = 0;	472	view_start = 0;
559		473
560	if (current_screen == scrn)	474	if (current_screen == scrn)
561	return scrn;	475	return scrn;
562		476
563	selection_check (2); /* check for boundary cross */	477	selection_check (2); /* check for boundary cross */
564		478
565	i = current_screen; current_screen = scrn; scrn = i;	479	int i = current_screen; current_screen = scrn; scrn = i;
566		480
567	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	481	::swap (screen.cur.row, swap.cur.row);
568	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	482	::swap (screen.cur.col, swap.cur.col);
569	MAX_IT (screen.cur.row, 0);	483
570	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	484	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571	MAX_IT (screen.cur.col, 0);	485	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573		486
574	#if NSCREENS	487	#if NSCREENS
575	if (options & Opt_secondaryScreen)	488	if (options & Opt_secondaryScreen)
576	{	489	{
577	num_scr = 0;	490	num_scr = 0;
578	offset = saveLines;
579		491
580	for (i = prev_nrow; i--;)	492	for (int i = nrow; i--; )
581	SWAP_IT (*(screen.line[i]), swap_save[i], line_t);	493	::swap (ROW(i), swap_buf [i]);
582		494
583	SWAP_IT (screen.charset, swap.charset, int16_t);	495	::swap (screen.charset, swap.charset);
584	SWAP_IT (screen.flags, swap.flags, int);	496	::swap (screen.flags, swap.flags);
585	screen.flags |= Screen_VisibleCursor;	497	screen.flags |= Screen_VisibleCursor;
586	swap.flags |= Screen_VisibleCursor;	498	swap.flags |= Screen_VisibleCursor;
587	}	499	}
588	else	500	else
589	#endif	501	#endif
590	if (options & Opt_secondaryScroll)	502	if (options & Opt_secondaryScroll)
591	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);	503	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592		504
593	return scrn;	505	return scrn;
594	}	506	}
595		507
596	// clear WrapNext indicator, solidifying position on next line	508	// clear WrapNext indicator, solidifying position on next line
…		…
603	screen.flags &= ~Screen_WrapNext;	515	screen.flags &= ~Screen_WrapNext;
604		516
605	screen.cur.col = 0;	517	screen.cur.col = 0;
606		518
607	if (screen.cur.row == screen.bscroll)	519	if (screen.cur.row == screen.bscroll)
608	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	520	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609	else if (screen.cur.row < nrow - 1)	521	else if (screen.cur.row < nrow - 1)
610	screen.cur.row++;	522	screen.cur.row++;
611	}	523	}
612		524
613	/* ------------------------------------------------------------------------- */	525	/* ------------------------------------------------------------------------- */
…		…
639	rstyle = DEFAULT_RSTYLE;	551	rstyle = DEFAULT_RSTYLE;
640	else	552	else
641	rstyle &= ~style;	553	rstyle &= ~style;
642	}	554	}
643		555
644	// set screen.line pointers to the actual lines in the save buffer
645	void
646	rxvt_term::scr_update_term ()
647	{
648	for (int i = nrow; i--; )
649	screen.line[i] = save + saveLines + i;
650	}
651
652	/* ------------------------------------------------------------------------- */	556	/* ------------------------------------------------------------------------- */
653	/*	557	/*
654	* Scroll text between <row1> and <row2> inclusive, by <count> lines	558	* Scroll text between <row1> and <row2> inclusive, by <count> lines
655	* count positive ==> scroll up	559	* count positive ==> scroll up
656	* count negative ==> scroll down	560	* count negative ==> scroll down
657	* spec == 0 for normal routines
658	*/	561	*/
659	int	562	int
660	rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)	563	rxvt_term::scr_scroll_text (int row1, int row2, int count)
661	{	564	{
662	int i, j;
663
664	if (count == 0 || (row1 > row2))	565	if (count == 0 || (row1 > row2))
665	return 0;	566	return 0;
666		567
667	want_refresh = 1;	568	want_refresh = 1;
		569	num_scr += count;
668		570
669	if (row1 == 0 && count > 0	571	if (count > 0
		572	&& row1 == 0
		573	&& row2 == nrow - 1
670	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	574	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))
671	{	575	{
672	nscrolled += count;	576	nsaved = min (nsaved + count, saveLines);
		577	term_start = (term_start + count) % total_rows;
673		578
674	if (nscrolled > saveLines)	579	if (selection.op && current_screen == selection.screen)
675	nscrolled = saveLines;	580	{
		581	selection.beg.row -= count;
		582	selection.end.row -= count;
		583	selection.mark.row -= count;
676		584
		585	selection_check (0);
		586	}
		587
		588	for (int i = count; i--; )
		589	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		590
677	if ((options & Opt_scrollWithBuffer)	591	if ((options & Opt_scrollWithBuffer)
678	&& view_start != 0	592	&& view_start != 0
679	&& view_start != saveLines)	593	&& view_start != saveLines)
680	scr_page (UP, count);	594	scr_page (UP, count);
681	}	595	}
682	else if (!spec)	596	else
683	row1 += saveLines;	597	{
684
685	row2 += saveLines;
686
687	if (selection.op && current_screen == selection.screen)	598	if (selection.op && current_screen == selection.screen)
688	{	599	{
689	i = selection.beg.row + saveLines;	600	int i = selection.beg.row;
690	j = selection.end.row + saveLines;	601	int j = selection.end.row;
691		602
692	if ((i < row1 && j > row1)	603	if ((i < row1 && j > row1)
693	|| (i < row2 && j > row2)	604	|| (i < row2 && j > row2)
694	|| (i - count < row1 && i >= row1)	605	|| (i - count < row1 && i >= row1)
695	|| (i - count > row2 && i <= row2)	606	|| (i - count > row2 && i <= row2)
696	|| (j - count < row1 && j >= row1)	607	|| (j - count < row1 && j >= row1)
697	|| (j - count > row2 && j <= row2))	608	|| (j - count > row2 && j <= row2))
698	{	609	{
699	CLEAR_ALL_SELECTION ();	610	CLEAR_ALL_SELECTION ();
700	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	611	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701	}	612	}
702	else if (j >= row1 && j <= row2)	613	else if (j >= row1 && j <= row2)
703	{	614	{
704	/* move selected region too */	615	/* move selected region too */
705	selection.beg.row -= count;	616	selection.beg.row -= count;
706	selection.end.row -= count;	617	selection.end.row -= count;
707	selection.mark.row -= count;	618	selection.mark.row -= count;
		619
		620	selection_check (0);
		621	}
		622	}
		623
		624	// use a simple and robust scrolling algorithm, this
		625	// part of scr_scroll_text is not time-critical.
		626
		627	int rows = row2 - row1 + 1;
		628
		629	min_it (count, rows);
		630
		631	for (int row = 0; row < rows; row++)
708	}	632	{
709	}	633	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710		634
711	selection_check (0); /* _after_ nscrolled update */	635	if (!IN_RANGE_EXC (row + count, 0, rows))
		636	scr_blank_screen_mem (temp_buf [row], rstyle);
		637	}
712		638
713	num_scr += count;	639	for (int row = 0; row < rows; row++)
714	j = count;	640	ROW(row1 + row) = temp_buf [row];
715
716	if (count < 0)
717	count = -count;
718
719	i = row2 - row1 + 1;
720	MIN_IT (count, i);
721
722	if (j > 0)
723	{	641	}
724	/* scroll up */
725
726	/* Copy lines that will get clobbered by the rotation */
727	memcpy (buf, save + row1, count * sizeof (line_t));
728
729	/* Rotate lines */
730	i = row2 - row1 - count + 1;
731	memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733	j = row2 - count + 1, i = count;
734	}
735	else /* if (j < 0) */
736	{
737	/* scroll down */
738
739	/* Copy lines that will get clobbered by the rotation */
740	for (i = 0, j = row2; i < count; i++, j--)
741	buf[i] = save[j];
742
743	/* Rotate lines */
744	for (j = row2, i = j - count; i >= row1; i--, j--)
745	save[j] = save[i];
746
747	j = row1, i = count;
748	count = -count;
749	}
750
751	/* Resurrect lines */
752	memcpy (save + j, buf, i * sizeof (line_t));
753
754	scr_update_term ();
755
756	if (!spec) /* line length may not equal ncol */
757	for (; i--; j++)
758	scr_blank_screen_mem (save[j], rstyle);
759		642
760	return count;	643	return count;
761	}	644	}
762		645
763	/* ------------------------------------------------------------------------- */	646	/* ------------------------------------------------------------------------- */
…		…
780	last_col = ncol;	663	last_col = ncol;
781		664
782	if (nlines > 0)	665	if (nlines > 0)
783	{	666	{
784	nlines += screen.cur.row - screen.bscroll;	667	nlines += screen.cur.row - screen.bscroll;
785	if ((nlines > 0)	668	if (nlines > 0
786	&& (screen.tscroll == 0)	669	&& screen.tscroll == 0
787	&& (screen.bscroll == (nrow - 1)))	670	&& screen.bscroll == (nrow - 1))
788	{	671	{
789	/* _at least_ this many lines need to be scrolled */	672	/* _at least_ this many lines need to be scrolled */
790	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);	673	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791	screen.cur.row -= nlines;	674	screen.cur.row -= nlines;
792	}	675	}
793	}	676	}
794		677
795	#ifdef DEBUG_STRICT	678	#ifdef DEBUG_STRICT
796	assert (screen.cur.col < last_col);	679	assert (screen.cur.col < last_col);
797	assert ((screen.cur.row < nrow)	680	assert (screen.cur.row < nrow
798	&& (screen.cur.row >= - (int32_t)nscrolled));	681	&& screen.cur.row >= -nsaved);
799	#else /* drive with your eyes closed */	682	#else /* drive with your eyes closed */
800	MIN_IT (screen.cur.col, last_col - 1);	683	min_it (screen.cur.col, last_col - 1);
801	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	684	clamp_it (screen.cur.row, -nsaved, nrow - 1);
802	MAX_IT (screen.cur.row, - (int32_t)nscrolled);
803	#endif	685	#endif
804	row = screen.cur.row + saveLines;	686	row = screen.cur.row;
805		687
806	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	688	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807		689
808	line_t *line = save + row;	690	line_t *line = &ROW(row);
809		691
810	while (str < strend)	692	while (str < strend)
811	{	693	{
812	c = *str++;	694	c = *str++;
813		695
814	if (c < 0x20)	696	if (c < 0x20)
815	if (c == C0_LF)	697	if (c == C0_LF)
816	{	698	{
817	if (line->l != -1) /* XXX: think about this */	699	if (!line->is_longer ()) /* XXX: think about this */
818	MAX_IT (line->l, screen.cur.col);	700	max_it (line->l, screen.cur.col);
819		701
820	screen.flags &= ~Screen_WrapNext;	702	screen.flags &= ~Screen_WrapNext;
821		703
822	if (screen.cur.row == screen.bscroll)	704	if (screen.cur.row == screen.bscroll)
823	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	705	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824	else if (screen.cur.row < (nrow - 1))	706	else if (screen.cur.row < (nrow - 1))
825	row = (++screen.cur.row) + saveLines;	707	row = ++screen.cur.row;
826		708
827	line = save + row; /* _must_ refresh */	709	line = &ROW(row); /* _must_ refresh */
828	continue;	710	continue;
829	}	711	}
830	else if (c == C0_CR)	712	else if (c == C0_CR)
831	{	713	{
832	if (line->l != -1) /* XXX: think about this */	714	if (!line->is_longer ()) /* XXX: think about this */
833	MAX_IT (line->l, screen.cur.col);	715	max_it (line->l, screen.cur.col);
834		716
835	screen.flags &= ~Screen_WrapNext;	717	screen.flags &= ~Screen_WrapNext;
836	screen.cur.col = 0;	718	screen.cur.col = 0;
837	continue;	719	continue;
838	}	720	}
…		…
855	CLEAR_SELECTION ();	737	CLEAR_SELECTION ();
856	}	738	}
857		739
858	if (screen.flags & Screen_WrapNext)	740	if (screen.flags & Screen_WrapNext)
859	{	741	{
860	line->l = -1;	742	line->set_is_longer ();
861		743
862	scr_do_wrap ();	744	scr_do_wrap ();
863		745
864	row = screen.cur.row + saveLines;	746	row = screen.cur.row;
865	line = save + row; /* _must_ refresh */	747	line = &ROW(row); /* _must_ refresh */
866	}	748	}
867		749
868	// some utf-8 decoders "decode" surrogate characters: let's fix this.	750	// some utf-8 decoders "decode" surrogate characters: let's fix this.
869	if (IN_RANGE (c, 0xd800, 0xdfff))	751	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870	c = 0xfffd;	752	c = 0xfffd;
871		753
872	// rely on wcwidth to tell us the character width, at least for non-latin1	754	// rely on wcwidth to tell us the character width, at least for non-latin1
873	// do wcwidth before further replacements, as wcwidth might return -1	755	// do wcwidth before further replacements, as wcwidth might return -1
874	// for the line drawing characters below as they might be invalid in the current	756	// for the line drawing characters below as they might be invalid in the current
…		…
989		871
990	while (*tp == NOCHAR && tp > line->t)	872	while (*tp == NOCHAR && tp > line->t)
991	tp--, rp--;	873	tp--, rp--;
992	}	874	}
993	else if (screen.cur.row > 0	875	else if (screen.cur.row > 0
994	&& save [screen.cur.row - 1 + saveLines].l == -1)	876	&& ROW(screen.cur.row - 1).is_longer ())
995	{	877	{
996	line_t *line = save + (screen.cur.row - 1 + saveLines);	878	line_t *line = &ROW(screen.cur.row - 1);
997		879
998	tp = line->t + last_col - 1;	880	tp = line->t + last_col - 1;
999	rp = line->r + last_col - 1;	881	rp = line->r + last_col - 1;
1000		882
1001	while (*tp == NOCHAR && tp > line->t)	883	while (*tp == NOCHAR && tp > line->t)
…		…
1013	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	895	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014	#endif	896	#endif
1015	}	897	}
1016	}	898	}
1017		899
1018	if (line->l != -1) /* XXX: think about this */	900	if (!line->is_longer ()) /* XXX: think about this */
1019	MAX_IT (line->l, screen.cur.col);	901	max_it (line->l, screen.cur.col);
1020		902
1021	#ifdef DEBUG_STRICT	903	#ifdef DEBUG_STRICT
1022	assert (screen.cur.row >= 0);	904	assert (screen.cur.row >= 0);
1023	#else /* drive with your eyes closed */	905	#else /* drive with your eyes closed */
1024	MAX_IT (screen.cur.row, 0);	906	max_it (screen.cur.row, 0);
1025	#endif	907	#endif
1026	}	908	}
1027		909
1028	/* ------------------------------------------------------------------------- */	910	/* ------------------------------------------------------------------------- */
1029	/*	911	/*
…		…
1068		950
1069	if (count == 0)	951	if (count == 0)
1070	return;	952	return;
1071	else if (count > 0)	953	else if (count > 0)
1072	{	954	{
1073	int row = saveLines + screen.cur.row;	955	int row = screen.cur.row;
1074		956
1075	line_t &l = save[row];	957	line_t &l = ROW(row);
1076	rend_t base_rend = l.r[i];	958	rend_t base_rend = l.r[i];
1077	ht &= l.t[i] == ' ';	959	ht &= l.t[i] == ' ';
1078		960
1079	for (; ++i < ncol; )	961	for (; ++i < ncol; )
1080	if (tabs[i])	962	if (tabs[i])
…		…
1094	// buffer so they can be selected and pasted.	976	// buffer so they can be selected and pasted.
1095	if (ht && options & Opt_pastableTabs)	977	if (ht && options & Opt_pastableTabs)
1096	{	978	{
1097	base_rend = SET_FONT (base_rend, 0);	979	base_rend = SET_FONT (base_rend, 0);
1098		980
1099	if (l.l != -1) /* XXX: think about this */	981	if (!l.is_longer ()) /* XXX: think about this */
1100	MAX_IT (l.l, x);	982	max_it (l.l, x);
1101		983
1102	i = screen.cur.col;	984	i = screen.cur.col;
1103		985
1104	l.t[i] = '\t';	986	l.t[i] = '\t';
1105	l.r[i] = base_rend;	987	l.r[i] = base_rend;
…		…
1141	rxvt_term::scr_backindex ()	1023	rxvt_term::scr_backindex ()
1142	{	1024	{
1143	if (screen.cur.col > 0)	1025	if (screen.cur.col > 0)
1144	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1026	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145	else	1027	else
1146	{
1147	if (save[screen.cur.row + saveLines].l == 0)
1148	return; /* um, yeah? */
1149
1150	scr_insdel_chars (1, INSERT);	1028	scr_insdel_chars (1, INSERT);
1151	}
1152	}	1029	}
1153	#endif	1030	#endif
1154	/* ------------------------------------------------------------------------- */	1031	/* ------------------------------------------------------------------------- */
1155	/*	1032	/*
1156	* Process DEC Forward Index	1033	* Process DEC Forward Index
…		…
1166		1043
1167	if (screen.cur.col < ncol - 1)	1044	if (screen.cur.col < ncol - 1)
1168	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1045	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169	else	1046	else
1170	{	1047	{
1171	row = screen.cur.row + saveLines;	1048	row = screen.cur.row;
1172		1049
1173	if (save[row].l == 0)	1050	if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1174	return; /* um, yeah? */
1175	else if (save[row].l == -1)
1176	save[row].l = ncol;	1051	ROW(row).l = ncol;
1177		1052
1178	scr_gotorc (0, 0, R_RELATIVE);	1053	scr_gotorc (0, 0, R_RELATIVE);
1179	scr_insdel_chars (1, DELETE);	1054	scr_insdel_chars (1, DELETE);
1180	scr_gotorc (0, ncol - 1, R_RELATIVE);	1055	scr_gotorc (0, ncol - 1, R_RELATIVE);
1181	}	1056	}
…		…
1191	{	1066	{
1192	want_refresh = 1;	1067	want_refresh = 1;
1193	ZERO_SCROLLBACK ();	1068	ZERO_SCROLLBACK ();
1194		1069
1195	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1070	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196	MAX_IT (screen.cur.col, 0);	1071	clamp_it (screen.cur.col, 0, ncol - 1);
1197	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198		1072
1199	screen.flags &= ~Screen_WrapNext;	1073	screen.flags &= ~Screen_WrapNext;
1200		1074
1201	if (relative & R_RELATIVE)	1075	if (relative & R_RELATIVE)
1202	{	1076	{
…		…
1220	else	1094	else
1221	{	1095	{
1222	if (screen.flags & Screen_Relative)	1096	if (screen.flags & Screen_Relative)
1223	{ /* relative origin mode */	1097	{ /* relative origin mode */
1224	screen.cur.row = row + screen.tscroll;	1098	screen.cur.row = row + screen.tscroll;
1225	MIN_IT (screen.cur.row, screen.bscroll);	1099	min_it (screen.cur.row, screen.bscroll);
1226	}	1100	}
1227	else	1101	else
1228	screen.cur.row = row;	1102	screen.cur.row = row;
1229	}	1103	}
1230		1104
1231	MAX_IT (screen.cur.row, 0);	1105	clamp_it (screen.cur.row, 0, nrow - 1);
1232	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233	}	1106	}
1234		1107
1235	/* ------------------------------------------------------------------------- */	1108	/* ------------------------------------------------------------------------- */
1236	/*	1109	/*
1237	* direction should be UP or DN	1110	* direction should be UP or DN
…		…
1248		1121
1249	screen.flags &= ~Screen_WrapNext;	1122	screen.flags &= ~Screen_WrapNext;
1250		1123
1251	if ((screen.cur.row == screen.bscroll && direction == UP)	1124	if ((screen.cur.row == screen.bscroll && direction == UP)
1252	|| (screen.cur.row == screen.tscroll && direction == DN))	1125	|| (screen.cur.row == screen.tscroll && direction == DN))
1253	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1126	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254	else	1127	else
1255	screen.cur.row += dirn;	1128	screen.cur.row += dirn;
1256		1129
1257	MAX_IT (screen.cur.row, 0);	1130	clamp_it (screen.cur.row, 0, nrow - 1);
1258	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259	selection_check (0);	1131	selection_check (0);
1260	}	1132	}
1261		1133
1262	/* ------------------------------------------------------------------------- */	1134	/* ------------------------------------------------------------------------- */
1263	/*	1135	/*
…		…
1274	want_refresh = 1;	1146	want_refresh = 1;
1275	ZERO_SCROLLBACK ();	1147	ZERO_SCROLLBACK ();
1276		1148
1277	selection_check (1);	1149	selection_check (1);
1278		1150
1279	row = saveLines + screen.cur.row;	1151	row = screen.cur.row;
1280		1152
1281	switch (mode)	1153	switch (mode)
1282	{	1154	{
1283	case 0: /* erase to end of line */	1155	case 0: /* erase to end of line */
1284	col = screen.cur.col;	1156	col = screen.cur.col;
1285	num = ncol - col;	1157	num = ncol - col;
1286	MIN_IT (save[row].l, (int16_t)col);	1158	min_it (ROW(row).l, col);
1287	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1159	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1160	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289	CLEAR_SELECTION ();	1161	CLEAR_SELECTION ();
1290	break;	1162	break;
1291	case 1: /* erase to beginning of line */	1163	case 1: /* erase to beginning of line */
…		…
1296	CLEAR_SELECTION ();	1168	CLEAR_SELECTION ();
1297	break;	1169	break;
1298	case 2: /* erase whole line */	1170	case 2: /* erase whole line */
1299	col = 0;	1171	col = 0;
1300	num = ncol;	1172	num = ncol;
1301	save[row].l = 0;	1173	ROW(row).l = 0;
1302	if (selection.beg.row <= screen.cur.row	1174	if (selection.beg.row <= screen.cur.row
1303	&& selection.end.row >= screen.cur.row)	1175	&& selection.end.row >= screen.cur.row)
1304	CLEAR_SELECTION ();	1176	CLEAR_SELECTION ();
1305	break;	1177	break;
1306	default:	1178	default:
1307	return;	1179	return;
1308	}	1180	}
1309		1181
1310	if (save[row].t)
1311	scr_blank_line (save[row], col, num, rstyle);	1182	scr_blank_line (ROW(row), col, num, rstyle);
1312	else
1313	scr_blank_screen_mem (save[row], rstyle);
1314	}	1183	}
1315		1184
1316	/* ------------------------------------------------------------------------- */	1185	/* ------------------------------------------------------------------------- */
1317	/*	1186	/*
1318	* Erase part of whole of the screen	1187	* Erase part of whole of the screen
…		…
1322	*/	1191	*/
1323	void	1192	void
1324	rxvt_term::scr_erase_screen (int mode)	1193	rxvt_term::scr_erase_screen (int mode)
1325	{	1194	{
1326	int num;	1195	int num;
1327	int32_t row, row_offset;	1196	int32_t row;
1328	rend_t ren;	1197	rend_t ren;
1329	XGCValues gcvalue;	1198	XGCValues gcvalue;
1330		1199
1331	want_refresh = 1;	1200	want_refresh = 1;
1332	ZERO_SCROLLBACK ();	1201	ZERO_SCROLLBACK ();
1333
1334	row_offset = (int32_t)saveLines;
1335		1202
1336	switch (mode)	1203	switch (mode)
1337	{	1204	{
1338	case 0: /* erase to end of screen */	1205	case 0: /* erase to end of screen */
1339	selection_check (1);	1206	selection_check (1);
…		…
1363	CLEAR_SELECTION ();	1230	CLEAR_SELECTION ();
1364		1231
1365	if (row >= nrow) /* Out Of Bounds */	1232	if (row >= nrow) /* Out Of Bounds */
1366	return;	1233	return;
1367		1234
1368	MIN_IT (num, (nrow - row));	1235	min_it (num, nrow - row);
1369		1236
1370	if (rstyle & (RS_RVid | RS_Uline))	1237	if (rstyle & (RS_RVid | RS_Uline))
1371	ren = (rend_t) ~RS_None;	1238	ren = (rend_t) ~RS_None;
1372	else if (GET_BASEBG (rstyle) == Color_bg)	1239	else if (GET_BASEBG (rstyle) == Color_bg)
1373	{	1240	{
…		…
1384	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1251	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385	}	1252	}
1386		1253
1387	for (; num--; row++)	1254	for (; num--; row++)
1388	{	1255	{
1389	scr_blank_screen_mem (save[row + row_offset], rstyle);	1256	scr_blank_screen_mem (ROW (row), rstyle);
1390	save[row + row_offset].l = 0;	1257	ROW (row).l = 0;
1391	scr_blank_line (drawn[row], 0, ncol, ren);	1258	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392	}	1259	}
1393	}	1260	}
1394		1261
1395	#if ENABLE_FRILLS	1262	#if ENABLE_FRILLS
1396	void	1263	void
1397	rxvt_term::scr_erase_savelines ()	1264	rxvt_term::scr_erase_savelines ()
1398	{	1265	{
1399	want_refresh = 1;	1266	want_refresh = 1;
1400	ZERO_SCROLLBACK ();	1267	ZERO_SCROLLBACK ();
1401		1268
1402	nscrolled = 0;	1269	nsaved = 0;
1403	}	1270	}
1404	#endif	1271	#endif
1405		1272
1406	/* ------------------------------------------------------------------------- */	1273	/* ------------------------------------------------------------------------- */
1407	/*	1274	/*
…		…
1409	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1276	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1410	*/	1277	*/
1411	void	1278	void
1412	rxvt_term::scr_E ()	1279	rxvt_term::scr_E ()
1413	{	1280	{
1414	int i, j, k;
1415	rend_t *r1, fs;	1281	rend_t fs;
1416		1282
1417	want_refresh = 1;	1283	want_refresh = 1;
1418	ZERO_SCROLLBACK ();	1284	ZERO_SCROLLBACK ();
1419		1285
1420	num_scr_allow = 0;	1286	num_scr_allow = 0;
1421	selection_check (3);	1287	selection_check (3);
1422		1288
1423	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1289	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424	for (k = saveLines, i = nrow; i--; k++)	1290	for (int row = nrow; row--; )
1425	{	1291	{
1426	save[k].l = ncol; /* make the `E's selectable */	1292	line_t &line = ROW(row);
		1293
1427	fill_text (save[k].t, 'E', ncol);	1294	fill_text (line.t, 'E', ncol);
1428	for (r1 = save[k].r, j = ncol; j--; )	1295	rend_t *r1 = line.r;
		1296
		1297	for (int j = ncol; j--; )
1429	*r1++ = fs;	1298	*r1++ = fs;
		1299
		1300	line.l = ncol; /* make the `E's selectable */
1430	}	1301	}
1431	}	1302	}
1432		1303
1433	/* ------------------------------------------------------------------------- */	1304	/* ------------------------------------------------------------------------- */
1434	/*	1305	/*
…		…
1455	count = end;	1326	count = end;
1456	}	1327	}
1457		1328
1458	scr_do_wrap ();	1329	scr_do_wrap ();
1459		1330
1460	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);	1331	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461	}	1332	}
1462		1333
1463	/* ------------------------------------------------------------------------- */	1334	/* ------------------------------------------------------------------------- */
1464	/*	1335	/*
1465	* Insert/Delete <count> characters from the current position	1336	* Insert/Delete <count> characters from the current position
…		…
1477	return;	1348	return;
1478		1349
1479	scr_do_wrap ();	1350	scr_do_wrap ();
1480		1351
1481	selection_check (1);	1352	selection_check (1);
1482	MIN_IT (count, (ncol - screen.cur.col));	1353	min_it (count, ncol - screen.cur.col);
1483		1354
1484	row = screen.cur.row + saveLines;	1355	row = screen.cur.row;
1485		1356
1486	line_t *line = save + row;	1357	line_t *line = &ROW(row);
1487		1358
1488	switch (insdel)	1359	switch (insdel)
1489	{	1360	{
1490	case INSERT:	1361	case INSERT:
1491	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1362	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492	{	1363	{
1493	line->t[col] = line->t[col - count];	1364	line->t[col] = line->t[col - count];
1494	line->r[col] = line->r[col - count];	1365	line->r[col] = line->r[col - count];
1495	}	1366	}
1496		1367
1497	if (line->l != -1)	1368	if (!line->is_longer ())
1498	{	1369	{
1499	line->l += count;	1370	line->l += count;
1500	MIN_IT (line->l, ncol);	1371	min_it (line->l, ncol);
1501	}	1372	}
1502		1373
1503	if (selection.op && current_screen == selection.screen	1374	if (selection.op && current_screen == selection.screen
1504	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1375	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505	{	1376	{
…		…
1512	selection.mark.col += count; /* XXX: yes? */	1383	selection.mark.col += count; /* XXX: yes? */
1513	selection.end.col += count;	1384	selection.end.col += count;
1514	}	1385	}
1515	}	1386	}
1516		1387
1517	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1388	scr_blank_line (*line, screen.cur.col, count, rstyle);
1518	break;	1389	break;
1519		1390
1520	case ERASE:	1391	case ERASE:
1521	screen.cur.col += count; /* don't worry if > ncol */	1392	screen.cur.col += count; /* don't worry if > ncol */
1522	selection_check (1);	1393	selection_check (1);
1523	screen.cur.col -= count;	1394	screen.cur.col -= count;
1524	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1395	scr_blank_line (*line, screen.cur.col, count, rstyle);
1525	break;	1396	break;
1526		1397
1527	case DELETE:	1398	case DELETE:
1528	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1399	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529		1400
…		…
1533	line->r[col] = line->r[col + count];	1404	line->r[col] = line->r[col + count];
1534	}	1405	}
1535		1406
1536	scr_blank_line (*line, ncol - count, count, tr);	1407	scr_blank_line (*line, ncol - count, count, tr);
1537		1408
1538	if (line->l == -1) /* break line continuation */	1409	if (line->is_longer ()) /* break line continuation */
1539	line->l = ncol;	1410	line->l = ncol;
1540		1411
1541	line->l -= count;	1412	line->l = max (line->l - count, 0);
1542	MAX_IT (line->l, 0);
1543		1413
1544	if (selection.op && current_screen == selection.screen	1414	if (selection.op && current_screen == selection.screen
1545	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1415	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546	{	1416	{
1547	if (selection.end.row != screen.cur.row	1417	if (selection.end.row != screen.cur.row
…		…
1567	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1437	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568	*/	1438	*/
1569	void	1439	void
1570	rxvt_term::scr_scroll_region (int top, int bot)	1440	rxvt_term::scr_scroll_region (int top, int bot)
1571	{	1441	{
1572	MAX_IT (top, 0);	1442	max_it (top, 0);
1573	MIN_IT (bot, (int)nrow - 1);	1443	min_it (bot, nrow - 1);
1574		1444
1575	if (top > bot)	1445	if (top > bot)
1576	return;	1446	return;
1577		1447
1578	screen.tscroll = top;	1448	screen.tscroll = top;
…		…
1676	XGCValues gcvalue;	1546	XGCValues gcvalue;
1677		1547
1678	if (rvideo != mode)	1548	if (rvideo != mode)
1679	{	1549	{
1680	rvideo = mode;	1550	rvideo = mode;
1681	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1551	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682	#if XPM_BACKGROUND	1552	#if XPM_BACKGROUND
1683	if (bgPixmap.pixmap == None)	1553	if (bgPixmap.pixmap == None)
1684	#endif	1554	#endif
1685	#if TRANSPARENT	1555	#if TRANSPARENT
1686	if (! (options & Opt_transparent) || am_transparent == 0)	1556	if (! (options & Opt_transparent) || am_transparent == 0)
…		…
1782	bool found = false;	1652	bool found = false;
1783		1653
1784	for (int i = 0; i < nrow; i++)	1654	for (int i = 0; i < nrow; i++)
1785	{	1655	{
1786	int col = 0;	1656	int col = 0;
1787	rend_t *drp = drawn[i].r;	1657	rend_t *drp = drawn_buf[i].r;
1788		1658
1789	for (; col < ncol; col++, drp++)	1659	for (; col < ncol; col++, drp++)
1790	if ((*drp & mask) == value)	1660	if ((*drp & mask) == value)
1791	{	1661	{
1792	found = true;	1662	found = true;
…		…
1810	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1680	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1811	{	1681	{
1812	int i;	1682	int i;
1813	row_col_t rc[RC_COUNT];	1683	row_col_t rc[RC_COUNT];
1814		1684
1815	if (!drawn) /* sanity check */	1685	if (!drawn_buf) /* sanity check */
1816	return;	1686	return;
1817		1687
1818	#ifndef NO_SLOW_LINK_SUPPORT	1688	#ifndef NO_SLOW_LINK_SUPPORT
1819	if (refresh_type == FAST_REFRESH && !display->is_local)	1689	if (refresh_type == FAST_REFRESH && !display->is_local)
1820	{	1690	{
…		…
1822	eheight = height;	1692	eheight = height;
1823	}	1693	}
1824	#endif	1694	#endif
1825		1695
1826	#ifdef DEBUG_STRICT	1696	#ifdef DEBUG_STRICT
1827	x = max (x, 0);	1697	#if 0
1828	x = min (x, (int)width);	1698	// that's not debugging //TODO //FIXME
1829	y = max (y, 0);	1699	clamp_it (x, 0, width);
1830	y = min (y, (int)height);	1700	clamp_it (y, 0, height);
		1701	#endif
1831	#endif	1702	#endif
1832		1703
1833	/* round down */	1704	/* round down */
1834	rc[PART_BEG].col = Pixel2Col (x);	1705	rc[PART_BEG].col = Pixel2Col (x);
1835	rc[PART_BEG].row = Pixel2Row (y);	1706	rc[PART_BEG].row = Pixel2Row (y);
…		…
1838	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1709	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839		1710
1840	/* sanity checks */	1711	/* sanity checks */
1841	for (i = PART_BEG; i < RC_COUNT; i++)	1712	for (i = PART_BEG; i < RC_COUNT; i++)
1842	{	1713	{
1843	MIN_IT (rc[i].col, ncol - 1);	1714	min_it (rc[i].col, ncol - 1);
1844	MIN_IT (rc[i].row, nrow - 1);	1715	min_it (rc[i].row, nrow - 1);
1845	}	1716	}
1846		1717
1847	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1718	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1848	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1719	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849		1720
1850	if (refresh)	1721	if (refresh)
1851	scr_refresh (SLOW_REFRESH);	1722	scr_refresh (SLOW_REFRESH);
1852	}	1723	}
1853		1724
…		…
1874		1745
1875	oldviewstart = view_start;	1746	oldviewstart = view_start;
1876		1747
1877	if (y < len)	1748	if (y < len)
1878	{	1749	{
1879	p = (nrow + nscrolled) * (len - y) / len;	1750	p = (nrow + nsaved) * (len - y) / len;
1880	p -= (long) (nrow - 1);	1751	p -= (long) (nrow - 1);
1881	p = max (p, 0);	1752	p = max (p, 0);
1882	}	1753	}
1883		1754
1884	view_start = (unsigned int)min (p, nscrolled);	1755	view_start = (unsigned int)min (p, nsaved);
1885		1756
1886	return scr_changeview (oldviewstart);	1757	return scr_changeview (oldviewstart);
1887	}	1758	}
1888		1759
1889	/* ------------------------------------------------------------------------- */	1760	/* ------------------------------------------------------------------------- */
…		…
1900	oldviewstart = view_start;	1771	oldviewstart = view_start;
1901		1772
1902	if (direction == UP)	1773	if (direction == UP)
1903	{	1774	{
1904	n = view_start + nlines;	1775	n = view_start + nlines;
1905	view_start = min (n, nscrolled);	1776	view_start = min (n, nsaved);
1906	}	1777	}
1907	else	1778	else
1908	{	1779	{
1909	n = view_start - nlines;	1780	n = view_start - nlines;
1910	view_start = max (n, 0);	1781	view_start = max (n, 0);
…		…
1954	/* ARGSUSED */	1825	/* ARGSUSED */
1955	void	1826	void
1956	rxvt_term::scr_printscreen (int fullhist)	1827	rxvt_term::scr_printscreen (int fullhist)
1957	{	1828	{
1958	#ifdef PRINTPIPE	1829	#ifdef PRINTPIPE
1959	int i, r1, nrows, row_offset;	1830	int nrows, row_start;
1960	FILE *fd;	1831	FILE *fd;
1961		1832
1962	if ((fd = popen_printer ()) == NULL)	1833	if ((fd = popen_printer ()) == NULL)
1963	return;	1834	return;
1964		1835
1965	nrows = nrow;
1966	row_offset = saveLines;
1967
1968	if (!fullhist)	1836	if (fullhist)
1969	row_offset -= view_start;	1837	{
		1838	nrows = nrow + nsaved;
		1839	row_start = -nsaved;
		1840	}
1970	else	1841	else
1971	{	1842	{
1972	nrows += nscrolled;	1843	nrows = nrow;
1973	row_offset -= nscrolled;	1844	row_start = -view_start;
1974	}	1845	}
1975		1846
1976	wctomb (0, 0);	1847	wctomb (0, 0);
1977		1848
1978	for (r1 = 0; r1 < nrows; r1++)	1849	for (int r1 = 0; r1 < nrows; r1++)
1979	{	1850	{
1980	text_t *tp = save[r1 + row_offset].t;	1851	text_t *tp = ROW(r1).t;
1981	int len = save[r1 + row_offset].l;	1852	int len = ROW(r1).l;
1982		1853
1983	for (i = len >= 0 ? len : ncol - 1; i--; )	1854	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984	{	1855	{
1985	char mb[MB_LEN_MAX];	1856	char mb[MB_LEN_MAX];
1986	text_t t = *tp++;	1857	text_t t = *tp++;
1987	if (t == NOCHAR)	1858	if (t == NOCHAR)
1988	continue;	1859	continue;
…		…
2016	{	1887	{
2017	unsigned char must_clear, /* use draw_string not draw_image_string */	1888	unsigned char must_clear, /* use draw_string not draw_image_string */
2018	showcursor; /* show the cursor */	1889	showcursor; /* show the cursor */
2019	int16_t col, row, /* column/row we're processing */	1890	int16_t col, row, /* column/row we're processing */
2020	ocrow; /* old cursor row */	1891	ocrow; /* old cursor row */
2021	int i, /* tmp */	1892	int i; /* tmp */
2022	row_offset; /* basic offset in screen structure */
2023	#ifndef NO_CURSORCOLOR	1893	#ifndef NO_CURSORCOLOR
2024	rend_t cc1; /* store colours at cursor position (s) */	1894	rend_t cc1; /* store colours at cursor position (s) */
2025	#endif	1895	#endif
2026	rend_t *crp; // cursor rendition pointer	1896	rend_t *crp; // cursor rendition pointer
2027		1897
…		…
2033	/*	1903	/*
2034	* A: set up vars	1904	* A: set up vars
2035	*/	1905	*/
2036	must_clear = 0;	1906	must_clear = 0;
2037	refresh_count = 0;	1907	refresh_count = 0;
2038
2039	row_offset = saveLines - view_start;
2040		1908
2041	#if XPM_BACKGROUND	1909	#if XPM_BACKGROUND
2042	must_clear |= bgPixmap.pixmap != None;	1910	must_clear |= bgPixmap.pixmap != None;
2043	#endif	1911	#endif
2044	#if TRANSPARENT	1912	#if TRANSPARENT
…		…
2067		1935
2068	if (showcursor)	1936	if (showcursor)
2069	{	1937	{
2070	int col = screen.cur.col;	1938	int col = screen.cur.col;
2071		1939
2072	while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)	1940	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073	col--;	1941	col--;
2074		1942
2075	crp = &screen.line[screen.cur.row]->r[col];	1943	crp = &ROW(screen.cur.row).r[col];
2076		1944
2077	if (showcursor && focus)	1945	if (showcursor && focus)
2078	{	1946	{
2079	if (options & Opt_cursorUnderline)	1947	if (options & Opt_cursorUnderline)
2080	*crp ^= RS_Uline;	1948	*crp ^= RS_Uline;
…		…
2114	if (screen.cur.row + view_start != ocrow	1982	if (screen.cur.row + view_start != ocrow
2115	|| screen.cur.col != oldcursor.col)	1983	|| screen.cur.col != oldcursor.col)
2116	{	1984	{
2117	if (ocrow < nrow	1985	if (ocrow < nrow
2118	&& oldcursor.col < ncol)	1986	&& oldcursor.col < ncol)
2119	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	1987	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120		1988
2121	if (focus || !showcursor)	1989	if (focus || !showcursor)
2122	oldcursor.row = -1;	1990	oldcursor.row = -1;
2123	else	1991	else
2124	setoldcursor = 1;	1992	setoldcursor = 1;
…		…
2148	* D: CopyArea pass - very useful for slower links	2016	* D: CopyArea pass - very useful for slower links
2149	* This has been deliberately kept simple.	2017	* This has been deliberately kept simple.
2150	*/	2018	*/
2151	i = num_scr;	2019	i = num_scr;
2152	if (!display->is_local	2020	if (!display->is_local
2153	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2021	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154	&& abs (i) < nrow && !must_clear)	2022	&& abs (num_scr) < nrow && !must_clear)
2155	{	2023	{
2156	int16_t nits;	2024	int16_t nits;
2157	int j;	2025	int j;
2158	int len, wlen;	2026	int len, wlen;
2159		2027
…		…
2162	row = i > 0 ? 0 : j - 1;	2030	row = i > 0 ? 0 : j - 1;
2163	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2031	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164	{	2032	{
2165	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2033	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166	{	2034	{
2167	line_t s = save[row + row_offset];	2035	line_t s = ROW(row - view_start);
2168	line_t d = drawn[row];	2036	line_t d = drawn_buf[row];
2169	line_t d2 = drawn[row + i];	2037	line_t d2 = drawn_buf[row + i];
2170		2038
2171	for (nits = 0, col = ncol; col--; )	2039	for (nits = 0, col = ncol; col--; )
2172	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2040	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173	nits--;	2041	nits--;
2174	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])	2042	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
…		…
2192		2060
2193	if (len != -1)	2061	if (len != -1)
2194	{	2062	{
2195	/* also comes here at end if needed because of >= above */	2063	/* also comes here at end if needed because of >= above */
2196	if (wlen < len)	2064	if (wlen < len)
2197	SWAP_IT (wlen, len, int);	2065	::swap (wlen, len);
2198		2066
2199	XCopyArea (display->display, vt, vt,	2067	XCopyArea (display->display, vt, vt,
2200	gc, 0, Row2Pixel (len + i),	2068	gc, 0, Row2Pixel (len + i),
2201	(unsigned int)TermWin_TotalWidth (),	2069	(unsigned int)TermWin_TotalWidth (),
2202	(unsigned int)Height2Pixel (wlen - len + 1),	2070	(unsigned int)Height2Pixel (wlen - len + 1),
…		…
2210	/*	2078	/*
2211	* E: main pass across every character	2079	* E: main pass across every character
2212	*/	2080	*/
2213	for (row = 0; row < nrow; row++)	2081	for (row = 0; row < nrow; row++)
2214	{	2082	{
2215	text_t *stp = save[row + row_offset].t;	2083	text_t *stp = ROW(row - view_start).t;
2216	rend_t *srp = save[row + row_offset].r;	2084	rend_t *srp = ROW(row - view_start).r;
2217	text_t *dtp = drawn[row].t;	2085	text_t *dtp = drawn_buf[row].t;
2218	rend_t *drp = drawn[row].r;	2086	rend_t *drp = drawn_buf[row].r;
2219		2087
2220	/*	2088	/*
2221	* E2: OK, now the real pass	2089	* E2: OK, now the real pass
2222	*/	2090	*/
2223	int ypixel = (int)Row2Pixel (row);	2091	int ypixel = (int)Row2Pixel (row);
…		…
2334	fore = Color_UL;	2202	fore = Color_UL;
2335	#endif	2203	#endif
2336		2204
2337	if (invert)	2205	if (invert)
2338	{	2206	{
2339	SWAP_IT (fore, back, int);	2207	::swap (fore, back);
2340		2208
2341	#ifndef NO_BOLD_UNDERLINE_REVERSE	2209	#ifndef NO_BOLD_UNDERLINE_REVERSE
2342	if (ISSET_PIXCOLOR (Color_RV))	2210	if (ISSET_PIXCOLOR (Color_RV))
2343	back = Color_RV;	2211	back = Color_RV;
2344		2212
…		…
2432	else if (oldcursor.row >= 0)	2300	else if (oldcursor.row >= 0)
2433	{	2301	{
2434	int cursorwidth = 1;	2302	int cursorwidth = 1;
2435	int col = oldcursor.col;	2303	int col = oldcursor.col;
2436		2304
2437	while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)	2305	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438	col--;	2306	col--;
2439		2307
2440	while (col + cursorwidth < ncol	2308	while (col + cursorwidth < ncol
2441	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2309	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442	cursorwidth++;	2310	cursorwidth++;
2443		2311
2444	#ifndef NO_CURSORCOLOR	2312	#ifndef NO_CURSORCOLOR
2445	if (ISSET_PIXCOLOR (Color_cursor))	2313	if (ISSET_PIXCOLOR (Color_cursor))
2446	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2314	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2477	}	2345	}
2478		2346
2479	void	2347	void
2480	rxvt_term::scr_remap_chars ()	2348	rxvt_term::scr_remap_chars ()
2481	{	2349	{
2482	for (int i = nrow + saveLines; i--; )	2350	for (int i = total_rows; i--; )
2483	scr_remap_chars (save[i]);	2351	scr_remap_chars (row_buf [i]);
2484		2352
2485	for (int i = nrow; i--; )	2353	for (int i = nrow; i--; )
2486	{	2354	{
2487	scr_remap_chars (drawn[i]);	2355	scr_remap_chars (drawn_buf [i]);
2488	scr_remap_chars (swap_save[i]);	2356	scr_remap_chars (swap_buf [i]);
2489	}	2357	}
2490	}	2358	}
2491		2359
2492	void	2360	void
2493	rxvt_term::scr_recolour ()	2361	rxvt_term::scr_recolour ()
…		…
2535		2403
2536	/* ------------------------------------------------------------------------- */	2404	/* ------------------------------------------------------------------------- */
2537	void	2405	void
2538	rxvt_term::scr_reverse_selection ()	2406	rxvt_term::scr_reverse_selection ()
2539	{	2407	{
		2408	if (selection.op
2540	if (selection.op && current_screen == selection.screen)	2409	&& current_screen == selection.screen
		2410	&& selection.end.row >= -view_start)
2541	{	2411	{
2542	int end_row = saveLines - view_start;	2412	int view_end = -view_start + nrow;
2543	int i = selection.beg.row + saveLines;	2413	int row, col;
2544	int col, row = selection.end.row + saveLines;
2545	rend_t *srp;
2546		2414
2547	#if ENABLE_FRILLS	2415	#if ENABLE_FRILLS
2548	if (selection.rect)	2416	if (selection.rect)
2549	{	2417	{
2550	end_row += nrow;	2418	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2551
2552	for (; i <= row && i <= end_row; i++)
2553	for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)	2419	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2554	srp[col] ^= RS_RVid;	2420	srp[col] ^= RS_RVid;
2555	}	2421	}
2556	else	2422	else
2557	#endif	2423	#endif
2558	{	2424	{
2559	if (i >= end_row)	2425	if (selection.beg.row >= -view_start)
		2426	{
2560	col = selection.beg.col;	2427	col = selection.beg.col;
		2428	row = selection.beg.row;
		2429	}
2561	else	2430	else
2562	{	2431	{
2563	col = 0;	2432	col = 0;
2564	i = end_row;	2433	row = view_start;
2565	}	2434	}
2566		2435
2567	end_row += nrow;	2436	for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569	for (; i < row && i < end_row; i++, col = 0)
2570	for (srp = save[i].r; col < ncol; col++)	2437	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571	srp[col] ^= RS_RVid;	2438	srp[col] ^= RS_RVid;
2572		2439
2573	if (i == row && i < end_row)	2440	if (row == selection.end.row)
2574	for (srp = save[i].r; col < selection.end.col; col++)	2441	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575	srp[col] ^= RS_RVid;	2442	srp[col] ^= RS_RVid;
2576	}	2443	}
2577	}	2444	}
2578	}	2445	}
2579		2446
…		…
2588	{	2455	{
2589	int row, wrote;	2456	int row, wrote;
2590	unsigned int width, towrite;	2457	unsigned int width, towrite;
2591	char r1[] = "\n";	2458	char r1[] = "\n";
2592		2459
2593	for (row = saveLines - nscrolled;	2460	for (row = saveLines - nsaved;
2594	row < saveLines + nrow - 1; row++)	2461	row < saveLines + nrow - 1; row++)
2595	{	2462	{
2596	width = save[row].l >= 0 ? save[row].l	2463	width = row_buf[row].l >= 0 ? row_buf[row].l
2597	: ncol;	2464	: ncol;
2598	for (towrite = width; towrite; towrite -= wrote)	2465	for (towrite = width; towrite; towrite -= wrote)
2599	{	2466	{
2600	wrote = write (fd, & (save[row].t[width - towrite]),	2467	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601	towrite);	2468	towrite);
2602	if (wrote < 0)	2469	if (wrote < 0)
2603	return; /* XXX: death, no report */	2470	return; /* XXX: death, no report */
2604	}	2471	}
2605	if (save[row].l >= 0)	2472	if (row_buf[row].l >= 0)
2606	if (write (fd, r1, 1) <= 0)	2473	if (write (fd, r1, 1) <= 0)
2607	return; /* XXX: death, no report */	2474	return; /* XXX: death, no report */
2608	}	2475	}
2609	}	2476	}
2610	#endif	2477	#endif
2611		2478
2612	/* ------------------------------------------------------------------------- *	2479	/* ------------------------------------------------------------------------- *
2613	* CHARACTER SELECTION *	2480	* CHARACTER SELECTION *
2614	* ------------------------------------------------------------------------- */	2481	* ------------------------------------------------------------------------- */
2615
2616	/*
2617	* -nscrolled <= (selection row) <= nrow - 1
2618	*/
2619	void	2482	void
2620	rxvt_term::selection_check (int check_more)	2483	rxvt_term::selection_check (int check_more)
2621	{	2484	{
2622	row_col_t pos;	2485	row_col_t pos;
2623		2486
2624	if (!selection.op)	2487	if (!selection.op)
2625	return;	2488	return;
2626		2489
2627	pos.row = pos.col = 0;	2490	pos.row = pos.col = 0;
2628	if ((selection.beg.row < - (int32_t)nscrolled)	2491	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629	|| (selection.beg.row >= nrow)	2492	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630	|| (selection.mark.row < - (int32_t)nscrolled)	2493	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631	|| (selection.mark.row >= nrow)
2632	|| (selection.end.row < - (int32_t)nscrolled)
2633	|| (selection.end.row >= nrow)
2634	|| (check_more == 1	2494	|| (check_more == 1
2635	&& current_screen == selection.screen	2495	&& current_screen == selection.screen
2636	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2496	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2497	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638	|| (check_more == 2	2498	|| (check_more == 2
…		…
2944	* EXT: button 1 or 3 release	2804	* EXT: button 1 or 3 release
2945	*/	2805	*/
2946	void	2806	void
2947	rxvt_term::selection_make (Time tm)	2807	rxvt_term::selection_make (Time tm)
2948	{	2808	{
2949	int i, col, end_col, row, end_row;	2809	int i;
2950	wchar_t *new_selection_text;	2810	wchar_t *new_selection_text;
2951	text_t *t;	2811	text_t *t;
2952		2812
2953	switch (selection.op)	2813	switch (selection.op)
2954	{	2814	{
…		…
2970	return; /* nothing selected, go away */	2830	return; /* nothing selected, go away */
2971		2831
2972	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2832	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2833	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974		2834
2975	col = selection.beg.col;
2976	row = selection.beg.row + saveLines;
2977	end_row = selection.end.row + saveLines;
2978	int ofs = 0;	2835	int ofs = 0;
2979	int extra = 0;	2836	int extra = 0;
2980		2837
		2838	int col = selection.beg.col;
		2839	int row = selection.beg.row;
		2840
		2841	int end_col;
		2842
2981	for (; row <= end_row; row++, col = 0)	2843	for (; row <= selection.end.row; row++, col = 0)
2982	{	2844	{
2983	end_col = save[row].l;
2984
2985	#if ENABLE_FRILLS	2845	#if ENABLE_FRILLS
2986	if (selection.rect)	2846	if (selection.rect)
2987	{	2847	{
2988	col = selection.beg.col;	2848	col = selection.beg.col;
2989	end_col = ncol + 1;	2849	end_col = ncol + 1;
2990	}	2850	}
		2851	else
2991	#endif	2852	#endif
		2853	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992		2854
2993	MAX_IT (col, 0);	2855	col = max (col, 0);
2994		2856
2995	if (end_col == -1)
2996	end_col = ncol;
2997
2998	if (row == end_row || selection.rect)	2857	if (row == selection.end.row || selection.rect)
2999	MIN_IT (end_col, selection.end.col);	2858	end_col = min (end_col, selection.end.col);
3000		2859
3001	t = &save[row].t[col];	2860	t = ROW(row).t + col;
3002	for (; col < end_col; col++)	2861	for (; col < end_col; col++)
3003	{	2862	{
3004	if (*t == NOCHAR)	2863	if (*t == NOCHAR)
3005	t++;	2864	t++;
3006	#if ENABLE_COMBINING	2865	#if ENABLE_COMBINING
…		…
3022	#endif	2881	#endif
3023	else	2882	else
3024	new_selection_text[ofs++] = *t++;	2883	new_selection_text[ofs++] = *t++;
3025	}	2884	}
3026		2885
3027	if (save[row].l != -1 && row != end_row)	2886	if (!ROW(row).is_longer () && row != selection.end.row)
3028	new_selection_text[ofs++] = C0_LF;	2887	new_selection_text[ofs++] = C0_LF;
3029	}	2888	}
3030		2889
3031	if (end_col != selection.end.col)	2890	if (end_col != selection.end.col)
3032	new_selection_text[ofs++] = C0_LF;	2891	new_selection_text[ofs++] = C0_LF;
…		…
3091	*/	2950	*/
3092	void	2951	void
3093	rxvt_term::selection_start_colrow (int col, int row)	2952	rxvt_term::selection_start_colrow (int col, int row)
3094	{	2953	{
3095	want_refresh = 1;	2954	want_refresh = 1;
		2955
		2956	selection.mark.row = row - view_start;
3096	selection.mark.col = col;	2957	selection.mark.col = col;
3097	selection.mark.row = row - view_start;
3098		2958
3099	MAX_IT (selection.mark.row, - (int32_t)nscrolled);	2959	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3100	MIN_IT (selection.mark.row, (int32_t)nrow - 1);	2960	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3101	MAX_IT (selection.mark.col, 0);
3102	MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3103		2961
3104	while (selection.mark.col > 0	2962	while (selection.mark.col > 0
3105	&& save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)	2963	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3106	--selection.mark.col;	2964	--selection.mark.col;
3107		2965
3108	if (selection.op)	2966	if (selection.op)
3109	{ /* clear the old selection */	2967	{ /* clear the old selection */
3110	selection.beg.row = selection.end.row = selection.mark.row;	2968	selection.beg.row = selection.end.row = selection.mark.row;
…		…
3134	text_t *stp;	2992	text_t *stp;
3135	rend_t *srp;	2993	rend_t *srp;
3136		2994
3137	if (dirn == UP)	2995	if (dirn == UP)
3138	{	2996	{
3139	bound.row = saveLines - nscrolled - 1;	2997	bound.row = - nsaved - 1;
3140	bound.col = 0;	2998	bound.col = 0;
3141	dirnadd = -1;	2999	dirnadd = -1;
3142	}	3000	}
3143	else	3001	else
3144	{	3002	{
3145	bound.row = saveLines + nrow;	3003	bound.row = nrow;
3146	bound.col = ncol - 1;	3004	bound.col = ncol - 1;
3147	dirnadd = 1;	3005	dirnadd = 1;
3148	}	3006	}
3149		3007
3150	row = mark->row + saveLines;	3008	row = mark->row;
3151	col = mark->col;	3009	col = max (mark->col, 0);
3152	MAX_IT (col, 0);	3010
3153	/* find the edge of a word */	3011	/* find the edge of a word */
3154	stp = &save[row].t[col];	3012	stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3155	w1 = DELIMIT_TEXT (*stp);	3013	srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3156
3157	srp = &save[row].r[col];
3158	w2 = DELIMIT_REND (*srp);
3159		3014
3160	for (;;)	3015	for (;;)
3161	{	3016	{
3162	for (; col != bound.col; col += dirnadd)	3017	for (; col != bound.col; col += dirnadd)
3163	{	3018	{
…		…
3173	break;	3028	break;
3174	}	3029	}
3175		3030
3176	if ((col == bound.col) && (row != bound.row))	3031	if ((col == bound.col) && (row != bound.row))
3177	{	3032	{
3178	if (save[ (row - (dirn == UP ? 1 : 0))].l == -1)	3033	if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3179	{	3034	{
3180	trow = row + dirnadd;	3035	trow = row + dirnadd;
3181	tcol = dirn == UP ? ncol - 1 : 0;	3036	tcol = dirn == UP ? ncol - 1 : 0;
3182		3037
3183	if (save[trow].t == NULL)	3038	if (!ROW(trow).t)
3184	break;	3039	break;
3185		3040
3186	stp = & (save[trow].t[tcol]);	3041	stp = ROW(trow).t + tcol;
3187	srp = & (save[trow].r[tcol]);	3042	srp = ROW(trow).r + tcol;
3188		3043
3189	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)	3044	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3190	break;	3045	break;
3191		3046
3192	row = trow;	3047	row = trow;
…		…
3200	Old_Word_Selection_You_Die:	3055	Old_Word_Selection_You_Die:
3201	if (dirn == DN)	3056	if (dirn == DN)
3202	col++; /* put us on one past the end */	3057	col++; /* put us on one past the end */
3203		3058
3204	/* Poke the values back in */	3059	/* Poke the values back in */
3205	ret->row = row - saveLines;	3060	ret->row = row;
3206	ret->col = col;	3061	ret->col = col;
3207	}	3062	}
3208		3063
3209	/* ------------------------------------------------------------------------- */	3064	/* ------------------------------------------------------------------------- */
3210	/*	3065	/*
…		…
3215	* flag == 2 ==> button 3 motion	3070	* flag == 2 ==> button 3 motion
3216	*/	3071	*/
3217	void	3072	void
3218	rxvt_term::selection_extend (int x, int y, int flag)	3073	rxvt_term::selection_extend (int x, int y, int flag)
3219	{	3074	{
3220	int col, row;	3075	int col = clamp (Pixel2Col (x), 0, ncol);
3221		3076	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3222	col = Pixel2Col (x);
3223	row = Pixel2Row (y);
3224	MAX_IT (row, 0);
3225	MIN_IT (row, (int)nrow - 1);
3226	MAX_IT (col, 0);
3227	MIN_IT (col, (int)ncol);
3228		3077
3229	/*	3078	/*
3230	* If we're selecting characters (single click) then we must check first	3079	* If we're selecting characters (single click) then we must check first
3231	* if we are at the same place as the original mark. If we are then	3080	* if we are at the same place as the original mark. If we are then
3232	* select nothing. Otherwise, if we're to the right of the mark, you have to	3081	* select nothing. Otherwise, if we're to the right of the mark, you have to
…		…
3257	* Extend the selection to the specified col/row	3106	* Extend the selection to the specified col/row
3258	*/	3107	*/
3259	void	3108	void
3260	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3109	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3261	{	3110	{
3262	int end_col;
3263	row_col_t pos;	3111	row_col_t pos;
3264	enum {	3112	enum {
3265	LEFT, RIGHT	3113	LEFT, RIGHT
3266	} closeto = RIGHT;	3114	} closeto = RIGHT;
3267		3115
…		…
3298	selection.beg.col = selection.end.col = selection.mark.col;	3146	selection.beg.col = selection.end.col = selection.mark.col;
3299	selection.beg.row = selection.end.row = selection.mark.row;	3147	selection.beg.row = selection.end.row = selection.mark.row;
3300	}	3148	}
3301		3149
3302	pos.col = col;	3150	pos.col = col;
3303	pos.row = row;	3151	pos.row = row - view_start;
3304
3305	pos.row -= view_start; /* adjust for scroll */
3306		3152
3307	/*	3153	/*
3308	* This is mainly xterm style selection with a couple of differences, mainly	3154	* This is mainly xterm style selection with a couple of differences, mainly
3309	* in the way button3 drag extension works.	3155	* in the way button3 drag extension works.
3310	* We're either doing: button1 drag; button3 press; or button3 drag	3156	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3369	}	3215	}
3370	}	3216	}
3371		3217
3372	if (selection.clicks == 1)	3218	if (selection.clicks == 1)
3373	{	3219	{
3374	end_col = save[selection.beg.row + saveLines].l;	3220	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375		3221	&& !ROW(selection.beg.row).is_longer ()
3376	if (selection.beg.col > end_col
3377	&& end_col != -1
3378	#if ENABLE_FRILLS	3222	#if ENABLE_FRILLS
3379	&& !selection.rect	3223	&& !selection.rect
3380	#endif	3224	#endif
3381	)	3225	)
3382	selection.beg.col = ncol;	3226	selection.beg.col = ncol;
3383		3227
3384	end_col = save[selection.end.row + saveLines].l;
3385
3386	if (	3228	if (
3387	selection.end.col > end_col	3229	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3388	&& end_col != -1	3230	&& !ROW(selection.end.row).is_longer ()
3389	#if ENABLE_FRILLS	3231	#if ENABLE_FRILLS
3390	&& !selection.rect	3232	&& !selection.rect
3391	#endif	3233	#endif
3392	)	3234	)
3393	selection.end.col = ncol;	3235	selection.end.col = ncol;
…		…
3403	else if (selection.clicks == 3)	3245	else if (selection.clicks == 3)
3404	{	3246	{
3405	#if ENABLE_FRILLS	3247	#if ENABLE_FRILLS
3406	if (options & Opt_tripleclickwords)	3248	if (options & Opt_tripleclickwords)
3407	{	3249	{
3408	int end_row;
3409
3410	selection_delimit_word (UP, &selection.beg, &selection.beg);	3250	selection_delimit_word (UP, &selection.beg, &selection.beg);
3411	end_row = save[selection.mark.row + saveLines].l;
3412		3251
3413	for (end_row = selection.mark.row; end_row < nrow; end_row++)	3252	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3414	{	3253	{
3415	end_col = save[end_row + saveLines].l;	3254	if (!ROW(end_row).is_longer ())
3416
3417	if (end_col != -1)
3418	{	3255	{
3419	selection.end.row = end_row;	3256	selection.end.row = end_row;
3420	selection.end.col = end_col;	3257	selection.end.col = ROW(end_row).l;
3421	selection_remove_trailing_spaces ();	3258	selection_remove_trailing_spaces ();
3422	break;	3259	break;
3423	}	3260	}
3424	}	3261	}
3425	}	3262	}
…		…
3432	selection.beg.col = 0;	3269	selection.beg.col = 0;
3433	selection.end.col = ncol;	3270	selection.end.col = ncol;
3434		3271
3435	// select a complete logical line	3272	// select a complete logical line
3436	while (selection.beg.row > -saveLines	3273	while (selection.beg.row > -saveLines
3437	&& save[selection.beg.row - 1 + saveLines].l == -1)	3274	&& ROW(selection.beg.row - 1).is_longer ())
3438	selection.beg.row--;	3275	selection.beg.row--;
3439		3276
3440	while (selection.end.row < nrow	3277	while (selection.end.row < nrow
3441	&& save[selection.end.row + saveLines].l == -1)	3278	&& ROW(selection.end.row).is_longer ())
3442	selection.end.row++;	3279	selection.end.row++;
3443	}	3280	}
3444	}	3281	}
3445		3282
3446	if (button3 && buttonpress)	3283	if (button3 && buttonpress)
…		…
3457	}	3294	}
3458	}	3295	}
3459		3296
3460	#if ENABLE_FRILLS	3297	#if ENABLE_FRILLS
3461	if (selection.rect && selection.beg.col > selection.end.col)	3298	if (selection.rect && selection.beg.col > selection.end.col)
3462	SWAP_IT (selection.beg.col, selection.end.col, int);	3299	::swap (selection.beg.col, selection.end.col);
3463	#endif	3300	#endif
3464	}	3301	}
3465		3302
3466	#if ENABLE_FRILLS	3303	#if ENABLE_FRILLS
3467	void	3304	void
…		…
3471	text_t *stp;	3308	text_t *stp;
3472		3309
3473	end_col = selection.end.col;	3310	end_col = selection.end.col;
3474	end_row = selection.end.row;	3311	end_row = selection.end.row;
3475		3312
3476	for ( ; end_row >= selection.beg.row; )	3313	for (; end_row >= selection.beg.row; )
3477	{	3314	{
3478	stp = save[end_row + saveLines].t;	3315	stp = ROW(end_row).t;
3479		3316
3480	while (--end_col >= 0)	3317	while (--end_col >= 0)
3481	{	3318	{
3482	if (stp[end_col] != ' '	3319	if (stp[end_col] != ' '
3483	&& stp[end_col] != '\t'	3320	&& stp[end_col] != '\t'
3484	&& stp[end_col] != NOCHAR)	3321	&& stp[end_col] != NOCHAR)
3485	break;	3322	break;
3486	}	3323	}
3487		3324
3488	if (end_col >= 0	3325	if (end_col >= 0
3489	|| save[end_row - 1 + saveLines].l != -1)	3326	|| !ROW(end_row - 1).is_longer ())
3490	{	3327	{
3491	selection.end.col = end_col + 1;	3328	selection.end.col = end_col + 1;
3492	selection.end.row = end_row;	3329	selection.end.row = end_row;
3493	break;	3330	break;
3494	}	3331	}
…		…
3665	*/	3502	*/
3666	void	3503	void
3667	rxvt_term::pixel_position (int *x, int *y)	3504	rxvt_term::pixel_position (int *x, int *y)
3668	{	3505	{
3669	*x = Pixel2Col (*x);	3506	*x = Pixel2Col (*x);
3670	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3507	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3671	*y = Pixel2Row (*y);	3508	*y = Pixel2Row (*y);
3672	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3509	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3673	}	3510	}
3674		3511
3675	/* ------------------------------------------------------------------------- */	3512	/* ------------------------------------------------------------------------- */
3676	#ifdef USE_XIM	3513	#ifdef USE_XIM
3677	void	3514	void
…		…
3699		3536
3700	if (x < 0) x = ncol - w;	3537	if (x < 0) x = ncol - w;
3701	if (y < 0) y = nrow - h;	3538	if (y < 0) y = nrow - h;
3702		3539
3703	// make space for border	3540	// make space for border
3704	w += 2; MIN_IT (w, ncol);	3541	w += 2; min_it (w, ncol);
3705	h += 2; MIN_IT (h, nrow);	3542	h += 2; min_it (h, nrow);
3706		3543
3707	x -= 1; MAX_IT (x, 0);	3544	x -= 1; clamp_it (x, 0, ncol - w);
3708	y -= 1; MAX_IT (y, 0);	3545	y -= 1; clamp_it (y, 0, nrow - h);
3709
3710	MIN_IT (x, ncol - w);
3711	MIN_IT (y, nrow - h);
3712		3546
3713	ov_x = x; ov_y = y;	3547	ov_x = x; ov_y = y;
3714	ov_w = w; ov_h = h;	3548	ov_w = w; ov_h = h;
3715		3549
3716	ov_text = new text_t *[h];	3550	ov_text = new text_t *[h];
…		…
3802	rxvt_term::scr_swap_overlay ()	3636	rxvt_term::scr_swap_overlay ()
3803	{	3637	{
3804	if (!ov_text)	3638	if (!ov_text)
3805	return;	3639	return;
3806		3640
3807	int row_offset = ov_y + saveLines - view_start;
3808
3809	// swap screen mem with overlay	3641	// swap screen mem with overlay
3810	for (int y = ov_h; y--; )	3642	for (int y = ov_h; y--; )
3811	{	3643	{
3812	text_t *t1 = ov_text[y];	3644	text_t *t1 = ov_text[y];
3813	rend_t *r1 = ov_rend[y];	3645	rend_t *r1 = ov_rend[y];
3814		3646
3815	text_t *t2 = save[y + row_offset].t + ov_x;	3647	text_t *t2 = ROW(y - view_start).t + ov_x;
3816	rend_t *r2 = save[y + row_offset].r + ov_x;	3648	rend_t *r2 = ROW(y - view_start).r + ov_x;
3817		3649
3818	for (int x = ov_w; x--; )	3650	for (int x = ov_w; x--; )
3819	{	3651	{
3820	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3652	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3821	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3653	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
…		…
3823	}	3655	}
3824	}	3656	}
3825		3657
3826	#endif	3658	#endif
3827	/* ------------------------------------------------------------------------- */	3659	/* ------------------------------------------------------------------------- */
		3660

Diff Legend

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