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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.188 by root, Thu Dec 22 00:07:47 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	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247	rxvt_salloc *old_ra;	245	rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248		246
		247	#if 0
249	if (nrow < prev_nrow)	248	if (nrow < prev_nrow)
250	{	249	{
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++)	250	for (int row = nrow; row < prev_nrow; row++)
257	{	251	{
258	lfree (save[p + saveLines]);
259	lfree (swap_save[p]);	252	lfree (swap_buf [row]);
260	lfree (drawn[p]);	253	lfree (drawn_buf[row]);
261	}	254	}
		255	}
		256	#endif
262		257
263	/* we have fewer rows so fix up cursor position */	258	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	259	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
		260	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265		261
266	scr_reset_realloc (); /* realloc _last_ */	262	for (int row = min (nrow, prev_nrow); row--; )
		263	{
		264	lresize (drawn_buf[row]);
		265	lresize (swap_buf [row]);
		266	}
		267
		268	for (int row = prev_nrow; row < nrow; row++)
		269	{
		270	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		271	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
		272	}
		273
		274	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267	}	275
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	276	// re-wrap lines, this is rather ugly, possibly because I am too dumb
331	// to come up with a lean and mean algorithm.	277	// 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		278
339	for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	279	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
		280	int pend = MOD (term_start - nsaved , prev_total_rows);
		281	int q = total_rows; // rewrapped row
340		282
341	p = prev_total_rows;
342	q = total_rows;
343
344	while (p > 0 && q > 0)	283	while (p != pend && q > 0)
345	{	284	{
346	--p;	285	p = MOD (p - 1, prev_total_rows);
		286	#ifdef DEBUG_STRICT
		287	assert (old_buf [MOD (p, prev_total_rows)].t);
		288	#endif
347		289
348	printf ("pq %d:%d\n", p, q);	290	int llen = old_buf [MOD (p, prev_total_rows)].l;
349	if (save[p].t)	291
		292	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
350	{	293	{
351	int llen = save[p].l;	294	p = MOD (p - 1, prev_total_rows);
352		295
353	assert (llen >= 0);	296	llen += prev_ncol;
		297	}
354		298
355	while (p && save[p - 1].l < 0)	299	int qlines = max (0, (llen - 1) / ncol) + 1;
		300
		301	// drop partial lines completely
		302	if (q < qlines)
		303	break;
		304
		305	q -= qlines;
		306
		307	int lofs = 0;
		308	line_t *qline;
		309
		310	// re-assemble the full line by destination lines
		311	for (int qrow = q; qlines--; qrow++)
		312	{
		313	qline = row_buf + qrow;
		314	lalloc (*qline);
		315	qline->set_is_longer ();
		316
		317	int qcol = 0;
		318
		319	// fill a single destination line
		320	while (lofs < llen && qcol < ncol)
356	{	321	{
357	--p;
358	llen += prev_ncol;
359	}
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] = LINE_CONT1;
376
377	int qcol = 0;
378
379	for (;;)
380	{
381	int prow = lofs / prev_ncol + p;	322	int prow = lofs / prev_ncol;
382	int pcol = lofs % prev_ncol;	323	int pcol = lofs % prev_ncol;
383		324
		325	line_t &pline = old_buf [MOD (p + prow, prev_total_rows)];
		326
384	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	327	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385		328
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);	329	assert (len);
		330	assert (pline.t);
387		331
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));	332	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402	memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));	333	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403		334
404	lofs += len;
405	qcol += len;
406
407	if (qcol == ncol)
408	break;
409	}
410	}
411	else
412	lofs += ncol;	335	lofs += len;
		336	qcol += len;
413	}	337	}
414	}	338	}
415	}
416		339
417	free (screen.text); screen.text = tp;	340	qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
418	free (screen.rend); screen.rend = rp;	341	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
419	free (screen.tlen); screen.tlen = tl;	342	}
420		343
421	for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D	344	term_start = total_rows - nrow;
422	#endif	345	view_start = 0;
		346	nsaved = term_start - q;
		347
		348	// make sure all terminal lines exist
		349	while (nsaved < 0)
		350	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
		351
		352	for (int i = -nsaved; i < nrow; i++)
		353	assert (ROW (i).t);//D
		354
		355	free (old_buf);
		356	delete old_ta;
		357	delete old_ra;
		358
		359	min_it (screen.cur.row, nrow - 1);
		360	min_it (screen.cur.col, ncol - 1);
