[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.187 by root, Wed Dec 21 23:57:12 2005 UTC

…		…
83	#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \	83	#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	84	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	85	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	86	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87		87
88	#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89	#define ROW(n) (save [LINENO (n)])
90
91	/*	88	/*
92	* CLEAR_ROWS : clear <num> rows starting from row <row>	89	* CLEAR_ROWS : clear <num> rows starting from row <row>
93	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	90	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour	91	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95	*/	92	*/
…		…
150	}	147	}
151		148
152	/* ------------------------------------------------------------------------- *	149	/* ------------------------------------------------------------------------- *
153	* SCREEN INITIALISATION *	150	* SCREEN INITIALISATION *
154	* ------------------------------------------------------------------------- */	151	* ------------------------------------------------------------------------- */
		152
155	void	153	void
156	rxvt_term::scr_reset ()	154	rxvt_term::scr_reset ()
157	{	155	{
158	unsigned int p, q;
159	int k;
160
161	#if ENABLE_OVERLAY	156	#if ENABLE_OVERLAY
162	scr_overlay_off ();	157	scr_overlay_off ();
163	#endif	158	#endif
164		159
165	view_start = 0;	160	view_start = 0;
…		…
175	return;	170	return;
176		171
177	// we need at least two lines for wrapping to work correctly	172	// we need at least two lines for wrapping to work correctly
178	if (nrow + saveLines < 2)	173	if (nrow + saveLines < 2)
179	{	174	{
		175	//TODO//FIXME
180	saveLines++;	176	saveLines++;
181	prev_nrow--;	177	prev_nrow--;
182	nsaved++;	178	nsaved++;
183	}	179	}
184		180
…		…
188	total_rows = nrow + saveLines;	184	total_rows = nrow + saveLines;
189		185
190	screen.tscroll = 0;	186	screen.tscroll = 0;
191	screen.bscroll = nrow - 1;	187	screen.bscroll = nrow - 1;
192		188
193	if (!save)	189	if (!row_buf)
194	{	190	{
195	/*	191	/*
196	* 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
197	* 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
198	*/	194	*/
…		…
200	term_start = 0;	196	term_start = 0;
201		197
202	talloc = new rxvt_salloc (ncol * sizeof (text_t));	198	talloc = new rxvt_salloc (ncol * sizeof (text_t));
203	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	199	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204		200
205	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206	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));
207	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	203	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	204	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209		205
210	for (p = nrow; p--; )	206	for (int row = nrow; row--; )
211	{	207	{
212	scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);	208	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	209	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);	210	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215	}	211	}
216		212
217	memset (charsets, 'B', sizeof (charsets));	213	memset (charsets, 'B', sizeof (charsets));
218	rstyle = DEFAULT_RSTYLE;	214	rstyle = DEFAULT_RSTYLE;
219	screen.flags = Screen_DefaultFlags;	215	screen.flags = Screen_DefaultFlags;
…		…
243	{	239	{
244	/*	240	/*
245	* add or delete rows as appropriate	241	* add or delete rows as appropriate
246	*/	242	*/
247		243
248	rxvt_salloc *old_ta;	244	rxvt_salloc old_ta = talloc; talloc = new rxvt_salloc (ncol sizeof (text_t));
249	rxvt_salloc *old_ra;	245	rxvt_salloc old_ra = ralloc; ralloc = new rxvt_salloc (ncol sizeof (rend_t));
250		246
		247	#if 0
251	if (nrow < prev_nrow)	248	if (nrow < prev_nrow)
252	{	249	{
253	/* delete rows */
254	k = min (nsaved, prev_nrow - nrow);
255	// k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256	scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258	for (p = nrow; p < prev_nrow; p++)	250	for (int row = nrow; row < prev_nrow; row++)
259	{	251	{
260	lfree (ROW(p));
261	lfree (swap_save[p]);	252	lfree (swap_buf [row]);
262	lfree (drawn[p]);	253	lfree (drawn_buf[row]);
263	}	254	}
		255	}
		256	#endif
264		257
265	/* we have fewer rows so fix up cursor position */	258	drawn_buf = (line_t )rxvt_realloc (drawn_buf, nrow sizeof (line_t));
266	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));
267		261
268	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));
269	}	275
270	else if (nrow > prev_nrow)
271	{
272	/* add rows */
273	scr_reset_realloc (); /* realloc _first_ */
274
275	int ocol = ncol;
276	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278	k = min (nsaved, nrow - prev_nrow);
279
280	for (p = prev_total_rows; p < total_rows; p++)
281	save[p].clear ();
282
283	for (p = prev_total_rows; p < total_rows - k; p++)
284	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
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	nsaved -= 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	}
438
439	void
440	rxvt_term::scr_reset_realloc ()
441	{
442	swap_save = (line_t ) rxvt_realloc (swap_save , nrow sizeof (line_t));
443	drawn = (line_t ) rxvt_realloc (drawn , nrow sizeof (line_t));
444	buf = (line_t ) rxvt_realloc (buf , nrow sizeof (line_t));
445	save = (line_t ) rxvt_realloc (save , total_rows sizeof (line_t));
446	}	375	}
447		376
448	/* ------------------------------------------------------------------------- */	377	/* ------------------------------------------------------------------------- */
449	/*	378	/*
450	* Free everything. That way malloc debugging can find leakage.	379	* Free everything. That way malloc debugging can find leakage.
…		…
453	rxvt_term::scr_release ()	382	rxvt_term::scr_release ()
454	{	383	{
455	delete talloc; talloc = 0;	384	delete talloc; talloc = 0;
456	delete ralloc; ralloc = 0;	385	delete ralloc; ralloc = 0;
457		386
458	free (save);	387	free (row_buf);
459	free (swap_save);	388	free (swap_buf);
460	free (drawn);	389	free (drawn_buf);
461	free (buf);	390	free (temp_buf);
462	free (tabs);	391	free (tabs);
		392
		393	row_buf = 0; // signal that we freed all the arrays
463	}	394	}
464		395
465	/* ------------------------------------------------------------------------- */	396	/* ------------------------------------------------------------------------- */
466	/*	397	/*
467	* Hard reset	398	* Hard reset
…		…
518	set_font_style ();	449	set_font_style ();
519	break;	450	break;
520	}	451	}
521		452
522	/* boundary check in case screen size changed between SAVE and RESTORE */	453	/* boundary check in case screen size changed between SAVE and RESTORE */
523	MIN_IT (s->cur.row, nrow - 1);	454	min_it (s->cur.row, nrow - 1);
524	MIN_IT (s->cur.col, ncol - 1);	455	min_it (s->cur.col, ncol - 1);
525	#ifdef DEBUG_STRICT	456	#ifdef DEBUG_STRICT
526	assert (s->cur.row >= 0);	457	assert (s->cur.row >= 0);
527	assert (s->cur.col >= 0);	458	assert (s->cur.col >= 0);
528	#else /* drive with your eyes closed */
529	MAX_IT (s->cur.row, 0);
530	MAX_IT (s->cur.col, 0);
531	#endif	459	#endif
532	}	460	}
533		461
534	/* ------------------------------------------------------------------------- */	462	/* ------------------------------------------------------------------------- */
535	/*	463	/*
…		…
538	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	466	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539	*/	467	*/
540	int	468	int
541	rxvt_term::scr_change_screen (int scrn)	469	rxvt_term::scr_change_screen (int scrn)
542	{	470	{
543	int i;
544	#if NSCREENS
545	int offset;
546	#endif
547
548	want_refresh = 1;	471	want_refresh = 1;
549
550	view_start = 0;	472	view_start = 0;
551		473
552	if (current_screen == scrn)	474	if (current_screen == scrn)
553	return scrn;	475	return scrn;
554		476
555	selection_check (2); /* check for boundary cross */	477	selection_check (2); /* check for boundary cross */
556		478
557	i = current_screen; current_screen = scrn; scrn = i;	479	int i = current_screen; current_screen = scrn; scrn = i;
558		480
559	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	481	::swap (screen.cur.row, swap.cur.row);
560	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	482	::swap (screen.cur.col, swap.cur.col);
561	MAX_IT (screen.cur.row, 0);	483
562	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	484	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
563	MAX_IT (screen.cur.col, 0);	485	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
564	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
565		486
566	#if NSCREENS	487	#if NSCREENS
567	if (options & Opt_secondaryScreen)	488	if (options & Opt_secondaryScreen)
568	{	489	{
569	num_scr = 0;	490	num_scr = 0;
570	offset = saveLines;
571		491
572	for (i = prev_nrow; i--;)	492	for (int i = nrow; i--; )
573	SWAP_IT (ROW(i), swap_save[i], line_t);	493	::swap (ROW(i), swap_buf [i]);
574		494
575	SWAP_IT (screen.charset, swap.charset, int16_t);	495	::swap (screen.charset, swap.charset);
576	SWAP_IT (screen.flags, swap.flags, int);	496	::swap (screen.flags, swap.flags);
577	screen.flags \|= Screen_VisibleCursor;	497	screen.flags \|= Screen_VisibleCursor;
578	swap.flags \|= Screen_VisibleCursor;	498	swap.flags \|= Screen_VisibleCursor;
579	}	499	}
580	else	500	else
581	#endif	501	#endif
582	if (options & Opt_secondaryScroll)	502	if (options & Opt_secondaryScroll)
583	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);	503	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
584		504
585	return scrn;	505	return scrn;
586	}	506	}
587		507
588	// clear WrapNext indicator, solidifying position on next line	508	// clear WrapNext indicator, solidifying position on next line
…		…
595	screen.flags &= ~Screen_WrapNext;	515	screen.flags &= ~Screen_WrapNext;
596		516
597	screen.cur.col = 0;	517	screen.cur.col = 0;
598		518
599	if (screen.cur.row == screen.bscroll)	519	if (screen.cur.row == screen.bscroll)
600	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	520	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
601	else if (screen.cur.row < nrow - 1)	521	else if (screen.cur.row < nrow - 1)
602	screen.cur.row++;	522	screen.cur.row++;
603	}	523	}
604		524
605	/* ------------------------------------------------------------------------- */	525	/* ------------------------------------------------------------------------- */
…		…
636	/* ------------------------------------------------------------------------- */	556	/* ------------------------------------------------------------------------- */
637	/*	557	/*
638	* Scroll text between <row1> and <row2> inclusive, by <count> lines	558	* Scroll text between <row1> and <row2> inclusive, by <count> lines
639	* count positive ==> scroll up	559	* count positive ==> scroll up
640	* count negative ==> scroll down	560	* count negative ==> scroll down
641	* spec == 0 for normal routines
642	*/	561	*/
643	int	562	int
644	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)
645	{	564	{
646	int i, j;
647
648	if (count == 0 \|\| (row1 > row2))	565	if (count == 0 \|\| (row1 > row2))
649	return 0;	566	return 0;
650		567
651	want_refresh = 1;	568	want_refresh = 1;
		569	num_scr += count;
652		570
653	if (row1 == 0 && count > 0	571	if (count > 0
		572	&& row1 == 0
		573	&& row2 == nrow - 1
654	&& (current_screen == PRIMARY \|\| options & Opt_secondaryScroll))	574	&& (current_screen == PRIMARY \|\| options & Opt_secondaryScroll))
655	{	575	{
656	nsaved = min (nsaved + count, saveLines);	576	nsaved = min (nsaved + count, saveLines);
657	term_start = (term_start + count) % total_rows;	577	term_start = (term_start + count) % total_rows;
658		578
659	if (selection.op && current_screen == selection.screen)	579	if (selection.op && current_screen == selection.screen)
660	{	580	{
661	selection.beg.row -= count;	581	selection.beg.row -= count;
662	selection.end.row -= count;	582	selection.end.row -= count;
663	selection.mark.row -= count;	583	selection.mark.row -= count;
		584
		585	selection_check (0);
664	}	586	}
665		587
666	for (int i = count; i--; )	588	for (int i = count; i--; )
667	scr_blank_screen_mem (ROW(row2 - i), rstyle);	589	scr_blank_screen_mem (ROW(row2 - i), rstyle);
668		590
…		…
671	&& view_start != saveLines)	593	&& view_start != saveLines)
672	scr_page (UP, count);	594	scr_page (UP, count);
673	}	595	}
674	else	596	else
675	{	597	{
676	if (!spec)
677	row1 += saveLines;
678
679	row2 += saveLines;
680
681	if (selection.op && current_screen == selection.screen)	598	if (selection.op && current_screen == selection.screen)
682	{	599	{
683	i = selection.beg.row + saveLines;	600	int i = selection.beg.row;
684	j = selection.end.row + saveLines;	601	int j = selection.end.row;
685		602
686	if ((i < row1 && j > row1)	603	if ((i < row1 && j > row1)
687	\|\| (i < row2 && j > row2)	604	\|\| (i < row2 && j > row2)
688	\|\| (i - count < row1 && i >= row1)	605	\|\| (i - count < row1 && i >= row1)
689	\|\| (i - count > row2 && i <= row2)	606	\|\| (i - count > row2 && i <= row2)
…		…
697	{	614	{
698	/* move selected region too */	615	/* move selected region too */
699	selection.beg.row -= count;	616	selection.beg.row -= count;
700	selection.end.row -= count;	617	selection.end.row -= count;
701	selection.mark.row -= count;	618	selection.mark.row -= count;
		619
		620	selection_check (0);
702	}	621	}
703	}	622	}
704		623
705	selection_check (0); /* _after_ nsaved update */	624	// use a simple and robust scrolling algorithm, this
		625	// part of scr_scroll_text is not time-critical.
706		626
707	num_scr += count;
708	j = count;
709
710	if (count < 0)
711	count = -count;
712
713	i = row2 - row1 + 1;	627	int rows = row2 - row1 + 1;
714	MIN_IT (count, i);
715		628
716	if (j > 0)	629	min_it (count, rows);
717	{
718	/* scroll up */
719		630
720	/* Copy lines that will get clobbered by the rotation */	631	for (int row = 0; row < rows; row++)
721	memcpy (buf, save + row1, count * sizeof (line_t));
722
723	/* Rotate lines */
724	i = row2 - row1 - count + 1;
725	memmove (save + row1, save + row1 + count, i * sizeof (line_t));
726
727	j = row2 - count + 1, i = count;
728	}	632	{
729	else /* if (j < 0) */	633	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
		634
		635	if (!IN_RANGE_EXC (row + count, 0, rows))
		636	scr_blank_screen_mem (temp_buf [row], rstyle);
730	{	637	}
731	/* scroll down */
732		638
733	/* Copy lines that will get clobbered by the rotation */	639	for (int row = 0; row < rows; row++)
734	for (i = 0, j = row2; i < count; i++, j--)	640	ROW(row1 + row) = temp_buf [row];
735	buf[i] = save[j];
736
737	/* Rotate lines */
738	for (j = row2, i = j - count; i >= row1; i--, j--)
739	save[j] = save[i];
740
741	j = row1, i = count;
742	count = -count;
743	}
744
745	/* Resurrect lines */
746	memcpy (save + j, buf, i * sizeof (line_t));
747
748	if (!spec) /* line length may not equal ncol */
749	for (; i--; j++)
750	scr_blank_screen_mem (save[j], rstyle);
751	}	641	}
752		642
753	return count;	643	return count;
754	}	644	}
755		645
…		…
773	last_col = ncol;	663	last_col = ncol;
774		664
775	if (nlines > 0)	665	if (nlines > 0)
776	{	666	{
777	nlines += screen.cur.row - screen.bscroll;	667	nlines += screen.cur.row - screen.bscroll;
778	if ((nlines > 0)	668	if (nlines > 0
779	&& (screen.tscroll == 0)	669	&& screen.tscroll == 0
780	&& (screen.bscroll == (nrow - 1)))	670	&& screen.bscroll == (nrow - 1))
781	{	671	{
782	/* _at least_ this many lines need to be scrolled */	672	/* _at least_ this many lines need to be scrolled */
783	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);	673	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
784	screen.cur.row -= nlines;	674	screen.cur.row -= nlines;
785	}	675	}
786	}	676	}
787		677
788	#ifdef DEBUG_STRICT	678	#ifdef DEBUG_STRICT
789	assert (screen.cur.col < last_col);	679	assert (screen.cur.col < last_col);
790	assert ((screen.cur.row < nrow)	680	assert (screen.cur.row < nrow
791	&& (screen.cur.row >= - (int32_t)nsaved));	681	&& screen.cur.row >= -nsaved);
792	#else /* drive with your eyes closed */
793	MIN_IT (screen.cur.col, last_col - 1);
794	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
795	MAX_IT (screen.cur.row, - (int32_t)nsaved);
796	#endif	682	#endif
797	row = screen.cur.row;	683	row = screen.cur.row;
798		684
799	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	685	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800		686
…		…
806		692
807	if (c < 0x20)	693	if (c < 0x20)
808	if (c == C0_LF)	694	if (c == C0_LF)
809	{	695	{
810	if (!line->is_longer ()) /* XXX: think about this */	696	if (!line->is_longer ()) /* XXX: think about this */
811	MAX_IT (line->l, screen.cur.col);	697	max_it (line->l, screen.cur.col);
812		698
813	screen.flags &= ~Screen_WrapNext;	699	screen.flags &= ~Screen_WrapNext;
814		700
815	if (screen.cur.row == screen.bscroll)	701	if (screen.cur.row == screen.bscroll)
816	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	702	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
817	else if (screen.cur.row < (nrow - 1))	703	else if (screen.cur.row < (nrow - 1))
818	row = ++screen.cur.row;	704	row = ++screen.cur.row;
819		705
820	line = &ROW(row); /* _must_ refresh */	706	line = &ROW(row); /* _must_ refresh */
821	continue;	707	continue;
822	}	708	}
823	else if (c == C0_CR)	709	else if (c == C0_CR)
824	{	710	{
825	if (!line->is_longer ()) /* XXX: think about this */	711	if (!line->is_longer ()) /* XXX: think about this */
826	MAX_IT (line->l, screen.cur.col);	712	max_it (line->l, screen.cur.col);
827		713
828	screen.flags &= ~Screen_WrapNext;	714	screen.flags &= ~Screen_WrapNext;
829	screen.cur.col = 0;	715	screen.cur.col = 0;
830	continue;	716	continue;
831	}	717	}
…		…
1007	#endif	893	#endif
1008	}	894	}
1009	}	895	}
1010		896
1011	if (!line->is_longer ()) /* XXX: think about this */	897	if (!line->is_longer ()) /* XXX: think about this */
1012	MAX_IT (line->l, screen.cur.col);	898	max_it (line->l, screen.cur.col);
1013		899
1014	#ifdef DEBUG_STRICT	900	#ifdef DEBUG_STRICT
1015	assert (screen.cur.row >= 0);	901	assert (screen.cur.row >= 0);
1016	#else /* drive with your eyes closed */
1017	MAX_IT (screen.cur.row, 0);
1018	#endif	902	#endif
1019	}	903	}
1020		904
1021	/* ------------------------------------------------------------------------- */	905	/* ------------------------------------------------------------------------- */
1022	/*	906	/*
…		…
1088	if (ht && options & Opt_pastableTabs)	972	if (ht && options & Opt_pastableTabs)
1089	{	973	{
1090	base_rend = SET_FONT (base_rend, 0);	974	base_rend = SET_FONT (base_rend, 0);
1091		975
1092	if (!l.is_longer ()) /* XXX: think about this */	976	if (!l.is_longer ()) /* XXX: think about this */
1093	MAX_IT (l.l, x);	977	max_it (l.l, x);
1094		978
1095	i = screen.cur.col;	979	i = screen.cur.col;
1096		980
1097	l.t[i] = '\t';	981	l.t[i] = '\t';
1098	l.r[i] = base_rend;	982	l.r[i] = base_rend;
…		…
1177	{	1061	{
1178	want_refresh = 1;	1062	want_refresh = 1;
1179	ZERO_SCROLLBACK ();	1063	ZERO_SCROLLBACK ();
1180		1064
1181	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1065	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1182	MAX_IT (screen.cur.col, 0);	1066	clamp_it (screen.cur.col, 0, ncol - 1);
1183	MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1184		1067
1185	screen.flags &= ~Screen_WrapNext;	1068	screen.flags &= ~Screen_WrapNext;
1186		1069
1187	if (relative & R_RELATIVE)	1070	if (relative & R_RELATIVE)
1188	{	1071	{
…		…
1206	else	1089	else
1207	{	1090	{
1208	if (screen.flags & Screen_Relative)	1091	if (screen.flags & Screen_Relative)
1209	{ /* relative origin mode */	1092	{ /* relative origin mode */
1210	screen.cur.row = row + screen.tscroll;	1093	screen.cur.row = row + screen.tscroll;
1211	MIN_IT (screen.cur.row, screen.bscroll);	1094	min_it (screen.cur.row, screen.bscroll);
1212	}	1095	}
1213	else	1096	else
1214	screen.cur.row = row;	1097	screen.cur.row = row;
1215	}	1098	}
1216		1099
1217	MAX_IT (screen.cur.row, 0);	1100	clamp_it (screen.cur.row, 0, nrow - 1);
1218	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1219	}	1101	}
1220		1102
1221	/* ------------------------------------------------------------------------- */	1103	/* ------------------------------------------------------------------------- */
1222	/*	1104	/*
1223	* direction should be UP or DN	1105	* direction should be UP or DN
…		…
1234		1116
1235	screen.flags &= ~Screen_WrapNext;	1117	screen.flags &= ~Screen_WrapNext;
1236		1118
1237	if ((screen.cur.row == screen.bscroll && direction == UP)	1119	if ((screen.cur.row == screen.bscroll && direction == UP)
1238	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1120	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1239	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1121	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1240	else	1122	else
1241	screen.cur.row += dirn;	1123	screen.cur.row += dirn;
1242		1124
1243	MAX_IT (screen.cur.row, 0);	1125	clamp_it (screen.cur.row, 0, nrow - 1);
1244	MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1245	selection_check (0);	1126	selection_check (0);
1246	}	1127	}
1247		1128
1248	/* ------------------------------------------------------------------------- */	1129	/* ------------------------------------------------------------------------- */
1249	/*	1130	/*
…		…
1267	switch (mode)	1148	switch (mode)
1268	{	1149	{
1269	case 0: /* erase to end of line */	1150	case 0: /* erase to end of line */
1270	col = screen.cur.col;	1151	col = screen.cur.col;
1271	num = ncol - col;	1152	num = ncol - col;
1272	MIN_IT (ROW(row).l, (int16_t)col);	1153	min_it (ROW(row).l, col);
1273	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1154	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1274	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1155	\|\| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1275	CLEAR_SELECTION ();	1156	CLEAR_SELECTION ();
1276	break;	1157	break;
1277	case 1: /* erase to beginning of line */	1158	case 1: /* erase to beginning of line */
…		…
1305	*/	1186	*/
1306	void	1187	void
1307	rxvt_term::scr_erase_screen (int mode)	1188	rxvt_term::scr_erase_screen (int mode)
1308	{	1189	{
1309	int num;	1190	int num;
1310	int32_t row, row_offset;	1191	int32_t row;
1311	rend_t ren;	1192	rend_t ren;
1312	XGCValues gcvalue;	1193	XGCValues gcvalue;
1313		1194
1314	want_refresh = 1;	1195	want_refresh = 1;
1315	ZERO_SCROLLBACK ();	1196	ZERO_SCROLLBACK ();
1316
1317	row_offset = (int32_t)saveLines;
1318		1197
1319	switch (mode)	1198	switch (mode)
1320	{	1199	{
1321	case 0: /* erase to end of screen */	1200	case 0: /* erase to end of screen */
1322	selection_check (1);	1201	selection_check (1);
…		…
1346	CLEAR_SELECTION ();	1225	CLEAR_SELECTION ();
1347		1226
1348	if (row >= nrow) /* Out Of Bounds */	1227	if (row >= nrow) /* Out Of Bounds */
1349	return;	1228	return;
1350		1229
1351	MIN_IT (num, (nrow - row));	1230	min_it (num, nrow - row);
1352		1231
1353	if (rstyle & (RS_RVid \| RS_Uline))	1232	if (rstyle & (RS_RVid \| RS_Uline))
1354	ren = (rend_t) ~RS_None;	1233	ren = (rend_t) ~RS_None;
1355	else if (GET_BASEBG (rstyle) == Color_bg)	1234	else if (GET_BASEBG (rstyle) == Color_bg)
1356	{	1235	{
…		…
1367	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1246	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1368	}	1247	}
1369		1248
1370	for (; num--; row++)	1249	for (; num--; row++)
1371	{	1250	{
1372	scr_blank_screen_mem (save[row + row_offset], rstyle);	1251	scr_blank_screen_mem (ROW (row), rstyle);
1373	save[row + row_offset].l = 0;	1252	ROW (row).l = 0;
1374	scr_blank_line (drawn[row], 0, ncol, ren);	1253	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1375	}	1254	}
1376	}	1255	}
1377		1256
1378	#if ENABLE_FRILLS	1257	#if ENABLE_FRILLS
1379	void	1258	void
…		…
1392	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1271	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1393	*/	1272	*/
1394	void	1273	void
1395	rxvt_term::scr_E ()	1274	rxvt_term::scr_E ()
1396	{	1275	{
1397	int i, j, k;
1398	rend_t *r1, fs;	1276	rend_t fs;
1399		1277
1400	want_refresh = 1;	1278	want_refresh = 1;
1401	ZERO_SCROLLBACK ();	1279	ZERO_SCROLLBACK ();
1402		1280
1403	num_scr_allow = 0;	1281	num_scr_allow = 0;
1404	selection_check (3);	1282	selection_check (3);
1405		1283
1406	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1284	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1407	for (k = saveLines, i = nrow; i--; k++)	1285	for (int row = nrow; row--; )
1408	{	1286	{
1409	line_t &line = save[k];	1287	line_t &line = ROW(row);
1410		1288
1411	fill_text (line.t, 'E', ncol);	1289	fill_text (line.t, 'E', ncol);
		1290	rend_t *r1 = line.r;
1412		1291
1413	for (r1 = line.r, j = ncol; j--; )	1292	for (int j = ncol; j--; )
1414	*r1++ = fs;	1293	*r1++ = fs;
1415		1294
1416	line.l = ncol; /* make the `E's selectable */	1295	line.l = ncol; /* make the `E's selectable */
1417	}	1296	}
1418	}	1297	}
…		…
1442	count = end;	1321	count = end;
1443	}	1322	}
1444		1323
1445	scr_do_wrap ();	1324	scr_do_wrap ();
1446		1325
1447	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);	1326	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1448	}	1327	}
1449		1328
1450	/* ------------------------------------------------------------------------- */	1329	/* ------------------------------------------------------------------------- */
1451	/*	1330	/*
1452	* Insert/Delete <count> characters from the current position	1331	* Insert/Delete <count> characters from the current position
…		…
1464	return;	1343	return;
1465		1344
1466	scr_do_wrap ();	1345	scr_do_wrap ();
1467		1346
1468	selection_check (1);	1347	selection_check (1);
1469	MIN_IT (count, (ncol - screen.cur.col));	1348	min_it (count, ncol - screen.cur.col);
1470		1349
1471	row = screen.cur.row + saveLines;	1350	row = screen.cur.row;
1472		1351
1473	line_t *line = save + row;	1352	line_t *line = &ROW(row);
1474		1353
1475	switch (insdel)	1354	switch (insdel)
1476	{	1355	{
1477	case INSERT:	1356	case INSERT:
1478	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1357	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
…		…
1482	}	1361	}
1483		1362
1484	if (!line->is_longer ())	1363	if (!line->is_longer ())
1485	{	1364	{
1486	line->l += count;	1365	line->l += count;
1487	MIN_IT (line->l, ncol);	1366	min_it (line->l, ncol);
1488	}	1367	}
1489		1368
1490	if (selection.op && current_screen == selection.screen	1369	if (selection.op && current_screen == selection.screen
1491	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1370	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1492	{	1371	{
…		…
1499	selection.mark.col += count; /* XXX: yes? */	1378	selection.mark.col += count; /* XXX: yes? */
1500	selection.end.col += count;	1379	selection.end.col += count;
1501	}	1380	}
1502	}	1381	}
1503		1382
1504	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1383	scr_blank_line (*line, screen.cur.col, count, rstyle);
1505	break;	1384	break;
1506		1385
1507	case ERASE:	1386	case ERASE:
1508	screen.cur.col += count; /* don't worry if > ncol */	1387	screen.cur.col += count; /* don't worry if > ncol */
1509	selection_check (1);	1388	selection_check (1);
1510	screen.cur.col -= count;	1389	screen.cur.col -= count;
1511	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1390	scr_blank_line (*line, screen.cur.col, count, rstyle);
1512	break;	1391	break;
1513		1392
1514	case DELETE:	1393	case DELETE:
1515	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);	1394	tr = line->r[ncol - 1] & (RS_fgMask \| RS_bgMask \| RS_baseattrMask);
1516		1395
…		…
1523	scr_blank_line (*line, ncol - count, count, tr);	1402	scr_blank_line (*line, ncol - count, count, tr);
1524		1403
1525	if (line->is_longer ()) /* break line continuation */	1404	if (line->is_longer ()) /* break line continuation */
1526	line->l = ncol;	1405	line->l = ncol;
1527		1406
1528	line->l -= count;	1407	line->l = max (line->l - count, 0);
1529	MAX_IT (line->l, 0);
1530		1408
1531	if (selection.op && current_screen == selection.screen	1409	if (selection.op && current_screen == selection.screen
1532	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1410	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1533	{	1411	{
1534	if (selection.end.row != screen.cur.row	1412	if (selection.end.row != screen.cur.row
…		…
1554	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1432	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1555	*/	1433	*/
1556	void	1434	void
1557	rxvt_term::scr_scroll_region (int top, int bot)	1435	rxvt_term::scr_scroll_region (int top, int bot)
1558	{	1436	{
1559	MAX_IT (top, 0);	1437	max_it (top, 0);
1560	MIN_IT (bot, (int)nrow - 1);	1438	min_it (bot, nrow - 1);
1561		1439
1562	if (top > bot)	1440	if (top > bot)
1563	return;	1441	return;
1564		1442
1565	screen.tscroll = top;	1443	screen.tscroll = top;
…		…
1663	XGCValues gcvalue;	1541	XGCValues gcvalue;
1664		1542
1665	if (rvideo != mode)	1543	if (rvideo != mode)
1666	{	1544	{
1667	rvideo = mode;	1545	rvideo = mode;
1668	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1546	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1669	#if XPM_BACKGROUND	1547	#if XPM_BACKGROUND
1670	if (bgPixmap.pixmap == None)	1548	if (bgPixmap.pixmap == None)
1671	#endif	1549	#endif
1672	#if TRANSPARENT	1550	#if TRANSPARENT
1673	if (! (options & Opt_transparent) \|\| am_transparent == 0)	1551	if (! (options & Opt_transparent) \|\| am_transparent == 0)
…		…
1769	bool found = false;	1647	bool found = false;
1770		1648
1771	for (int i = 0; i < nrow; i++)	1649	for (int i = 0; i < nrow; i++)
1772	{	1650	{
1773	int col = 0;	1651	int col = 0;
1774	rend_t *drp = drawn[i].r;	1652	rend_t *drp = drawn_buf[i].r;
1775		1653
1776	for (; col < ncol; col++, drp++)	1654	for (; col < ncol; col++, drp++)
1777	if ((*drp & mask) == value)	1655	if ((*drp & mask) == value)
1778	{	1656	{
1779	found = true;	1657	found = true;
…		…
1797	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)
1798	{	1676	{
1799	int i;	1677	int i;
1800	row_col_t rc[RC_COUNT];	1678	row_col_t rc[RC_COUNT];
1801		1679
1802	if (!drawn) /* sanity check */	1680	if (!drawn_buf) /* sanity check */
1803	return;	1681	return;
1804		1682
1805	#ifndef NO_SLOW_LINK_SUPPORT	1683	#ifndef NO_SLOW_LINK_SUPPORT
1806	if (refresh_type == FAST_REFRESH && !display->is_local)	1684	if (refresh_type == FAST_REFRESH && !display->is_local)
1807	{	1685	{
1808	y = 0;	1686	y = 0;
1809	eheight = height;	1687	eheight = height;
1810	}	1688	}
1811	#endif
1812
1813	#ifdef DEBUG_STRICT
1814	x = max (x, 0);
1815	x = min (x, (int)width);
1816	y = max (y, 0);
1817	y = min (y, (int)height);
1818	#endif	1689	#endif
1819		1690
1820	/* round down */	1691	/* round down */
1821	rc[PART_BEG].col = Pixel2Col (x);	1692	rc[PART_BEG].col = Pixel2Col (x);
1822	rc[PART_BEG].row = Pixel2Row (y);	1693	rc[PART_BEG].row = Pixel2Row (y);
…		…
1825	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1696	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1826		1697
1827	/* sanity checks */	1698	/* sanity checks */
1828	for (i = PART_BEG; i < RC_COUNT; i++)	1699	for (i = PART_BEG; i < RC_COUNT; i++)
1829	{	1700	{
1830	MIN_IT (rc[i].col, ncol - 1);	1701	min_it (rc[i].col, ncol - 1);
1831	MIN_IT (rc[i].row, nrow - 1);	1702	min_it (rc[i].row, nrow - 1);
1832	}	1703	}
1833		1704
1834	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++)
1835	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);
1836		1707
1837	if (refresh)	1708	if (refresh)
1838	scr_refresh (SLOW_REFRESH);	1709	scr_refresh (SLOW_REFRESH);
1839	}	1710	}
1840		1711
…		…
1941	/* ARGSUSED */	1812	/* ARGSUSED */
1942	void	1813	void
1943	rxvt_term::scr_printscreen (int fullhist)	1814	rxvt_term::scr_printscreen (int fullhist)
1944	{	1815	{
1945	#ifdef PRINTPIPE	1816	#ifdef PRINTPIPE
1946	int i, r1, nrows, row_offset;	1817	int nrows, row_start;
1947	FILE *fd;	1818	FILE *fd;
1948		1819
1949	if ((fd = popen_printer ()) == NULL)	1820	if ((fd = popen_printer ()) == NULL)
1950	return;	1821	return;
1951		1822
1952	nrows = nrow;
1953	row_offset = saveLines;
1954
1955	if (!fullhist)	1823	if (fullhist)
1956	row_offset -= view_start;	1824	{
		1825	nrows = nrow + nsaved;
		1826	row_start = -nsaved;
		1827	}
1957	else	1828	else
1958	{	1829	{
1959	nrows += nsaved;	1830	nrows = nrow;
1960	row_offset -= nsaved;	1831	row_start = -view_start;
1961	}	1832	}
1962		1833
1963	wctomb (0, 0);	1834	wctomb (0, 0);
1964		1835
1965	for (r1 = 0; r1 < nrows; r1++)	1836	for (int r1 = 0; r1 < nrows; r1++)
1966	{	1837	{
1967	text_t *tp = save[r1 + row_offset].t;	1838	text_t *tp = ROW(r1).t;
1968	int len = save[r1 + row_offset].l;	1839	int len = ROW(r1).l;
1969		1840
1970	for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1841	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1971	{	1842	{
1972	char mb[MB_LEN_MAX];	1843	char mb[MB_LEN_MAX];
1973	text_t t = *tp++;	1844	text_t t = *tp++;
1974	if (t == NOCHAR)	1845	if (t == NOCHAR)
1975	continue;	1846	continue;
…		…
2003	{	1874	{
2004	unsigned char must_clear, /* use draw_string not draw_image_string */	1875	unsigned char must_clear, /* use draw_string not draw_image_string */
2005	showcursor; /* show the cursor */	1876	showcursor; /* show the cursor */
2006	int16_t col, row, /* column/row we're processing */	1877	int16_t col, row, /* column/row we're processing */
2007	ocrow; /* old cursor row */	1878	ocrow; /* old cursor row */
2008	int i, /* tmp */	1879	int i; /* tmp */
2009	row_offset; /* basic offset in screen structure */
2010	#ifndef NO_CURSORCOLOR	1880	#ifndef NO_CURSORCOLOR
2011	rend_t cc1; /* store colours at cursor position (s) */	1881	rend_t cc1; /* store colours at cursor position (s) */
2012	#endif	1882	#endif
2013	rend_t *crp; // cursor rendition pointer	1883	rend_t *crp; // cursor rendition pointer
2014		1884
…		…
2020	/*	1890	/*
2021	* A: set up vars	1891	* A: set up vars
2022	*/	1892	*/
2023	must_clear = 0;	1893	must_clear = 0;
2024	refresh_count = 0;	1894	refresh_count = 0;
2025
2026	row_offset = term_start - view_start;
2027		1895
2028	#if XPM_BACKGROUND	1896	#if XPM_BACKGROUND
2029	must_clear \|= bgPixmap.pixmap != None;	1897	must_clear \|= bgPixmap.pixmap != None;
2030	#endif	1898	#endif
2031	#if TRANSPARENT	1899	#if TRANSPARENT
…		…
2101	if (screen.cur.row + view_start != ocrow	1969	if (screen.cur.row + view_start != ocrow
2102	\|\| screen.cur.col != oldcursor.col)	1970	\|\| screen.cur.col != oldcursor.col)
2103	{	1971	{
2104	if (ocrow < nrow	1972	if (ocrow < nrow
2105	&& oldcursor.col < ncol)	1973	&& oldcursor.col < ncol)
2106	drawn[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);	1974	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2107		1975
2108	if (focus \|\| !showcursor)	1976	if (focus \|\| !showcursor)
2109	oldcursor.row = -1;	1977	oldcursor.row = -1;
2110	else	1978	else
2111	setoldcursor = 1;	1979	setoldcursor = 1;
…		…
2135	* D: CopyArea pass - very useful for slower links	2003	* D: CopyArea pass - very useful for slower links
2136	* This has been deliberately kept simple.	2004	* This has been deliberately kept simple.
2137	*/	2005	*/
2138	i = num_scr;	2006	i = num_scr;
2139	if (!display->is_local	2007	if (!display->is_local
2140	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2008	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2141	&& abs (i) < nrow && !must_clear)	2009	&& abs (num_scr) < nrow && !must_clear)
2142	{	2010	{
2143	int16_t nits;	2011	int16_t nits;
2144	int j;	2012	int j;
2145	int len, wlen;	2013	int len, wlen;
2146		2014
…		…
2149	row = i > 0 ? 0 : j - 1;	2017	row = i > 0 ? 0 : j - 1;
2150	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2018	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2151	{	2019	{
2152	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2020	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2153	{	2021	{
2154	line_t s = save[(row + row_offset) % nlines];	2022	line_t s = ROW(row - view_start);
2155	line_t d = drawn[row];	2023	line_t d = drawn_buf[row];
2156	line_t d2 = drawn[row + i];	2024	line_t d2 = drawn_buf[row + i];
2157		2025
2158	for (nits = 0, col = ncol; col--; )	2026	for (nits = 0, col = ncol; col--; )
2159	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])
2160	nits--;	2028	nits--;
2161	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])
…		…
2179		2047
2180	if (len != -1)	2048	if (len != -1)
2181	{	2049	{
2182	/* also comes here at end if needed because of >= above */	2050	/* also comes here at end if needed because of >= above */
2183	if (wlen < len)	2051	if (wlen < len)
2184	SWAP_IT (wlen, len, int);	2052	::swap (wlen, len);
2185		2053
2186	XCopyArea (display->display, vt, vt,	2054	XCopyArea (display->display, vt, vt,
2187	gc, 0, Row2Pixel (len + i),	2055	gc, 0, Row2Pixel (len + i),
2188	(unsigned int)TermWin_TotalWidth (),	2056	(unsigned int)TermWin_TotalWidth (),
2189	(unsigned int)Height2Pixel (wlen - len + 1),	2057	(unsigned int)Height2Pixel (wlen - len + 1),
…		…
2197	/*	2065	/*
2198	* E: main pass across every character	2066	* E: main pass across every character
2199	*/	2067	*/
2200	for (row = 0; row < nrow; row++)	2068	for (row = 0; row < nrow; row++)
2201	{	2069	{
2202	text_t *stp = save[(row + row_offset) % total_rows].t;	2070	text_t *stp = ROW(row - view_start).t;
2203	rend_t *srp = save[(row + row_offset) % total_rows].r;	2071	rend_t *srp = ROW(row - view_start).r;
2204	text_t *dtp = drawn[row].t;	2072	text_t *dtp = drawn_buf[row].t;
2205	rend_t *drp = drawn[row].r;	2073	rend_t *drp = drawn_buf[row].r;
2206		2074
2207	/*	2075	/*
2208	* E2: OK, now the real pass	2076	* E2: OK, now the real pass
2209	*/	2077	*/
2210	int ypixel = (int)Row2Pixel (row);	2078	int ypixel = (int)Row2Pixel (row);
…		…
2321	fore = Color_UL;	2189	fore = Color_UL;
2322	#endif	2190	#endif
2323		2191
2324	if (invert)	2192	if (invert)
2325	{	2193	{
2326	SWAP_IT (fore, back, int);	2194	::swap (fore, back);
2327		2195
2328	#ifndef NO_BOLD_UNDERLINE_REVERSE	2196	#ifndef NO_BOLD_UNDERLINE_REVERSE
2329	if (ISSET_PIXCOLOR (Color_RV))	2197	if (ISSET_PIXCOLOR (Color_RV))
2330	back = Color_RV;	2198	back = Color_RV;
2331		2199
…		…
2423		2291
2424	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2292	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2425	col--;	2293	col--;
2426		2294
2427	while (col + cursorwidth < ncol	2295	while (col + cursorwidth < ncol
2428	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2296	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2429	cursorwidth++;	2297	cursorwidth++;
2430		2298
2431	#ifndef NO_CURSORCOLOR	2299	#ifndef NO_CURSORCOLOR
2432	if (ISSET_PIXCOLOR (Color_cursor))	2300	if (ISSET_PIXCOLOR (Color_cursor))
2433	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2301	XSetForeground (display->display, gc, pix_colors[Color_cursor]);
…		…
2465		2333
2466	void	2334	void
2467	rxvt_term::scr_remap_chars ()	2335	rxvt_term::scr_remap_chars ()
2468	{	2336	{
2469	for (int i = total_rows; i--; )	2337	for (int i = total_rows; i--; )
2470	scr_remap_chars (save[i]);	2338	scr_remap_chars (row_buf [i]);
2471		2339
2472	for (int i = nrow; i--; )	2340	for (int i = nrow; i--; )
2473	{	2341	{
2474	scr_remap_chars (drawn[i]);	2342	scr_remap_chars (drawn_buf [i]);
2475	scr_remap_chars (swap_save[i]);	2343	scr_remap_chars (swap_buf [i]);
2476	}	2344	}
2477	}	2345	}
2478		2346
2479	void	2347	void
2480	rxvt_term::scr_recolour ()	2348	rxvt_term::scr_recolour ()
…		…
2577	char r1[] = "\n";	2445	char r1[] = "\n";
2578		2446
2579	for (row = saveLines - nsaved;	2447	for (row = saveLines - nsaved;
2580	row < saveLines + nrow - 1; row++)	2448	row < saveLines + nrow - 1; row++)
2581	{	2449	{
2582	width = save[row].l >= 0 ? save[row].l	2450	width = row_buf[row].l >= 0 ? row_buf[row].l
2583	: ncol;	2451	: ncol;
2584	for (towrite = width; towrite; towrite -= wrote)	2452	for (towrite = width; towrite; towrite -= wrote)
2585	{	2453	{
2586	wrote = write (fd, & (save[row].t[width - towrite]),	2454	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2587	towrite);	2455	towrite);
2588	if (wrote < 0)	2456	if (wrote < 0)
2589	return; /* XXX: death, no report */	2457	return; /* XXX: death, no report */
2590	}	2458	}
2591	if (save[row].l >= 0)	2459	if (row_buf[row].l >= 0)
2592	if (write (fd, r1, 1) <= 0)	2460	if (write (fd, r1, 1) <= 0)
2593	return; /* XXX: death, no report */	2461	return; /* XXX: death, no report */
2594	}	2462	}
2595	}	2463	}
2596	#endif	2464	#endif
…		…
3073	want_refresh = 1;	2941	want_refresh = 1;
3074		2942
3075	selection.mark.row = row - view_start;	2943	selection.mark.row = row - view_start;
3076	selection.mark.col = col;	2944	selection.mark.col = col;
3077		2945
3078	selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1);	2946	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3079	selection.mark.col = min (max (selection.mark.col, 0), ncol - 1);	2947	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3080		2948
3081	while (selection.mark.col > 0	2949	while (selection.mark.col > 0
3082	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	2950	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3083	--selection.mark.col;	2951	--selection.mark.col;
3084		2952
…		…
3189	* flag == 2 ==> button 3 motion	3057	* flag == 2 ==> button 3 motion
3190	*/	3058	*/
3191	void	3059	void
3192	rxvt_term::selection_extend (int x, int y, int flag)	3060	rxvt_term::selection_extend (int x, int y, int flag)
3193	{	3061	{
3194	int col = min (max (Pixel2Col (x), 0), nrow - 1);	3062	int col = clamp (Pixel2Col (x), 0, ncol);
3195	int row = min (max (Pixel2Row (y), 0), ncol);	3063	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196		3064
3197	/*	3065	/*
3198	* 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
3199	* 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
3200	* 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
…		…
3371	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++)
3372	{	3240	{
3373	if (!ROW(end_row).is_longer ())	3241	if (!ROW(end_row).is_longer ())
3374	{	3242	{
3375	selection.end.row = end_row;	3243	selection.end.row = end_row;
3376	selection.end.col = save[end_row + saveLines].l;	3244	selection.end.col = ROW(end_row).l;
3377	selection_remove_trailing_spaces ();	3245	selection_remove_trailing_spaces ();
3378	break;	3246	break;
3379	}	3247	}
3380	}	3248	}
3381	}	3249	}
…		…
3413	}	3281	}
3414	}	3282	}
3415		3283
3416	#if ENABLE_FRILLS	3284	#if ENABLE_FRILLS
3417	if (selection.rect && selection.beg.col > selection.end.col)	3285	if (selection.rect && selection.beg.col > selection.end.col)
3418	SWAP_IT (selection.beg.col, selection.end.col, int);	3286	::swap (selection.beg.col, selection.end.col);
3419	#endif	3287	#endif
3420	}	3288	}
3421		3289
3422	#if ENABLE_FRILLS	3290	#if ENABLE_FRILLS
3423	void	3291	void
…		…
3621	*/	3489	*/
3622	void	3490	void
3623	rxvt_term::pixel_position (int x, int y)	3491	rxvt_term::pixel_position (int x, int y)
3624	{	3492	{
3625	x = Pixel2Col (x);	3493	x = Pixel2Col (x);
3626	/* MAX_IT (x, 0); MIN_IT (x, (int)ncol - 1); */	3494	/* max_it (x, 0); min_it (x, (int)ncol - 1); */
3627	y = Pixel2Row (y);	3495	y = Pixel2Row (y);
3628	/* MAX_IT (y, 0); MIN_IT (y, (int)nrow - 1); */	3496	/* max_it (y, 0); min_it (y, (int)nrow - 1); */
3629	}	3497	}
3630		3498
3631	/* ------------------------------------------------------------------------- */	3499	/* ------------------------------------------------------------------------- */
3632	#ifdef USE_XIM	3500	#ifdef USE_XIM
3633	void	3501	void
…		…
3655		3523
3656	if (x < 0) x = ncol - w;	3524	if (x < 0) x = ncol - w;
3657	if (y < 0) y = nrow - h;	3525	if (y < 0) y = nrow - h;
3658		3526
3659	// make space for border	3527	// make space for border
3660	w += 2; MIN_IT (w, ncol);	3528	w += 2; min_it (w, ncol);
3661	h += 2; MIN_IT (h, nrow);	3529	h += 2; min_it (h, nrow);
3662		3530
3663	x -= 1; MAX_IT (x, 0);	3531	x -= 1; clamp_it (x, 0, ncol - w);
3664	y -= 1; MAX_IT (y, 0);	3532	y -= 1; clamp_it (y, 0, nrow - h);
3665
3666	MIN_IT (x, ncol - w);
3667	MIN_IT (y, nrow - h);
3668		3533
3669	ov_x = x; ov_y = y;	3534	ov_x = x; ov_y = y;
3670	ov_w = w; ov_h = h;	3535	ov_w = w; ov_h = h;
3671		3536
3672	ov_text = new text_t *[h];	3537	ov_text = new text_t *[h];

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs. Revision 1.187 by root, Wed Dec 21 23:57:12 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.187 by root, Wed Dec 21 23:57:12 2005 UTC