423		361
424	if (tabs)	362	if (tabs)
425	free (tabs);	363	free (tabs);
426	}	364	}
427		365
428	prev_nrow = nrow;	366	prev_nrow = nrow;
429	prev_ncol = ncol;	367	prev_ncol = ncol;
430		368
431	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	369	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432		370
433	for (p = 0; p < ncol; p++)	371	for (int col = ncol; col--; )
434	tabs[p] = (p % TABSIZE == 0) ? 1 : 0;	372	tabs [col] = col % TABSIZE == 0;
435		373
436	tt_winch ();	374	tt_winch ();
437	}	375	}
438		376
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	/* ------------------------------------------------------------------------- */	377	/* ------------------------------------------------------------------------- */
452	/*	378	/*
453	* Free everything. That way malloc debugging can find leakage.	379	* Free everything. That way malloc debugging can find leakage.
454	*/	380	*/
455	void	381	void
456	rxvt_term::scr_release ()	382	rxvt_term::scr_release ()
457	{	383	{
458	unsigned int total_rows;
459
460	total_rows = nrow + saveLines;
461
462	delete talloc; talloc = 0;	384	delete talloc; talloc = 0;
463	delete ralloc; ralloc = 0;	385	delete ralloc; ralloc = 0;
464		386
465	free (screen.line);	387	free (row_buf);
466	free (save);
467	free (swap_save);	388	free (swap_buf);
468	free (drawn);	389	free (drawn_buf);
469	free (buf);	390	free (temp_buf);
470	free (tabs);	391	free (tabs);
		392
		393	row_buf = 0; // signal that we freed all the arrays
471	}	394	}
472		395
473	/* ------------------------------------------------------------------------- */	396	/* ------------------------------------------------------------------------- */
474	/*	397	/*
475	* Hard reset	398	* Hard reset
…		…
526	set_font_style ();	449	set_font_style ();
527	break;	450	break;
528	}	451	}
529		452
530	/* boundary check in case screen size changed between SAVE and RESTORE */	453	/* boundary check in case screen size changed between SAVE and RESTORE */
531	MIN_IT (s->cur.row, nrow - 1);	454	min_it (s->cur.row, nrow - 1);
532	MIN_IT (s->cur.col, ncol - 1);	455	min_it (s->cur.col, ncol - 1);
533	#ifdef DEBUG_STRICT	456	#ifdef DEBUG_STRICT
534	assert (s->cur.row >= 0);	457	assert (s->cur.row >= 0);
535	assert (s->cur.col >= 0);	458	assert (s->cur.col >= 0);
536	#else /* drive with your eyes closed */
537	MAX_IT (s->cur.row, 0);
538	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 = prev_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 */
800	MIN_IT (screen.cur.col, last_col - 1);
801	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802	MAX_IT (screen.cur.row, - (int32_t)nscrolled);
803	#endif	682	#endif
804	row = screen.cur.row + saveLines;	683	row = screen.cur.row;
805		684
806	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	685	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807		686
808	line_t *line = save + row;	687	line_t *line = &ROW(row);
809		688
810	while (str < strend)	689	while (str < strend)
811	{	690	{
812	c = *str++;	691	c = *str++;
813		692
814	if (c < 0x20)	693	if (c < 0x20)
815	if (c == C0_LF)	694	if (c == C0_LF)
816	{	695	{
817	if (!line->is_longer ()) /* XXX: think about this */	696	if (!line->is_longer ()) /* XXX: think about this */
818	MAX_IT (line->l, screen.cur.col);	697	max_it (line->l, screen.cur.col);
819		698
820	screen.flags &= ~Screen_WrapNext;	699	screen.flags &= ~Screen_WrapNext;
821		700
822	if (screen.cur.row == screen.bscroll)	701	if (screen.cur.row == screen.bscroll)
823	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	702	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824	else if (screen.cur.row < (nrow - 1))	703	else if (screen.cur.row < (nrow - 1))
825	row = (++screen.cur.row) + saveLines;	704	row = ++screen.cur.row;
826		705
827	line = save + row; /* _must_ refresh */	706	line = &ROW(row); /* _must_ refresh */
828	continue;	707	continue;
829	}	708	}
830	else if (c == C0_CR)	709	else if (c == C0_CR)
831	{	710	{
832	if (!line->is_longer ()) /* XXX: think about this */	711	if (!line->is_longer ()) /* XXX: think about this */
833	MAX_IT (line->l, screen.cur.col);	712	max_it (line->l, screen.cur.col);
834		713
835	screen.flags &= ~Screen_WrapNext;	714	screen.flags &= ~Screen_WrapNext;
836	screen.cur.col = 0;	715	screen.cur.col = 0;
837	continue;	716	continue;
838	}	717	}
…		…
859	{	738	{
860	line->set_is_longer ();	739	line->set_is_longer ();
861		740
862	scr_do_wrap ();	741	scr_do_wrap ();
863		742
864	row = screen.cur.row + saveLines;	743	row = screen.cur.row;
865	line = save + row; /* _must_ refresh */	744	line = &ROW(row); /* _must_ refresh */
866	}	745	}
867		746
868	// some utf-8 decoders "decode" surrogate characters: let's fix this.	747	// some utf-8 decoders "decode" surrogate characters: let's fix this.
869	if (IN_RANGE (c, 0xd800, 0xdfff))	748	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870	c = 0xfffd;	749	c = 0xfffd;
871		750
872	// rely on wcwidth to tell us the character width, at least for non-latin1	751	// 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	752	// 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	753	// for the line drawing characters below as they might be invalid in the current
…		…
989		868
990	while (*tp == NOCHAR && tp > line->t)	869	while (*tp == NOCHAR && tp > line->t)
991	tp--, rp--;	870	tp--, rp--;
992	}	871	}
993	else if (screen.cur.row > 0	872	else if (screen.cur.row > 0
994	&& save [screen.cur.row - 1 + saveLines].is_longer ())	873	&& ROW(screen.cur.row - 1).is_longer ())
995	{	874	{
996	line_t *line = save + (screen.cur.row - 1 + saveLines);	875	line_t *line = &ROW(screen.cur.row - 1);
997		876
998	tp = line->t + last_col - 1;	877	tp = line->t + last_col - 1;
999	rp = line->r + last_col - 1;	878	rp = line->r + last_col - 1;
1000		879
1001	while (*tp == NOCHAR && tp > line->t)	880	while (*tp == NOCHAR && tp > line->t)
…		…
1014	#endif	893	#endif
1015	}	894	}
1016	}	895	}
1017		896
1018	if (!line->is_longer ()) /* XXX: think about this */	897	if (!line->is_longer ()) /* XXX: think about this */
1019	MAX_IT (line->l, screen.cur.col);	898	max_it (line->l, screen.cur.col);
1020		899
1021	#ifdef DEBUG_STRICT	900	#ifdef DEBUG_STRICT
1022	assert (screen.cur.row >= 0);	901	assert (screen.cur.row >= 0);
1023	#else /* drive with your eyes closed */
1024	MAX_IT (screen.cur.row, 0);
1025	#endif	902	#endif
1026	}	903	}
1027		904
1028	/* ------------------------------------------------------------------------- */	905	/* ------------------------------------------------------------------------- */
1029	/*	906	/*
…		…
1068		945
1069	if (count == 0)	946	if (count == 0)
1070	return;	947	return;
1071	else if (count > 0)	948	else if (count > 0)
1072	{	949	{
1073	int row = saveLines + screen.cur.row;	950	int row = screen.cur.row;
1074		951
1075	line_t &l = save[row];	952	line_t &l = ROW(row);
1076	rend_t base_rend = l.r[i];	953	rend_t base_rend = l.r[i];
1077	ht &= l.t[i] == ' ';	954	ht &= l.t[i] == ' ';
1078		955
1079	for (; ++i < ncol; )	956	for (; ++i < ncol; )
1080	if (tabs[i])	957	if (tabs[i])
…		…
1095	if (ht && options & Opt_pastableTabs)	972	if (ht && options & Opt_pastableTabs)
1096	{	973	{
1097	base_rend = SET_FONT (base_rend, 0);	974	base_rend = SET_FONT (base_rend, 0);
1098		975
1099	if (!l.is_longer ()) /* XXX: think about this */	976	if (!l.is_longer ()) /* XXX: think about this */
1100	MAX_IT (l.l, x);	977	max_it (l.l, x);
1101		978
1102	i = screen.cur.col;	979	i = screen.cur.col;
1103		980
1104	l.t[i] = '\t';	981	l.t[i] = '\t';
1105	l.r[i] = base_rend;	982	l.r[i] = base_rend;
…		…
1141	rxvt_term::scr_backindex ()	1018	rxvt_term::scr_backindex ()
1142	{	1019	{
1143	if (screen.cur.col > 0)	1020	if (screen.cur.col > 0)
1144	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1021	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145	else	1022	else
1146	{
1147	if (!save[screen.cur.row + saveLines].l)
1148	return; /* um, yeah? */
1149
1150	scr_insdel_chars (1, INSERT);	1023	scr_insdel_chars (1, INSERT);
1151	}
1152	}	1024	}
1153	#endif	1025	#endif
1154	/* ------------------------------------------------------------------------- */	1026	/* ------------------------------------------------------------------------- */
1155	/*	1027	/*
1156	* Process DEC Forward Index	1028	* Process DEC Forward Index
…		…
1166		1038
1167	if (screen.cur.col < ncol - 1)	1039	if (screen.cur.col < ncol - 1)
1168	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1040	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169	else	1041	else
1170	{	1042	{
1171	row = screen.cur.row + saveLines;	1043	row = screen.cur.row;
1172		1044
1173	if (!save[row].l)
1174	return; /* um, yeah? */
1175
1176	if (save[row].is_longer ()) //TODO//FIXME//LEN	1045	if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1177	save[row].l = ncol;	1046	ROW(row).l = ncol;
1178		1047
1179	scr_gotorc (0, 0, R_RELATIVE);	1048	scr_gotorc (0, 0, R_RELATIVE);
1180	scr_insdel_chars (1, DELETE);	1049	scr_insdel_chars (1, DELETE);
1181	scr_gotorc (0, ncol - 1, R_RELATIVE);	1050	scr_gotorc (0, ncol - 1, R_RELATIVE);
1182	}	1051	}
…		…
1192	{	1061	{
1193	want_refresh = 1;	1062	want_refresh = 1;
1194	ZERO_SCROLLBACK ();	1063	ZERO_SCROLLBACK ();
1195		1064
1196	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1065	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1197	MAX_IT (screen.cur.col, 0);	1066	clamp_it (screen.cur.col, 0, ncol - 1);
1198	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1199		1067
1200	screen.flags &= ~Screen_WrapNext;	1068	screen.flags &= ~Screen_WrapNext;
1201		1069
1202	if (relative & R_RELATIVE)	1070	if (relative & R_RELATIVE)
1203	{	1071	{
…		…
1221	else	1089	else
1222	{	1090	{
1223	if (screen.flags & Screen_Relative)	1091	if (screen.flags & Screen_Relative)
1224	{ /* relative origin mode */	1092	{ /* relative origin mode */
1225	screen.cur.row = row + screen.tscroll;	1093	screen.cur.row = row + screen.tscroll;
1226	MIN_IT (screen.cur.row, screen.bscroll);	1094	min_it (screen.cur.row, screen.bscroll);
1227	}	1095	}
1228	else	1096	else
1229	screen.cur.row = row;	1097	screen.cur.row = row;
1230	}	1098	}
1231		1099
1232	MAX_IT (screen.cur.row, 0);	1100	clamp_it (screen.cur.row, 0, nrow - 1);
1233	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1234	}	1101	}
1235		1102
1236	/* ------------------------------------------------------------------------- */	1103	/* ------------------------------------------------------------------------- */
1237	/*	1104	/*
1238	* direction should be UP or DN	1105	* direction should be UP or DN
…		…
1249		1116
1250	screen.flags &= ~Screen_WrapNext;	1117	screen.flags &= ~Screen_WrapNext;
1251		1118
1252	if ((screen.cur.row == screen.bscroll && direction == UP)	1119	if ((screen.cur.row == screen.bscroll && direction == UP)
1253	|| (screen.cur.row == screen.tscroll && direction == DN))	1120	|| (screen.cur.row == screen.tscroll && direction == DN))
1254	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1121	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1255	else	1122	else
1256	screen.cur.row += dirn;	1123	screen.cur.row += dirn;
1257		1124
1258	MAX_IT (screen.cur.row, 0);	1125	clamp_it (screen.cur.row, 0, nrow - 1);
1259	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1260	selection_check (0);	1126	selection_check (0);
1261	}	1127	}
1262		1128
1263	/* ------------------------------------------------------------------------- */	1129	/* ------------------------------------------------------------------------- */
1264	/*	1130	/*
…		…
1275	want_refresh = 1;	1141	want_refresh = 1;
1276	ZERO_SCROLLBACK ();	1142	ZERO_SCROLLBACK ();
1277		1143
1278	selection_check (1);	1144	selection_check (1);
1279		1145
1280	row = saveLines + screen.cur.row;	1146	row = screen.cur.row;
1281		1147
1282	switch (mode)	1148	switch (mode)
1283	{	1149	{
1284	case 0: /* erase to end of line */	1150	case 0: /* erase to end of line */
1285	col = screen.cur.col;	1151	col = screen.cur.col;
1286	num = ncol - col;	1152	num = ncol - col;
1287	MIN_IT (save[row].l, (int16_t)col);	1153	min_it (ROW(row).l, col);
1288	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1154	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1289	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1155	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1290	CLEAR_SELECTION ();	1156	CLEAR_SELECTION ();
1291	break;	1157	break;
1292	case 1: /* erase to beginning of line */	1158	case 1: /* erase to beginning of line */
…		…
1297	CLEAR_SELECTION ();	1163	CLEAR_SELECTION ();
1298	break;	1164	break;
1299	case 2: /* erase whole line */	1165	case 2: /* erase whole line */
1300	col = 0;	1166	col = 0;
1301	num = ncol;	1167	num = ncol;
1302	save[row].l = 0;	1168	ROW(row).l = 0;
1303	if (selection.beg.row <= screen.cur.row	1169	if (selection.beg.row <= screen.cur.row
1304	&& selection.end.row >= screen.cur.row)	1170	&& selection.end.row >= screen.cur.row)
1305	CLEAR_SELECTION ();	1171	CLEAR_SELECTION ();
1306	break;	1172	break;
1307	default:	1173	default:
1308	return;	1174	return;
1309	}	1175	}
1310		1176
1311	if (save[row].t)
1312	scr_blank_line (save[row], col, num, rstyle);	1177	scr_blank_line (ROW(row), col, num, rstyle);
1313	else
1314	scr_blank_screen_mem (save[row], rstyle);
1315	}	1178	}
1316		1179
1317	/* ------------------------------------------------------------------------- */	1180	/* ------------------------------------------------------------------------- */
1318	/*	1181	/*
1319	* Erase part of whole of the screen	1182	* Erase part of whole of the screen
…		…
1323	*/	1186	*/
1324	void	1187	void
1325	rxvt_term::scr_erase_screen (int mode)	1188	rxvt_term::scr_erase_screen (int mode)
1326	{	1189	{
1327	int num;	1190	int num;
1328	int32_t row, row_offset;	1191	int32_t row;
1329	rend_t ren;	1192	rend_t ren;
1330	XGCValues gcvalue;	1193	XGCValues gcvalue;
1331		1194
1332	want_refresh = 1;	1195	want_refresh = 1;
1333	ZERO_SCROLLBACK ();	1196	ZERO_SCROLLBACK ();
1334
1335	row_offset = (int32_t)saveLines;
1336		1197
1337	switch (mode)	1198	switch (mode)
1338	{	1199	{
1339	case 0: /* erase to end of screen */	1200	case 0: /* erase to end of screen */
1340	selection_check (1);	1201	selection_check (1);
…		…
1364	CLEAR_SELECTION ();	1225	CLEAR_SELECTION ();
1365		1226
1366	if (row >= nrow) /* Out Of Bounds */	1227	if (row >= nrow) /* Out Of Bounds */
1367	return;	1228	return;
1368		1229
1369	MIN_IT (num, (nrow - row));	1230	min_it (num, nrow - row);
1370		1231
1371	if (rstyle & (RS_RVid | RS_Uline))	1232	if (rstyle & (RS_RVid | RS_Uline))
1372	ren = (rend_t) ~RS_None;	1233	ren = (rend_t) ~RS_None;
1373	else if (GET_BASEBG (rstyle) == Color_bg)	1234	else if (GET_BASEBG (rstyle) == Color_bg)
1374	{	1235	{
…		…
1385	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1246	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1386	}	1247	}
1387		1248
1388	for (; num--; row++)	1249	for (; num--; row++)
1389	{	1250	{
1390	scr_blank_screen_mem (save[row + row_offset], rstyle);	1251	scr_blank_screen_mem (ROW (row), rstyle);
1391	save[row + row_offset].l = 0;	1252	ROW (row).l = 0;
1392	scr_blank_line (drawn[row], 0, ncol, ren);	1253	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1393	}	1254	}
1394	}	1255	}
1395		1256
1396	#if ENABLE_FRILLS	1257	#if ENABLE_FRILLS
1397	void	1258	void
1398	rxvt_term::scr_erase_savelines ()	1259	rxvt_term::scr_erase_savelines ()
1399	{	1260	{
1400	want_refresh = 1;	1261	want_refresh = 1;
1401	ZERO_SCROLLBACK ();	1262	ZERO_SCROLLBACK ();
1402		1263
1403	nscrolled = 0;	1264	nsaved = 0;
1404	}	1265	}
1405	#endif	1266	#endif
1406		1267
1407	/* ------------------------------------------------------------------------- */	1268	/* ------------------------------------------------------------------------- */
1408	/*	1269	/*
…		…
1410	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1271	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1411	*/	1272	*/
1412	void	1273	void
1413	rxvt_term::scr_E ()	1274	rxvt_term::scr_E ()
1414	{	1275	{
1415	int i, j, k;
1416	rend_t *r1, fs;	1276	rend_t fs;
1417		1277
1418	want_refresh = 1;	1278	want_refresh = 1;
1419	ZERO_SCROLLBACK ();	1279	ZERO_SCROLLBACK ();
1420		1280
1421	num_scr_allow = 0;	1281	num_scr_allow = 0;
1422	selection_check (3);	1282	selection_check (3);
1423		1283
1424	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1284	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1425	for (k = saveLines, i = nrow; i--; k++)	1285	for (int row = nrow; row--; )
1426	{	1286	{
1427	line_t &line = save[k];	1287	line_t &line = ROW(row);
1428		1288
1429	fill_text (line.t, 'E', ncol);	1289	fill_text (line.t, 'E', ncol);
		1290	rend_t *r1 = line.r;
1430		1291
1431	for (r1 = line.r, j = ncol; j--; )	1292	for (int j = ncol; j--; )
1432	*r1++ = fs;	1293	*r1++ = fs;
1433		1294
1434	line.l = ncol; /* make the `E's selectable */	1295	line.l = ncol; /* make the `E's selectable */
1435	}	1296	}
1436	}	1297	}
…		…
1460	count = end;	1321	count = end;
1461	}	1322	}
1462		1323
1463	scr_do_wrap ();	1324	scr_do_wrap ();
1464		1325
1465	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);	1326	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1466	}	1327	}
1467		1328
1468	/* ------------------------------------------------------------------------- */	1329	/* ------------------------------------------------------------------------- */
1469	/*	1330	/*
1470	* Insert/Delete <count> characters from the current position	1331	* Insert/Delete <count> characters from the current position
…		…
1482	return;	1343	return;
1483		1344
1484	scr_do_wrap ();	1345	scr_do_wrap ();
1485		1346
1486	selection_check (1);	1347	selection_check (1);
1487	MIN_IT (count, (ncol - screen.cur.col));	1348	min_it (count, ncol - screen.cur.col);
1488		1349
1489	row = screen.cur.row + saveLines;	1350	row = screen.cur.row;
1490		1351
1491	line_t *line = save + row;	1352	line_t *line = &ROW(row);
1492		1353
1493	switch (insdel)	1354	switch (insdel)
1494	{	1355	{
1495	case INSERT:	1356	case INSERT:
1496	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1357	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
…		…
1500	}	1361	}
1501		1362
1502	if (!line->is_longer ())	1363	if (!line->is_longer ())
1503	{	1364	{
1504	line->l += count;	1365	line->l += count;
1505	MIN_IT (line->l, ncol);	1366	min_it (line->l, ncol);
1506	}	1367	}
1507		1368
1508	if (selection.op && current_screen == selection.screen	1369	if (selection.op && current_screen == selection.screen
1509	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1370	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510	{	1371	{
…		…
1517	selection.mark.col += count; /* XXX: yes? */	1378	selection.mark.col += count; /* XXX: yes? */
1518	selection.end.col += count;	1379	selection.end.col += count;
1519	}	1380	}
1520	}	1381	}
1521		1382
1522	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1383	scr_blank_line (*line, screen.cur.col, count, rstyle);
1523	break;	1384	break;
1524		1385
1525	case ERASE:	1386	case ERASE:
1526	screen.cur.col += count; /* don't worry if > ncol */	1387	screen.cur.col += count; /* don't worry if > ncol */
1527	selection_check (1);	1388	selection_check (1);
1528	screen.cur.col -= count;	1389	screen.cur.col -= count;
1529	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1390	scr_blank_line (*line, screen.cur.col, count, rstyle);
1530	break;	1391	break;
1531		1392
1532	case DELETE:	1393	case DELETE:
1533	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1394	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1534		1395
…		…
1541	scr_blank_line (*line, ncol - count, count, tr);	1402	scr_blank_line (*line, ncol - count, count, tr);
1542		1403
1543	if (line->is_longer ()) /* break line continuation */	1404	if (line->is_longer ()) /* break line continuation */
1544	line->l = ncol;	1405	line->l = ncol;
1545		1406
1546	line->l -= count;	1407	line->l = max (line->l - count, 0);
1547	MAX_IT (line->l, 0);
1548		1408
1549	if (selection.op && current_screen == selection.screen	1409	if (selection.op && current_screen == selection.screen
1550	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1410	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551	{	1411	{
1552	if (selection.end.row != screen.cur.row	1412	if (selection.end.row != screen.cur.row
…		…
1572	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1432	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1573	*/	1433	*/
1574	void	1434	void
1575	rxvt_term::scr_scroll_region (int top, int bot)	1435	rxvt_term::scr_scroll_region (int top, int bot)
1576	{	1436	{
1577	MAX_IT (top, 0);	1437	max_it (top, 0);
1578	MIN_IT (bot, (int)nrow - 1);	1438	min_it (bot, nrow - 1);
1579		1439
1580	if (top > bot)	1440	if (top > bot)
1581	return;	1441	return;
1582		1442
1583	screen.tscroll = top;	1443	screen.tscroll = top;
…		…
1681	XGCValues gcvalue;	1541	XGCValues gcvalue;
1682		1542
1683	if (rvideo != mode)	1543	if (rvideo != mode)
1684	{	1544	{
1685	rvideo = mode;	1545	rvideo = mode;
1686	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1546	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687	#if XPM_BACKGROUND	1547	#if XPM_BACKGROUND
1688	if (bgPixmap.pixmap == None)	1548	if (bgPixmap.pixmap == None)
1689	#endif	1549	#endif
1690	#if TRANSPARENT	1550	#if TRANSPARENT
1691	if (! (options & Opt_transparent) || am_transparent == 0)	1551	if (! (options & Opt_transparent) || am_transparent == 0)
…		…
1787	bool found = false;	1647	bool found = false;
1788		1648
1789	for (int i = 0; i < nrow; i++)	1649	for (int i = 0; i < nrow; i++)
1790	{	1650	{
1791	int col = 0;	1651	int col = 0;
1792	rend_t *drp = drawn[i].r;	1652	rend_t *drp = drawn_buf[i].r;
1793		1653
1794	for (; col < ncol; col++, drp++)	1654	for (; col < ncol; col++, drp++)
1795	if ((*drp & mask) == value)	1655	if ((*drp & mask) == value)
1796	{	1656	{
1797	found = true;	1657	found = true;
…		…
1815	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1675	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1816	{	1676	{
1817	int i;	1677	int i;
1818	row_col_t rc[RC_COUNT];	1678	row_col_t rc[RC_COUNT];
1819		1679
1820	if (!drawn) /* sanity check */	1680	if (!drawn_buf) /* sanity check */
1821	return;	1681	return;
1822		1682
1823	#ifndef NO_SLOW_LINK_SUPPORT	1683	#ifndef NO_SLOW_LINK_SUPPORT
1824	if (refresh_type == FAST_REFRESH && !display->is_local)	1684	if (refresh_type == FAST_REFRESH && !display->is_local)
1825	{	1685	{
1826	y = 0;	1686	y = 0;
1827	eheight = height;	1687	eheight = height;
1828	}	1688	}
1829	#endif
1830
1831	#ifdef DEBUG_STRICT
1832	x = max (x, 0);
1833	x = min (x, (int)width);
1834	y = max (y, 0);
1835	y = min (y, (int)height);
1836	#endif	1689	#endif
1837		1690
1838	/* round down */	1691	/* round down */
1839	rc[PART_BEG].col = Pixel2Col (x);	1692	rc[PART_BEG].col = Pixel2Col (x);
1840	rc[PART_BEG].row = Pixel2Row (y);	1693	rc[PART_BEG].row = Pixel2Row (y);
…		…
1843	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1696	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1844		1697
1845	/* sanity checks */	1698	/* sanity checks */
1846	for (i = PART_BEG; i < RC_COUNT; i++)	1699	for (i = PART_BEG; i < RC_COUNT; i++)
1847	{	1700	{
1848	MIN_IT (rc[i].col, ncol - 1);	1701	min_it (rc[i].col, ncol - 1);
1849	MIN_IT (rc[i].row, nrow - 1);	1702	min_it (rc[i].row, nrow - 1);
1850	}	1703	}
1851		1704
1852	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1705	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1853	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1706	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1854		1707
1855	if (refresh)	1708	if (refresh)
1856	scr_refresh (SLOW_REFRESH);	1709	scr_refresh (SLOW_REFRESH);
1857	}	1710	}
1858		1711
…		…
1879		1732
1880	oldviewstart = view_start;	1733	oldviewstart = view_start;
1881		1734
1882	if (y < len)	1735	if (y < len)
1883	{	1736	{
1884	p = (nrow + nscrolled) * (len - y) / len;	1737	p = (nrow + nsaved) * (len - y) / len;
1885	p -= (long) (nrow - 1);	1738	p -= (long) (nrow - 1);
1886	p = max (p, 0);	1739	p = max (p, 0);
1887	}	1740	}
1888		1741
1889	view_start = (unsigned int)min (p, nscrolled);	1742	view_start = (unsigned int)min (p, nsaved);
1890		1743
1891	return scr_changeview (oldviewstart);	1744	return scr_changeview (oldviewstart);
1892	}	1745	}
1893		1746
1894	/* ------------------------------------------------------------------------- */	1747	/* ------------------------------------------------------------------------- */
…		…
1905	oldviewstart = view_start;	1758	oldviewstart = view_start;
1906		1759
1907	if (direction == UP)	1760	if (direction == UP)
1908	{	1761	{
1909	n = view_start + nlines;	1762	n = view_start + nlines;
1910	view_start = min (n, nscrolled);	1763	view_start = min (n, nsaved);
1911	}	1764	}
1912	else	1765	else
1913	{	1766	{
1914	n = view_start - nlines;	1767	n = view_start - nlines;
1915	view_start = max (n, 0);	1768	view_start = max (n, 0);
…		…
1959	/* ARGSUSED */	1812	/* ARGSUSED */
1960	void	1813	void
1961	rxvt_term::scr_printscreen (int fullhist)	1814	rxvt_term::scr_printscreen (int fullhist)
1962	{	1815	{
1963	#ifdef PRINTPIPE	1816	#ifdef PRINTPIPE
1964	int i, r1, nrows, row_offset;	1817	int nrows, row_start;
1965	FILE *fd;	1818	FILE *fd;
1966		1819
1967	if ((fd = popen_printer ()) == NULL)	1820	if ((fd = popen_printer ()) == NULL)
1968	return;	1821	return;
1969		1822
1970	nrows = nrow;
1971	row_offset = saveLines;
1972
1973	if (!fullhist)	1823	if (fullhist)
1974	row_offset -= view_start;	1824	{
		1825	nrows = nrow + nsaved;
		1826	row_start = -nsaved;
		1827	}
1975	else	1828	else
1976	{	1829	{
1977	nrows += nscrolled;	1830	nrows = nrow;
1978	row_offset -= nscrolled;	1831	row_start = -view_start;
1979	}	1832	}
1980		1833
1981	wctomb (0, 0);	1834	wctomb (0, 0);
1982		1835
1983	for (r1 = 0; r1 < nrows; r1++)	1836	for (int r1 = 0; r1 < nrows; r1++)
1984	{	1837	{
1985	text_t *tp = save[r1 + row_offset].t;	1838	text_t *tp = ROW(r1).t;
1986	int len = save[r1 + row_offset].l;	1839	int len = ROW(r1).l;
1987		1840
1988	for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1841	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1989	{	1842	{
1990	char mb[MB_LEN_MAX];	1843	char mb[MB_LEN_MAX];
1991	text_t t = *tp++;	1844	text_t t = *tp++;
1992	if (t == NOCHAR)	1845	if (t == NOCHAR)
1993	continue;	1846	continue;
…		…
2021	{	1874	{
2022	unsigned char must_clear, /* use draw_string not draw_image_string */	1875	unsigned char must_clear, /* use draw_string not draw_image_string */
2023	showcursor; /* show the cursor */	1876	showcursor; /* show the cursor */
2024	int16_t col, row, /* column/row we're processing */	1877	int16_t col, row, /* column/row we're processing */
2025	ocrow; /* old cursor row */	1878	ocrow; /* old cursor row */
2026	int i, /* tmp */	1879	int i; /* tmp */
2027	row_offset; /* basic offset in screen structure */
2028	#ifndef NO_CURSORCOLOR	1880	#ifndef NO_CURSORCOLOR
2029	rend_t cc1; /* store colours at cursor position (s) */	1881	rend_t cc1; /* store colours at cursor position (s) */
2030	#endif	1882	#endif
2031	rend_t *crp; // cursor rendition pointer	1883	rend_t *crp; // cursor rendition pointer
2032		1884
…		…
2038	/*	1890	/*
2039	* A: set up vars	1891	* A: set up vars
2040	*/	1892	*/
2041	must_clear = 0;	1893	must_clear = 0;
2042	refresh_count = 0;	1894	refresh_count = 0;
2043
2044	row_offset = saveLines - view_start;
2045		1895
2046	#if XPM_BACKGROUND	1896	#if XPM_BACKGROUND
2047	must_clear |= bgPixmap.pixmap != None;	1897	must_clear |= bgPixmap.pixmap != None;
2048	#endif	1898	#endif
2049	#if TRANSPARENT	1899	#if TRANSPARENT
…		…
2072		1922
2073	if (showcursor)	1923	if (showcursor)
2074	{	1924	{
2075	int col = screen.cur.col;	1925	int col = screen.cur.col;
2076		1926
2077	while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)	1927	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2078	col--;	1928	col--;
2079		1929
2080	crp = &screen.line[screen.cur.row]->r[col];	1930	crp = &ROW(screen.cur.row).r[col];
2081		1931
2082	if (showcursor && focus)	1932	if (showcursor && focus)
2083	{	1933	{
2084	if (options & Opt_cursorUnderline)	1934	if (options & Opt_cursorUnderline)
2085	*crp ^= RS_Uline;	1935	*crp ^= RS_Uline;
…		…
2119	if (screen.cur.row + view_start != ocrow	1969	if (screen.cur.row + view_start != ocrow
2120	|| screen.cur.col != oldcursor.col)	1970	|| screen.cur.col != oldcursor.col)
2121	{	1971	{
2122	if (ocrow < nrow	1972	if (ocrow < nrow
2123	&& oldcursor.col < ncol)	1973	&& oldcursor.col < ncol)
2124	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	1974	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2125		1975
2126	if (focus || !showcursor)	1976	if (focus || !showcursor)
2127	oldcursor.row = -1;	1977	oldcursor.row = -1;
2128	else	1978	else
2129	setoldcursor = 1;	1979	setoldcursor = 1;
…		…
2153	* D: CopyArea pass - very useful for slower links	2003	* D: CopyArea pass - very useful for slower links
2154	* This has been deliberately kept simple.	2004	* This has been deliberately kept simple.
2155	*/	2005	*/
2156	i = num_scr;	2006	i = num_scr;
2157	if (!display->is_local	2007	if (!display->is_local
2158	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2008	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2159	&& abs (i) < nrow && !must_clear)	2009	&& abs (num_scr) < nrow && !must_clear)
2160	{	2010	{
2161	int16_t nits;	2011	int16_t nits;
2162	int j;	2012	int j;
2163	int len, wlen;	2013	int len, wlen;
2164		2014
…		…
2167	row = i > 0 ? 0 : j - 1;	2017	row = i > 0 ? 0 : j - 1;
2168	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2018	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2169	{	2019	{
2170	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2020	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2171	{	2021	{
2172	line_t s = save[row + row_offset];	2022	line_t s = ROW(row - view_start);
2173	line_t d = drawn[row];	2023	line_t d = drawn_buf[row];
2174	line_t d2 = drawn[row + i];	2024	line_t d2 = drawn_buf[row + i];
2175		2025
2176	for (nits = 0, col = ncol; col--; )	2026	for (nits = 0, col = ncol; col--; )
2177	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2027	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2178	nits--;	2028	nits--;
2179	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])	2029	else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
…		…
2197		2047
2198	if (len != -1)	2048	if (len != -1)
2199	{	2049	{
2200	/* also comes here at end if needed because of >= above */	2050	/* also comes here at end if needed because of >= above */
2201	if (wlen < len)	2051	if (wlen < len)
2202	SWAP_IT (wlen, len, int);	2052	::swap (wlen, len);
2203		2053
2204	XCopyArea (display->display, vt, vt,	2054	XCopyArea (display->display, vt, vt,
2205	gc, 0, Row2Pixel (len + i),	2055	gc, 0, Row2Pixel (len + i),
2206	(unsigned int)TermWin_TotalWidth (),	2056	(unsigned int)TermWin_TotalWidth (),
2207	(unsigned int)Height2Pixel (wlen - len + 1),	2057	(unsigned int)Height2Pixel (wlen - len + 1),
…		…
2215	/*	2065	/*
2216	* E: main pass across every character	2066	* E: main pass across every character
2217	*/	2067	*/
2218	for (row = 0; row < nrow; row++)	2068	for (row = 0; row < nrow; row++)
2219	{	2069	{
2220	text_t *stp = save[row + row_offset].t;	2070	text_t *stp = ROW(row - view_start).t;
2221	rend_t *srp = save[row + row_offset].r;	2071	rend_t *srp = ROW(row - view_start).r;
2222	text_t *dtp = drawn[row].t;	2072	text_t *dtp = drawn_buf[row].t;
2223	rend_t *drp = drawn[row].r;	2073	rend_t *drp = drawn_buf[row].r;
2224		2074
2225	/*	2075	/*
2226	* E2: OK, now the real pass	2076	* E2: OK, now the real pass
2227	*/	2077	*/
2228	int ypixel = (int)Row2Pixel (row);	2078	int ypixel = (int)Row2Pixel (row);
…		…
2339	fore = Color_UL;	2189	fore = Color_UL;
2340	#endif	2190	#endif
2341		2191
2342	if (invert)	2192	if (invert)
2343	{	2193	{
2344	SWAP_IT (fore, back, int);	2194	::swap (fore, back);
2345		2195
2346	#ifndef NO_BOLD_UNDERLINE_REVERSE	2196	#ifndef NO_BOLD_UNDERLINE_REVERSE
2347	if (ISSET_PIXCOLOR (Color_RV))	2197	if (ISSET_PIXCOLOR (Color_RV))
2348	back = Color_RV;	2198	back = Color_RV;
2349		2199
…		…
2437	else if (oldcursor.row >= 0)	2287	else if (oldcursor.row >= 0)
2438	{	2288	{
2439	int cursorwidth = 1;	2289	int cursorwidth = 1;
2440	int col = oldcursor.col;	2290	int col = oldcursor.col;
2441		2291
2442	while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)	2292	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2443	col--;	2293	col--;
2444		2294
2445	while (col + cursorwidth < ncol	2295	while (col + cursorwidth < ncol
2446	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2296	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2447	cursorwidth++;	2297	cursorwidth++;
2448		2298
2449	#ifndef NO_CURSORCOLOR	2299	#ifndef NO_CURSORCOLOR
2450	if (ISSET_PIXCOLOR (Color_cursor))	2300	if (ISSET_PIXCOLOR (Color_cursor))
2451	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2301	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2482	}	2332	}
2483		2333
2484	void	2334	void
2485	rxvt_term::scr_remap_chars ()	2335	rxvt_term::scr_remap_chars ()
2486	{	2336	{
2487	for (int i = nrow + saveLines; i--; )	2337	for (int i = total_rows; i--; )
2488	scr_remap_chars (save[i]);	2338	scr_remap_chars (row_buf [i]);
2489		2339
2490	for (int i = nrow; i--; )	2340	for (int i = nrow; i--; )
2491	{	2341	{
2492	scr_remap_chars (drawn[i]);	2342	scr_remap_chars (drawn_buf [i]);
2493	scr_remap_chars (swap_save[i]);	2343	scr_remap_chars (swap_buf [i]);
2494	}	2344	}
2495	}	2345	}
2496		2346
2497	void	2347	void
2498	rxvt_term::scr_recolour ()	2348	rxvt_term::scr_recolour ()
…		…
2540		2390
2541	/* ------------------------------------------------------------------------- */	2391	/* ------------------------------------------------------------------------- */
2542	void	2392	void
2543	rxvt_term::scr_reverse_selection ()	2393	rxvt_term::scr_reverse_selection ()
2544	{	2394	{
		2395	if (selection.op
2545	if (selection.op && current_screen == selection.screen)	2396	&& current_screen == selection.screen
		2397	&& selection.end.row >= -view_start)
2546	{	2398	{
2547	int end_row = saveLines - view_start;	2399	int view_end = -view_start + nrow;
2548	int i = selection.beg.row + saveLines;	2400	int row, col;
2549	int col, row = selection.end.row + saveLines;
2550	rend_t *srp;
2551		2401
2552	#if ENABLE_FRILLS	2402	#if ENABLE_FRILLS
2553	if (selection.rect)	2403	if (selection.rect)
2554	{	2404	{
2555	end_row += nrow;	2405	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2556
2557	for (; i <= row && i <= end_row; i++)
2558	for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)	2406	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2559	srp[col] ^= RS_RVid;	2407	srp[col] ^= RS_RVid;
2560	}	2408	}
2561	else	2409	else
2562	#endif	2410	#endif
2563	{	2411	{
2564	if (i >= end_row)	2412	if (selection.beg.row >= -view_start)
		2413	{
2565	col = selection.beg.col;	2414	col = selection.beg.col;
		2415	row = selection.beg.row;
		2416	}
2566	else	2417	else
2567	{	2418	{
2568	col = 0;	2419	col = 0;
2569	i = end_row;	2420	row = view_start;
2570	}	2421	}
2571		2422
2572	end_row += nrow;	2423	for (; row < min (selection.end.row, view_end); row++, col = 0)
2573
2574	for (; i < row && i < end_row; i++, col = 0)
2575	for (srp = save[i].r; col < ncol; col++)	2424	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2576	srp[col] ^= RS_RVid;	2425	srp[col] ^= RS_RVid;
2577		2426
2578	if (i == row && i < end_row)	2427	if (row == selection.end.row)
2579	for (srp = save[i].r; col < selection.end.col; col++)	2428	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2580	srp[col] ^= RS_RVid;	2429	srp[col] ^= RS_RVid;
2581	}	2430	}
2582	}	2431	}
2583	}	2432	}
2584		2433
…		…
2593	{	2442	{
2594	int row, wrote;	2443	int row, wrote;
2595	unsigned int width, towrite;	2444	unsigned int width, towrite;
2596	char r1[] = "\n";	2445	char r1[] = "\n";
2597		2446
2598	for (row = saveLines - nscrolled;	2447	for (row = saveLines - nsaved;
2599	row < saveLines + nrow - 1; row++)	2448	row < saveLines + nrow - 1; row++)
2600	{	2449	{
2601	width = save[row].l >= 0 ? save[row].l	2450	width = row_buf[row].l >= 0 ? row_buf[row].l
2602	: ncol;	2451	: ncol;
2603	for (towrite = width; towrite; towrite -= wrote)	2452	for (towrite = width; towrite; towrite -= wrote)
2604	{	2453	{
2605	wrote = write (fd, & (save[row].t[width - towrite]),	2454	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2606	towrite);	2455	towrite);
2607	if (wrote < 0)	2456	if (wrote < 0)
2608	return; /* XXX: death, no report */	2457	return; /* XXX: death, no report */
2609	}	2458	}
2610	if (save[row].l >= 0)	2459	if (row_buf[row].l >= 0)
2611	if (write (fd, r1, 1) <= 0)	2460	if (write (fd, r1, 1) <= 0)
2612	return; /* XXX: death, no report */	2461	return; /* XXX: death, no report */
2613	}	2462	}
2614	}	2463	}
2615	#endif	2464	#endif
2616		2465
2617	/* ------------------------------------------------------------------------- *	2466	/* ------------------------------------------------------------------------- *
2618	* CHARACTER SELECTION *	2467	* CHARACTER SELECTION *
2619	* ------------------------------------------------------------------------- */	2468	* ------------------------------------------------------------------------- */
2620
2621	/*
2622	* -nscrolled <= (selection row) <= nrow - 1
2623	*/
2624	void	2469	void
2625	rxvt_term::selection_check (int check_more)	2470	rxvt_term::selection_check (int check_more)
2626	{	2471	{
2627	row_col_t pos;	2472	row_col_t pos;
2628		2473
2629	if (!selection.op)	2474	if (!selection.op)
2630	return;	2475	return;
2631		2476
2632	pos.row = pos.col = 0;	2477	pos.row = pos.col = 0;
2633	if ((selection.beg.row < - (int32_t)nscrolled)	2478	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2634	|| (selection.beg.row >= nrow)	2479	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2635	|| (selection.mark.row < - (int32_t)nscrolled)	2480	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2636	|| (selection.mark.row >= nrow)
2637	|| (selection.end.row < - (int32_t)nscrolled)
2638	|| (selection.end.row >= nrow)
2639	|| (check_more == 1	2481	|| (check_more == 1
2640	&& current_screen == selection.screen	2482	&& current_screen == selection.screen
2641	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2483	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2642	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2484	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2643	|| (check_more == 2	2485	|| (check_more == 2
…		…
2949	* EXT: button 1 or 3 release	2791	* EXT: button 1 or 3 release
2950	*/	2792	*/
2951	void	2793	void
2952	rxvt_term::selection_make (Time tm)	2794	rxvt_term::selection_make (Time tm)
2953	{	2795	{
2954	int i, col, end_col, row, end_row;	2796	int i;
2955	wchar_t *new_selection_text;	2797	wchar_t *new_selection_text;
2956	text_t *t;	2798	text_t *t;
2957		2799
2958	switch (selection.op)	2800	switch (selection.op)
2959	{	2801	{
…		…
2975	return; /* nothing selected, go away */	2817	return; /* nothing selected, go away */
2976		2818
2977	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2819	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2820	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2979		2821
2980	col = selection.beg.col;
2981	row = selection.beg.row + saveLines;
2982	end_row = selection.end.row + saveLines;
2983	int ofs = 0;	2822	int ofs = 0;
2984	int extra = 0;	2823	int extra = 0;
2985		2824
		2825	int col = selection.beg.col;
		2826	int row = selection.beg.row;
		2827
		2828	int end_col;
		2829
2986	for (; row <= end_row; row++, col = 0)	2830	for (; row <= selection.end.row; row++, col = 0)
2987	{	2831	{
2988	#if ENABLE_FRILLS	2832	#if ENABLE_FRILLS
2989	if (selection.rect)	2833	if (selection.rect)
2990	{	2834	{
2991	col = selection.beg.col;	2835	col = selection.beg.col;
2992	end_col = ncol + 1;	2836	end_col = ncol + 1;
2993	}	2837	}
2994	else	2838	else
2995	#endif	2839	#endif
2996	end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN	2840	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2997		2841
2998	MAX_IT (col, 0);	2842	col = max (col, 0);
2999		2843
3000	if (row == end_row || selection.rect)	2844	if (row == selection.end.row || selection.rect)
3001	MIN_IT (end_col, selection.end.col);	2845	end_col = min (end_col, selection.end.col);
3002		2846
3003	t = save[row].t + col;	2847	t = ROW(row).t + col;
3004	for (; col < end_col; col++)	2848	for (; col < end_col; col++)
3005	{	2849	{
3006	if (*t == NOCHAR)	2850	if (*t == NOCHAR)
3007	t++;	2851	t++;
3008	#if ENABLE_COMBINING	2852	#if ENABLE_COMBINING
…		…
3024	#endif	2868	#endif
3025	else	2869	else
3026	new_selection_text[ofs++] = *t++;	2870	new_selection_text[ofs++] = *t++;
3027	}	2871	}
3028		2872
3029	if (!save[row].is_longer () && row != end_row)	2873	if (!ROW(row).is_longer () && row != selection.end.row)
3030	new_selection_text[ofs++] = C0_LF;	2874	new_selection_text[ofs++] = C0_LF;
3031	}	2875	}
3032		2876
3033	if (end_col != selection.end.col)	2877	if (end_col != selection.end.col)
3034	new_selection_text[ofs++] = C0_LF;	2878	new_selection_text[ofs++] = C0_LF;
…		…
3093	*/	2937	*/
3094	void	2938	void
3095	rxvt_term::selection_start_colrow (int col, int row)	2939	rxvt_term::selection_start_colrow (int col, int row)
3096	{	2940	{
3097	want_refresh = 1;	2941	want_refresh = 1;
		2942
		2943	selection.mark.row = row - view_start;
3098	selection.mark.col = col;	2944	selection.mark.col = col;
3099	selection.mark.row = row - view_start;
3100		2945
3101	MAX_IT (selection.mark.row, - (int32_t)nscrolled);	2946	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3102	MIN_IT (selection.mark.row, (int32_t)nrow - 1);	2947	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3103	MAX_IT (selection.mark.col, 0);
3104	MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3105		2948
3106	while (selection.mark.col > 0	2949	while (selection.mark.col > 0
3107	&& save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)	2950	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3108	--selection.mark.col;	2951	--selection.mark.col;
3109		2952
3110	if (selection.op)	2953	if (selection.op)
3111	{ /* clear the old selection */	2954	{ /* clear the old selection */
3112	selection.beg.row = selection.end.row = selection.mark.row;	2955	selection.beg.row = selection.end.row = selection.mark.row;
…		…
3136	text_t *stp;	2979	text_t *stp;
3137	rend_t *srp;	2980	rend_t *srp;
3138		2981
3139	if (dirn == UP)	2982	if (dirn == UP)
3140	{	2983	{
3141	bound.row = saveLines - nscrolled - 1;	2984	bound.row = - nsaved - 1;
3142	bound.col = 0;	2985	bound.col = 0;
3143	dirnadd = -1;	2986	dirnadd = -1;
3144	}	2987	}
3145	else	2988	else
3146	{	2989	{
3147	bound.row = saveLines + nrow;	2990	bound.row = nrow;
3148	bound.col = ncol - 1;	2991	bound.col = ncol - 1;
3149	dirnadd = 1;	2992	dirnadd = 1;
3150	}	2993	}
3151		2994
3152	row = mark->row + saveLines;	2995	row = mark->row;
3153	col = mark->col;	2996	col = max (mark->col, 0);
3154	MAX_IT (col, 0);	2997
3155	/* find the edge of a word */	2998	/* find the edge of a word */
3156	stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp);	2999	stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3157	srp = save[row].r + col; w2 = DELIMIT_REND (*srp);	3000	srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3158		3001
3159	for (;;)	3002	for (;;)
3160	{	3003	{
3161	for (; col != bound.col; col += dirnadd)	3004	for (; col != bound.col; col += dirnadd)
3162	{	3005	{
…		…
3172	break;	3015	break;
3173	}	3016	}
3174		3017
3175	if ((col == bound.col) && (row != bound.row))	3018	if ((col == bound.col) && (row != bound.row))
3176	{	3019	{
3177	if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ())	3020	if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3178	{	3021	{
3179	trow = row + dirnadd;	3022	trow = row + dirnadd;
3180	tcol = dirn == UP ? ncol - 1 : 0;	3023	tcol = dirn == UP ? ncol - 1 : 0;
3181		3024
3182	if (!save[trow].t)	3025	if (!ROW(trow).t)
3183	break;	3026	break;
3184		3027
3185	stp = save[trow].t + tcol;	3028	stp = ROW(trow).t + tcol;
3186	srp = save[trow].r + tcol;	3029	srp = ROW(trow).r + tcol;
3187		3030
3188	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)	3031	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3189	break;	3032	break;
3190		3033
3191	row = trow;	3034	row = trow;
…		…
3199	Old_Word_Selection_You_Die:	3042	Old_Word_Selection_You_Die:
3200	if (dirn == DN)	3043	if (dirn == DN)
3201	col++; /* put us on one past the end */	3044	col++; /* put us on one past the end */
3202		3045
3203	/* Poke the values back in */	3046	/* Poke the values back in */
3204	ret->row = row - saveLines;	3047	ret->row = row;
3205	ret->col = col;	3048	ret->col = col;
3206	}	3049	}
3207		3050
3208	/* ------------------------------------------------------------------------- */	3051	/* ------------------------------------------------------------------------- */
3209	/*	3052	/*
…		…
3214	* flag == 2 ==> button 3 motion	3057	* flag == 2 ==> button 3 motion
3215	*/	3058	*/
3216	void	3059	void
3217	rxvt_term::selection_extend (int x, int y, int flag)	3060	rxvt_term::selection_extend (int x, int y, int flag)
3218	{	3061	{
3219	int col, row;	3062	int col = clamp (Pixel2Col (x), 0, ncol);
3220		3063	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3221	col = Pixel2Col (x);
3222	row = Pixel2Row (y);
3223	MAX_IT (row, 0);
3224	MIN_IT (row, (int)nrow - 1);
3225	MAX_IT (col, 0);
3226	MIN_IT (col, (int)ncol);
3227		3064
3228	/*	3065	/*
3229	* If we're selecting characters (single click) then we must check first	3066	* If we're selecting characters (single click) then we must check first
3230	* if we are at the same place as the original mark. If we are then	3067	* if we are at the same place as the original mark. If we are then
3231	* select nothing. Otherwise, if we're to the right of the mark, you have to	3068	* select nothing. Otherwise, if we're to the right of the mark, you have to
…		…
3296	selection.beg.col = selection.end.col = selection.mark.col;	3133	selection.beg.col = selection.end.col = selection.mark.col;
3297	selection.beg.row = selection.end.row = selection.mark.row;	3134	selection.beg.row = selection.end.row = selection.mark.row;
3298	}	3135	}
3299		3136
3300	pos.col = col;	3137	pos.col = col;
3301	pos.row = row;	3138	pos.row = row - view_start;
3302
3303	pos.row -= view_start; /* adjust for scroll */
3304		3139
3305	/*	3140	/*
3306	* This is mainly xterm style selection with a couple of differences, mainly	3141	* This is mainly xterm style selection with a couple of differences, mainly
3307	* in the way button3 drag extension works.	3142	* in the way button3 drag extension works.
3308	* We're either doing: button1 drag; button3 press; or button3 drag	3143	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3367	}	3202	}
3368	}	3203	}
3369		3204
3370	if (selection.clicks == 1)	3205	if (selection.clicks == 1)
3371	{	3206	{
3372	if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN	3207	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3373	&& !save[selection.beg.row + saveLines].is_longer ()	3208	&& !ROW(selection.beg.row).is_longer ()
3374	#if ENABLE_FRILLS	3209	#if ENABLE_FRILLS
3375	&& !selection.rect	3210	&& !selection.rect
3376	#endif	3211	#endif
3377	)	3212	)
3378	selection.beg.col = ncol;	3213	selection.beg.col = ncol;
3379		3214
3380	if (	3215	if (
3381	selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN	3216	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3382	&& !save[selection.end.row + saveLines].is_longer ()	3217	&& !ROW(selection.end.row).is_longer ()
3383	#if ENABLE_FRILLS	3218	#if ENABLE_FRILLS
3384	&& !selection.rect	3219	&& !selection.rect
3385	#endif	3220	#endif
3386	)	3221	)
3387	selection.end.col = ncol;	3222	selection.end.col = ncol;
…		…
3401	{	3236	{
3402	selection_delimit_word (UP, &selection.beg, &selection.beg);	3237	selection_delimit_word (UP, &selection.beg, &selection.beg);
3403		3238
3404	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3239	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3405	{	3240	{
3406	if (!save[end_row + saveLines].is_longer ())	3241	if (!ROW(end_row).is_longer ())
3407	{	3242	{
3408	selection.end.row = end_row;	3243	selection.end.row = end_row;
3409	selection.end.col = save[end_row + saveLines].l;	3244	selection.end.col = ROW(end_row).l;
3410	selection_remove_trailing_spaces ();	3245	selection_remove_trailing_spaces ();
3411	break;	3246	break;
3412	}	3247	}
3413	}	3248	}
3414	}	3249	}
…		…
3421	selection.beg.col = 0;	3256	selection.beg.col = 0;
3422	selection.end.col = ncol;	3257	selection.end.col = ncol;
3423		3258
3424	// select a complete logical line	3259	// select a complete logical line
3425	while (selection.beg.row > -saveLines	3260	while (selection.beg.row > -saveLines
3426	&& save[selection.beg.row - 1 + saveLines].is_longer ())	3261	&& ROW(selection.beg.row - 1).is_longer ())
3427	selection.beg.row--;	3262	selection.beg.row--;
3428		3263
3429	while (selection.end.row < nrow	3264	while (selection.end.row < nrow
3430	&& save[selection.end.row + saveLines].is_longer ())	3265	&& ROW(selection.end.row).is_longer ())
3431	selection.end.row++;	3266	selection.end.row++;
3432	}	3267	}
3433	}	3268	}
3434		3269
3435	if (button3 && buttonpress)	3270	if (button3 && buttonpress)
…		…
3446	}	3281	}
3447	}	3282	}
3448		3283
3449	#if ENABLE_FRILLS	3284	#if ENABLE_FRILLS
3450	if (selection.rect && selection.beg.col > selection.end.col)	3285	if (selection.rect && selection.beg.col > selection.end.col)
3451	SWAP_IT (selection.beg.col, selection.end.col, int);	3286	::swap (selection.beg.col, selection.end.col);
3452	#endif	3287	#endif
3453	}	3288	}
3454		3289
3455	#if ENABLE_FRILLS	3290	#if ENABLE_FRILLS
3456	void	3291	void
…		…
3460	text_t *stp;	3295	text_t *stp;
3461		3296
3462	end_col = selection.end.col;	3297	end_col = selection.end.col;
3463	end_row = selection.end.row;	3298	end_row = selection.end.row;
3464		3299
3465	for ( ; end_row >= selection.beg.row; )	3300	for (; end_row >= selection.beg.row; )
3466	{	3301	{
3467	stp = save[end_row + saveLines].t;	3302	stp = ROW(end_row).t;
3468		3303
3469	while (--end_col >= 0)	3304	while (--end_col >= 0)
3470	{	3305	{
3471	if (stp[end_col] != ' '	3306	if (stp[end_col] != ' '
3472	&& stp[end_col] != '\t'	3307	&& stp[end_col] != '\t'
3473	&& stp[end_col] != NOCHAR)	3308	&& stp[end_col] != NOCHAR)
3474	break;	3309	break;
3475	}	3310	}
3476		3311
3477	if (end_col >= 0	3312	if (end_col >= 0
3478	|| !save[end_row - 1 + saveLines].is_longer ())	3313	|| !ROW(end_row - 1).is_longer ())
3479	{	3314	{
3480	selection.end.col = end_col + 1;	3315	selection.end.col = end_col + 1;
3481	selection.end.row = end_row;	3316	selection.end.row = end_row;
3482	break;	3317	break;
3483	}	3318	}
…		…
3654	*/	3489	*/
3655	void	3490	void
3656	rxvt_term::pixel_position (int *x, int *y)	3491	rxvt_term::pixel_position (int *x, int *y)
3657	{	3492	{
3658	*x = Pixel2Col (*x);	3493	*x = Pixel2Col (*x);
3659	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3494	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660	*y = Pixel2Row (*y);	3495	*y = Pixel2Row (*y);
3661	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3496	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662	}	3497	}
3663		3498
3664	/* ------------------------------------------------------------------------- */	3499	/* ------------------------------------------------------------------------- */
3665	#ifdef USE_XIM	3500	#ifdef USE_XIM
3666	void	3501	void
…		…
3688		3523
3689	if (x < 0) x = ncol - w;	3524	if (x < 0) x = ncol - w;
3690	if (y < 0) y = nrow - h;	3525	if (y < 0) y = nrow - h;
3691		3526
3692	// make space for border	3527	// make space for border
3693	w += 2; MIN_IT (w, ncol);	3528	w += 2; min_it (w, ncol);
3694	h += 2; MIN_IT (h, nrow);	3529	h += 2; min_it (h, nrow);
3695		3530
3696	x -= 1; MAX_IT (x, 0);	3531	x -= 1; clamp_it (x, 0, ncol - w);
3697	y -= 1; MAX_IT (y, 0);	3532	y -= 1; clamp_it (y, 0, nrow - h);
3698
3699	MIN_IT (x, ncol - w);
3700	MIN_IT (y, nrow - h);
3701		3533
3702	ov_x = x; ov_y = y;	3534	ov_x = x; ov_y = y;
3703	ov_w = w; ov_h = h;	3535	ov_w = w; ov_h = h;
3704		3536
3705	ov_text = new text_t *[h];	3537	ov_text = new text_t *[h];
…		…
3791	rxvt_term::scr_swap_overlay ()	3623	rxvt_term::scr_swap_overlay ()
3792	{	3624	{
3793	if (!ov_text)	3625	if (!ov_text)
3794	return;	3626	return;
3795		3627
3796	int row_offset = ov_y + saveLines - view_start;
3797
3798	// swap screen mem with overlay	3628	// swap screen mem with overlay
3799	for (int y = ov_h; y--; )	3629	for (int y = ov_h; y--; )
3800	{	3630	{
3801	text_t *t1 = ov_text[y];	3631	text_t *t1 = ov_text[y];
3802	rend_t *r1 = ov_rend[y];	3632	rend_t *r1 = ov_rend[y];
3803		3633
3804	text_t *t2 = save[y + row_offset].t + ov_x;	3634	text_t *t2 = ROW(y - view_start).t + ov_x;
3805	rend_t *r2 = save[y + row_offset].r + ov_x;	3635	rend_t *r2 = ROW(y - view_start).r + ov_x;
3806		3636
3807	for (int x = ov_w; x--; )	3637	for (int x = ov_w; x--; )
3808	{	3638	{
3809	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3639	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3640	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
…		…
3812	}	3642	}
3813	}	3643	}
3814		3644
3815	#endif	3645	#endif
3816	/* ------------------------------------------------------------------------- */	3646	/* ------------------------------------------------------------------------- */
		3647

Diff Legend

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