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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.185 by root, Wed Dec 21 14:25:41 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 *
…		…
170	// we need at least two lines for wrapping to work correctly	174	// we need at least two lines for wrapping to work correctly
171	if (nrow + saveLines < 2)	175	if (nrow + saveLines < 2)
172	{	176	{
173	saveLines++;	177	saveLines++;
174	prev_nrow--;	178	prev_nrow--;
175	nscrolled++;	179	nsaved++;
176	}	180	}
177		181
178	want_refresh = 1;	182	want_refresh = 1;
179		183
180	int prev_total_rows = prev_nrow + saveLines;	184	int prev_total_rows = prev_nrow + saveLines;
181	int total_rows = nrow + saveLines;	185	total_rows = nrow + saveLines;
182		186
183	screen.tscroll = 0;	187	screen.tscroll = 0;
184	screen.bscroll = nrow - 1;	188	screen.bscroll = nrow - 1;
185		189
186	if (!save)	190	if (!save)
187	{	191	{
188	/*	192	/*
189	* first time called so just malloc everything: don't rely on realloc	193	* 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	194	* Note: this is still needed so that all the scrollback lines are NULL
191	*/	195	*/
192	nscrolled = 0; /* no saved lines */	196	nsaved = 0; /* no saved lines */
193	term_start = 0;	197	term_start = 0;
194	nsaved = 0;
195		198
196	talloc = new rxvt_salloc (ncol * sizeof (text_t));	199	talloc = new rxvt_salloc (ncol * sizeof (text_t));
197	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	200	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198		201
199	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	202	save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	203	buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	204	drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
202	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));	205	swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t));
203		206
204	screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206	scr_update_term ();
207
208	for (p = nrow; p--; )	207	for (p = nrow; p--; )
209	{	208	{
210	scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE);	209	scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE);
211	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	210	scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
212	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);	211	scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
213	}	212	}
214		213
215	memset (charsets, 'B', sizeof (charsets));	214	memset (charsets, 'B', sizeof (charsets));
…		…
247	rxvt_salloc *old_ra;	246	rxvt_salloc *old_ra;
248		247
249	if (nrow < prev_nrow)	248	if (nrow < prev_nrow)
250	{	249	{
251	/* delete rows */	250	/* delete rows */
252	k = min (nscrolled, prev_nrow - nrow);	251	k = min (nsaved, 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	252	// 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);	253	scr_scroll_text (0, (int)prev_nrow - 1, k);
255		254
256	for (p = nrow; p < prev_nrow; p++)	255	for (p = nrow; p < prev_nrow; p++)
257	{	256	{
258	lfree (save[p + saveLines]);	257	lfree (ROW(p));
259	lfree (swap_save[p]);	258	lfree (swap_save[p]);
260	lfree (drawn[p]);	259	lfree (drawn[p]);
261	}	260	}
262		261
263	/* we have fewer rows so fix up cursor position */	262	/* we have fewer rows so fix up cursor position */
264	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	263	min_it (screen.cur.row, (int32_t)nrow - 1);
265		264
266	scr_reset_realloc (); /* realloc _last_ */	265	scr_reset_realloc (); /* realloc _last_ */
267	}	266	}
268	else if (nrow > prev_nrow)	267	else if (nrow > prev_nrow)
269	{	268	{
…		…
271	scr_reset_realloc (); /* realloc _first_ */	270	scr_reset_realloc (); /* realloc _first_ */
272		271
273	int ocol = ncol;	272	int ocol = ncol;
274	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this	273	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275		274
276	k = min (nscrolled, nrow - prev_nrow);	275	k = min (nsaved, nrow - prev_nrow);
277		276
278	for (p = prev_total_rows; p < total_rows; p++)	277	for (p = prev_total_rows; p < total_rows; p++)
279	save[p].clear ();	278	save[p].clear ();
280		279
281	for (p = prev_total_rows; p < total_rows - k; p++)	280	for (p = prev_total_rows; p < total_rows - k; p++)
282	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);	281	scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284	scr_update_term ();
285		282
286	for (p = prev_nrow; p < nrow; p++)	283	for (p = prev_nrow; p < nrow; p++)
287	{	284	{
288	swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);	285	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);	286	drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290	}	287	}
291		288
292	if (k > 0)	289	if (k > 0)
293	{	290	{
294	scr_scroll_text (0, (int)nrow - 1, -k, 1);	291	scr_scroll_text (0, (int)nrow - 1, -k);
295	screen.cur.row += k;	292	screen.cur.row += k;
296	screen.s_cur.row += k;	293	screen.s_cur.row += k;
297	nscrolled -= k;	294	nsaved -= k;
298	}	295	}
299		296
300	#ifdef DEBUG_STRICT	297	#ifdef DEBUG_STRICT
301	assert (screen.cur.row < nrow);	298	assert (screen.cur.row < nrow);
302	#else /* drive with your eyes closed */	299	#else /* drive with your eyes closed */
303	MIN_IT (screen.cur.row, nrow - 1);	300	min_it (screen.cur.row, nrow - 1);
304	#endif	301	#endif
305	ncol = ocol; // save b/c scr_blank_screen_mem uses this	302	ncol = ocol; // save b/c scr_blank_screen_mem uses this
306	}	303	}
307		304
308	/* resize columns */	305	/* resize columns */
…		…
318	{	315	{
319	lresize (drawn[p]);	316	lresize (drawn[p]);
320	lresize (swap_save[p]);	317	lresize (swap_save[p]);
321	}	318	}
322		319
323	MIN_IT (screen.cur.col, (int16_t)ncol - 1);	320	min_it (screen.cur.col, (int16_t)ncol - 1);
324		321
325	delete old_ta;	322	delete old_ta;
326	delete old_ra;	323	delete old_ra;
327	}	324	}
328		325
…		…
370	{	367	{
371	if (qrow >= 0)	368	if (qrow >= 0)
372	{	369	{
373	tp [qrow] = (text_t *)ta->alloc ();	370	tp [qrow] = (text_t *)ta->alloc ();
374	rp [qrow] = (rend_t *)ra->alloc ();	371	rp [qrow] = (rend_t *)ra->alloc ();
375	tl [qrow] = -1;	372	tl [qrow] = LINE_CONT1;
376		373
377	int qcol = 0;	374	int qcol = 0;
378		375
379	for (;;)	376	for (;;)
380	{	377	{
…		…
437	}	434	}
438		435
439	void	436	void
440	rxvt_term::scr_reset_realloc ()	437	rxvt_term::scr_reset_realloc ()
441	{	438	{
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));	439	swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));	440	drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
		441	buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
447	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));	442	save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448	buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449	}	443	}
450		444
451	/* ------------------------------------------------------------------------- */	445	/* ------------------------------------------------------------------------- */
452	/*	446	/*
453	* Free everything. That way malloc debugging can find leakage.	447	* Free everything. That way malloc debugging can find leakage.
454	*/	448	*/
455	void	449	void
456	rxvt_term::scr_release ()	450	rxvt_term::scr_release ()
457	{	451	{
458	unsigned int total_rows;
459
460	total_rows = nrow + saveLines;
461
462	delete talloc; talloc = 0;	452	delete talloc; talloc = 0;
463	delete ralloc; ralloc = 0;	453	delete ralloc; ralloc = 0;
464		454
465	free (screen.line);
466	free (save);	455	free (save);
467	free (swap_save);	456	free (swap_save);
468	free (drawn);	457	free (drawn);
469	free (buf);	458	free (buf);
470	free (tabs);	459	free (tabs);
…		…
526	set_font_style ();	515	set_font_style ();
527	break;	516	break;
528	}	517	}
529		518
530	/* boundary check in case screen size changed between SAVE and RESTORE */	519	/* boundary check in case screen size changed between SAVE and RESTORE */
531	MIN_IT (s->cur.row, nrow - 1);	520	min_it (s->cur.row, nrow - 1);
532	MIN_IT (s->cur.col, ncol - 1);	521	min_it (s->cur.col, ncol - 1);
533	#ifdef DEBUG_STRICT	522	#ifdef DEBUG_STRICT
534	assert (s->cur.row >= 0);	523	assert (s->cur.row >= 0);
535	assert (s->cur.col >= 0);	524	assert (s->cur.col >= 0);
536	#else /* drive with your eyes closed */	525	#else /* drive with your eyes closed */
537	MAX_IT (s->cur.row, 0);	526	max_it (s->cur.row, 0);
538	MAX_IT (s->cur.col, 0);	527	max_it (s->cur.col, 0);
539	#endif	528	#endif
540	}	529	}
541		530
542	/* ------------------------------------------------------------------------- */	531	/* ------------------------------------------------------------------------- */
543	/*	532	/*
…		…
546	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	535	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547	*/	536	*/
548	int	537	int
549	rxvt_term::scr_change_screen (int scrn)	538	rxvt_term::scr_change_screen (int scrn)
550	{	539	{
551	int i;
552	#if NSCREENS
553	int offset;
554	#endif
555
556	want_refresh = 1;	540	want_refresh = 1;
557
558	view_start = 0;	541	view_start = 0;
559		542
560	if (current_screen == scrn)	543	if (current_screen == scrn)
561	return scrn;	544	return scrn;
562		545
563	selection_check (2); /* check for boundary cross */	546	selection_check (2); /* check for boundary cross */
564		547
565	i = current_screen; current_screen = scrn; scrn = i;	548	int i = current_screen; current_screen = scrn; scrn = i;
566		549
567	SWAP_IT (screen.cur.row, swap.cur.row, int16_t);	550	::swap (screen.cur.row, swap.cur.row);
568	SWAP_IT (screen.cur.col, swap.cur.col, int16_t);	551	::swap (screen.cur.col, swap.cur.col);
569	MAX_IT (screen.cur.row, 0);	552
570	MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);	553	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571	MAX_IT (screen.cur.col, 0);	554	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572	MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573		555
574	#if NSCREENS	556	#if NSCREENS
575	if (options & Opt_secondaryScreen)	557	if (options & Opt_secondaryScreen)
576	{	558	{
577	num_scr = 0;	559	num_scr = 0;
578	offset = saveLines;
579		560
580	for (i = prev_nrow; i--;)	561	for (int i = nrow; i--; )
581	SWAP_IT (*(screen.line[i]), swap_save[i], line_t);	562	::swap (ROW(i), swap_save[i]);
582		563
583	SWAP_IT (screen.charset, swap.charset, int16_t);	564	::swap (screen.charset, swap.charset);
584	SWAP_IT (screen.flags, swap.flags, int);	565	::swap (screen.flags, swap.flags);
585	screen.flags |= Screen_VisibleCursor;	566	screen.flags |= Screen_VisibleCursor;
586	swap.flags |= Screen_VisibleCursor;	567	swap.flags |= Screen_VisibleCursor;
587	}	568	}
588	else	569	else
589	#endif	570	#endif
590	if (options & Opt_secondaryScroll)	571	if (options & Opt_secondaryScroll)
591	scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);	572	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592		573
593	return scrn;	574	return scrn;
594	}	575	}
595		576
596	// clear WrapNext indicator, solidifying position on next line	577	// clear WrapNext indicator, solidifying position on next line
…		…
603	screen.flags &= ~Screen_WrapNext;	584	screen.flags &= ~Screen_WrapNext;
604		585
605	screen.cur.col = 0;	586	screen.cur.col = 0;
606		587
607	if (screen.cur.row == screen.bscroll)	588	if (screen.cur.row == screen.bscroll)
608	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	589	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609	else if (screen.cur.row < nrow - 1)	590	else if (screen.cur.row < nrow - 1)
610	screen.cur.row++;	591	screen.cur.row++;
611	}	592	}
612		593
613	/* ------------------------------------------------------------------------- */	594	/* ------------------------------------------------------------------------- */
…		…
639	rstyle = DEFAULT_RSTYLE;	620	rstyle = DEFAULT_RSTYLE;
640	else	621	else
641	rstyle &= ~style;	622	rstyle &= ~style;
642	}	623	}
643		624
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	/* ------------------------------------------------------------------------- */	625	/* ------------------------------------------------------------------------- */
653	/*	626	/*
654	* Scroll text between <row1> and <row2> inclusive, by <count> lines	627	* Scroll text between <row1> and <row2> inclusive, by <count> lines
655	* count positive ==> scroll up	628	* count positive ==> scroll up
656	* count negative ==> scroll down	629	* count negative ==> scroll down
657	* spec == 0 for normal routines
658	*/	630	*/
659	int	631	int
660	rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec)	632	rxvt_term::scr_scroll_text (int row1, int row2, int count)
661	{	633	{
662	int i, j;
663
664	if (count == 0 || (row1 > row2))	634	if (count == 0 || (row1 > row2))
665	return 0;	635	return 0;
666		636
667	want_refresh = 1;	637	want_refresh = 1;
		638	num_scr += count;
668		639
669	if (row1 == 0 && count > 0	640	if (count > 0
		641	&& row1 == 0
		642	&& row2 == nrow - 1
670	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))	643	&& (current_screen == PRIMARY || options & Opt_secondaryScroll))
671	{	644	{
672	nscrolled += count;	645	nsaved = min (nsaved + count, saveLines);
		646	term_start = (term_start + count) % total_rows;
673		647
674	if (nscrolled > saveLines)	648	if (selection.op && current_screen == selection.screen)
675	nscrolled = saveLines;	649	{
		650	selection.beg.row -= count;
		651	selection.end.row -= count;
		652	selection.mark.row -= count;
676		653
		654	selection_check (0);
		655	}
		656
		657	for (int i = count; i--; )
		658	scr_blank_screen_mem (ROW(row2 - i), rstyle);
		659
677	if ((options & Opt_scrollWithBuffer)	660	if ((options & Opt_scrollWithBuffer)
678	&& view_start != 0	661	&& view_start != 0
679	&& view_start != saveLines)	662	&& view_start != saveLines)
680	scr_page (UP, count);	663	scr_page (UP, count);
681	}	664	}
682	else if (!spec)	665	else
683	row1 += saveLines;	666	{
684
685	row2 += saveLines;
686
687	if (selection.op && current_screen == selection.screen)	667	if (selection.op && current_screen == selection.screen)
688	{	668	{
689	i = selection.beg.row + saveLines;	669	int i = selection.beg.row;
690	j = selection.end.row + saveLines;	670	int j = selection.end.row;
691		671
692	if ((i < row1 && j > row1)	672	if ((i < row1 && j > row1)
693	|| (i < row2 && j > row2)	673	|| (i < row2 && j > row2)
694	|| (i - count < row1 && i >= row1)	674	|| (i - count < row1 && i >= row1)
695	|| (i - count > row2 && i <= row2)	675	|| (i - count > row2 && i <= row2)
696	|| (j - count < row1 && j >= row1)	676	|| (j - count < row1 && j >= row1)
697	|| (j - count > row2 && j <= row2))	677	|| (j - count > row2 && j <= row2))
698	{	678	{
699	CLEAR_ALL_SELECTION ();	679	CLEAR_ALL_SELECTION ();
700	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */	680	selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701	}	681	}
702	else if (j >= row1 && j <= row2)	682	else if (j >= row1 && j <= row2)
703	{	683	{
704	/* move selected region too */	684	/* move selected region too */
705	selection.beg.row -= count;	685	selection.beg.row -= count;
706	selection.end.row -= count;	686	selection.end.row -= count;
707	selection.mark.row -= count;	687	selection.mark.row -= count;
		688
		689	selection_check (0);
		690	}
		691	}
		692
		693	// use a simple and robust scrolling algorithm, this
		694	// part of scr_scroll_text is not time-critical.
		695
		696	int rows = row2 - row1 + 1;
		697
		698	for (int row = 0; row < rows; row++)
708	}	699	{
709	}	700	buf [row] = ROW(row1 + (row + count + rows) % rows);
710		701
711	selection_check (0); /* _after_ nscrolled update */	702	if (!IN_RANGE_EXC (row + count, 0, rows))
712
713	num_scr += count;
714	j = count;
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	{
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);	703	scr_blank_screen_mem (buf [row], rstyle);
		704	}
		705
		706	for (int row = 0; row < rows; row++)
		707	ROW(row1 + row) = buf [row];
		708	}
759		709
760	return count;	710	return count;
761	}	711	}
762		712
763	/* ------------------------------------------------------------------------- */	713	/* ------------------------------------------------------------------------- */
…		…
785	if ((nlines > 0)	735	if ((nlines > 0)
786	&& (screen.tscroll == 0)	736	&& (screen.tscroll == 0)
787	&& (screen.bscroll == (nrow - 1)))	737	&& (screen.bscroll == (nrow - 1)))
788	{	738	{
789	/* _at least_ this many lines need to be scrolled */	739	/* _at least_ this many lines need to be scrolled */
790	scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);	740	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791	screen.cur.row -= nlines;	741	screen.cur.row -= nlines;
792	}	742	}
793	}	743	}
794		744
795	#ifdef DEBUG_STRICT	745	#ifdef DEBUG_STRICT
796	assert (screen.cur.col < last_col);	746	assert (screen.cur.col < last_col);
797	assert ((screen.cur.row < nrow)	747	assert ((screen.cur.row < nrow)
798	&& (screen.cur.row >= - (int32_t)nscrolled));	748	&& (screen.cur.row >= - (int32_t)nsaved));
799	#else /* drive with your eyes closed */	749	#else /* drive with your eyes closed */
800	MIN_IT (screen.cur.col, last_col - 1);	750	min_it (screen.cur.col, last_col - 1);
801	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	751	min_it (screen.cur.row, (int32_t)nrow - 1);
802	MAX_IT (screen.cur.row, - (int32_t)nscrolled);	752	max_it (screen.cur.row, - (int32_t)nsaved);
803	#endif	753	#endif
804	row = screen.cur.row + saveLines;	754	row = screen.cur.row;
805		755
806	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	756	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807		757
808	line_t *line = save + row;	758	line_t *line = &ROW(row);
809		759
810	while (str < strend)	760	while (str < strend)
811	{	761	{
812	c = *str++;	762	c = *str++;
813		763
814	if (c < 0x20)	764	if (c < 0x20)
815	if (c == C0_LF)	765	if (c == C0_LF)
816	{	766	{
817	if (line->l != -1) /* XXX: think about this */	767	if (!line->is_longer ()) /* XXX: think about this */
818	MAX_IT (line->l, screen.cur.col);	768	max_it (line->l, screen.cur.col);
819		769
820	screen.flags &= ~Screen_WrapNext;	770	screen.flags &= ~Screen_WrapNext;
821		771
822	if (screen.cur.row == screen.bscroll)	772	if (screen.cur.row == screen.bscroll)
823	scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);	773	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824	else if (screen.cur.row < (nrow - 1))	774	else if (screen.cur.row < (nrow - 1))
825	row = (++screen.cur.row) + saveLines;	775	row = ++screen.cur.row;
826		776
827	line = save + row; /* _must_ refresh */	777	line = &ROW(row); /* _must_ refresh */
828	continue;	778	continue;
829	}	779	}
830	else if (c == C0_CR)	780	else if (c == C0_CR)
831	{	781	{
832	if (line->l != -1) /* XXX: think about this */	782	if (!line->is_longer ()) /* XXX: think about this */
833	MAX_IT (line->l, screen.cur.col);	783	max_it (line->l, screen.cur.col);
834		784
835	screen.flags &= ~Screen_WrapNext;	785	screen.flags &= ~Screen_WrapNext;
836	screen.cur.col = 0;	786	screen.cur.col = 0;
837	continue;	787	continue;
838	}	788	}
…		…
855	CLEAR_SELECTION ();	805	CLEAR_SELECTION ();
856	}	806	}
857		807
858	if (screen.flags & Screen_WrapNext)	808	if (screen.flags & Screen_WrapNext)
859	{	809	{
860	line->l = -1;	810	line->set_is_longer ();
861		811
862	scr_do_wrap ();	812	scr_do_wrap ();
863		813
864	row = screen.cur.row + saveLines;	814	row = screen.cur.row;
865	line = save + row; /* _must_ refresh */	815	line = &ROW(row); /* _must_ refresh */
866	}	816	}
867		817
868	// some utf-8 decoders "decode" surrogate characters: let's fix this.	818	// some utf-8 decoders "decode" surrogate characters: let's fix this.
869	if (IN_RANGE (c, 0xd800, 0xdfff))	819	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870	c = 0xfffd;	820	c = 0xfffd;
871		821
872	// rely on wcwidth to tell us the character width, at least for non-latin1	822	// 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	823	// 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	824	// for the line drawing characters below as they might be invalid in the current
…		…
989		939
990	while (*tp == NOCHAR && tp > line->t)	940	while (*tp == NOCHAR && tp > line->t)
991	tp--, rp--;	941	tp--, rp--;
992	}	942	}
993	else if (screen.cur.row > 0	943	else if (screen.cur.row > 0
994	&& save [screen.cur.row - 1 + saveLines].is_cont ())	944	&& ROW(screen.cur.row - 1).is_longer ())
995	{	945	{
996	line_t *line = save + (screen.cur.row - 1 + saveLines);	946	line_t *line = &ROW(screen.cur.row - 1);
997		947
998	tp = line->t + last_col - 1;	948	tp = line->t + last_col - 1;
999	rp = line->r + last_col - 1;	949	rp = line->r + last_col - 1;
1000		950
1001	while (*tp == NOCHAR && tp > line->t)	951	while (*tp == NOCHAR && tp > line->t)
…		…
1013	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	963	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014	#endif	964	#endif
1015	}	965	}
1016	}	966	}
1017		967
1018	if (line->l != -1) /* XXX: think about this */	968	if (!line->is_longer ()) /* XXX: think about this */
1019	MAX_IT (line->l, screen.cur.col);	969	max_it (line->l, screen.cur.col);
1020		970
1021	#ifdef DEBUG_STRICT	971	#ifdef DEBUG_STRICT
1022	assert (screen.cur.row >= 0);	972	assert (screen.cur.row >= 0);
1023	#else /* drive with your eyes closed */	973	#else /* drive with your eyes closed */
1024	MAX_IT (screen.cur.row, 0);	974	max_it (screen.cur.row, 0);
1025	#endif	975	#endif
1026	}	976	}
1027		977
1028	/* ------------------------------------------------------------------------- */	978	/* ------------------------------------------------------------------------- */
1029	/*	979	/*
…		…
1068		1018
1069	if (count == 0)	1019	if (count == 0)
1070	return;	1020	return;
1071	else if (count > 0)	1021	else if (count > 0)
1072	{	1022	{
1073	int row = saveLines + screen.cur.row;	1023	int row = screen.cur.row;
1074		1024
1075	line_t &l = save[row];	1025	line_t &l = ROW(row);
1076	rend_t base_rend = l.r[i];	1026	rend_t base_rend = l.r[i];
1077	ht &= l.t[i] == ' ';	1027	ht &= l.t[i] == ' ';
1078		1028
1079	for (; ++i < ncol; )	1029	for (; ++i < ncol; )
1080	if (tabs[i])	1030	if (tabs[i])
…		…
1094	// buffer so they can be selected and pasted.	1044	// buffer so they can be selected and pasted.
1095	if (ht && options & Opt_pastableTabs)	1045	if (ht && options & Opt_pastableTabs)
1096	{	1046	{
1097	base_rend = SET_FONT (base_rend, 0);	1047	base_rend = SET_FONT (base_rend, 0);
1098		1048
1099	if (l.l != -1) /* XXX: think about this */	1049	if (!l.is_longer ()) /* XXX: think about this */
1100	MAX_IT (l.l, x);	1050	max_it (l.l, x);
1101		1051
1102	i = screen.cur.col;	1052	i = screen.cur.col;
1103		1053
1104	l.t[i] = '\t';	1054	l.t[i] = '\t';
1105	l.r[i] = base_rend;	1055	l.r[i] = base_rend;
…		…
1141	rxvt_term::scr_backindex ()	1091	rxvt_term::scr_backindex ()
1142	{	1092	{
1143	if (screen.cur.col > 0)	1093	if (screen.cur.col > 0)
1144	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1094	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145	else	1095	else
1146	{
1147	if (save[screen.cur.row + saveLines].l == 0)
1148	return; /* um, yeah? */
1149
1150	scr_insdel_chars (1, INSERT);	1096	scr_insdel_chars (1, INSERT);
1151	}
1152	}	1097	}
1153	#endif	1098	#endif
1154	/* ------------------------------------------------------------------------- */	1099	/* ------------------------------------------------------------------------- */
1155	/*	1100	/*
1156	* Process DEC Forward Index	1101	* Process DEC Forward Index
…		…
1166		1111
1167	if (screen.cur.col < ncol - 1)	1112	if (screen.cur.col < ncol - 1)
1168	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1113	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169	else	1114	else
1170	{	1115	{
1171	row = screen.cur.row + saveLines;	1116	row = screen.cur.row;
1172		1117
1173	if (save[row].l == 0)	1118	if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1174	return; /* um, yeah? */
1175	else if (save[row].is_cont ())
1176	save[row].l = ncol;	1119	ROW(row).l = ncol;
1177		1120
1178	scr_gotorc (0, 0, R_RELATIVE);	1121	scr_gotorc (0, 0, R_RELATIVE);
1179	scr_insdel_chars (1, DELETE);	1122	scr_insdel_chars (1, DELETE);
1180	scr_gotorc (0, ncol - 1, R_RELATIVE);	1123	scr_gotorc (0, ncol - 1, R_RELATIVE);
1181	}	1124	}
…		…
1191	{	1134	{
1192	want_refresh = 1;	1135	want_refresh = 1;
1193	ZERO_SCROLLBACK ();	1136	ZERO_SCROLLBACK ();
1194		1137
1195	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1138	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196	MAX_IT (screen.cur.col, 0);	1139	max_it (screen.cur.col, 0);
1197	MIN_IT (screen.cur.col, (int32_t)ncol - 1);	1140	min_it (screen.cur.col, (int32_t)ncol - 1);
1198		1141
1199	screen.flags &= ~Screen_WrapNext;	1142	screen.flags &= ~Screen_WrapNext;
1200		1143
1201	if (relative & R_RELATIVE)	1144	if (relative & R_RELATIVE)
1202	{	1145	{
…		…
1220	else	1163	else
1221	{	1164	{
1222	if (screen.flags & Screen_Relative)	1165	if (screen.flags & Screen_Relative)
1223	{ /* relative origin mode */	1166	{ /* relative origin mode */
1224	screen.cur.row = row + screen.tscroll;	1167	screen.cur.row = row + screen.tscroll;
1225	MIN_IT (screen.cur.row, screen.bscroll);	1168	min_it (screen.cur.row, screen.bscroll);
1226	}	1169	}
1227	else	1170	else
1228	screen.cur.row = row;	1171	screen.cur.row = row;
1229	}	1172	}
1230		1173
1231	MAX_IT (screen.cur.row, 0);	1174	max_it (screen.cur.row, 0);
1232	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	1175	min_it (screen.cur.row, (int32_t)nrow - 1);
1233	}	1176	}
1234		1177
1235	/* ------------------------------------------------------------------------- */	1178	/* ------------------------------------------------------------------------- */
1236	/*	1179	/*
1237	* direction should be UP or DN	1180	* direction should be UP or DN
…		…
1248		1191
1249	screen.flags &= ~Screen_WrapNext;	1192	screen.flags &= ~Screen_WrapNext;
1250		1193
1251	if ((screen.cur.row == screen.bscroll && direction == UP)	1194	if ((screen.cur.row == screen.bscroll && direction == UP)
1252	|| (screen.cur.row == screen.tscroll && direction == DN))	1195	|| (screen.cur.row == screen.tscroll && direction == DN))
1253	scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);	1196	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254	else	1197	else
1255	screen.cur.row += dirn;	1198	screen.cur.row += dirn;
1256		1199
1257	MAX_IT (screen.cur.row, 0);	1200	max_it (screen.cur.row, 0);
1258	MIN_IT (screen.cur.row, (int32_t)nrow - 1);	1201	min_it (screen.cur.row, (int32_t)nrow - 1);
1259	selection_check (0);	1202	selection_check (0);
1260	}	1203	}
1261		1204
1262	/* ------------------------------------------------------------------------- */	1205	/* ------------------------------------------------------------------------- */
1263	/*	1206	/*
…		…
1274	want_refresh = 1;	1217	want_refresh = 1;
1275	ZERO_SCROLLBACK ();	1218	ZERO_SCROLLBACK ();
1276		1219
1277	selection_check (1);	1220	selection_check (1);
1278		1221
1279	row = saveLines + screen.cur.row;	1222	row = screen.cur.row;
1280		1223
1281	switch (mode)	1224	switch (mode)
1282	{	1225	{
1283	case 0: /* erase to end of line */	1226	case 0: /* erase to end of line */
1284	col = screen.cur.col;	1227	col = screen.cur.col;
1285	num = ncol - col;	1228	num = ncol - col;
1286	MIN_IT (save[row].l, (int16_t)col);	1229	min_it (ROW(row).l, (int16_t)col);
1287	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1230	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1231	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289	CLEAR_SELECTION ();	1232	CLEAR_SELECTION ();
1290	break;	1233	break;
1291	case 1: /* erase to beginning of line */	1234	case 1: /* erase to beginning of line */
…		…
1296	CLEAR_SELECTION ();	1239	CLEAR_SELECTION ();
1297	break;	1240	break;
1298	case 2: /* erase whole line */	1241	case 2: /* erase whole line */
1299	col = 0;	1242	col = 0;
1300	num = ncol;	1243	num = ncol;
1301	save[row].l = 0;	1244	ROW(row).l = 0;
1302	if (selection.beg.row <= screen.cur.row	1245	if (selection.beg.row <= screen.cur.row
1303	&& selection.end.row >= screen.cur.row)	1246	&& selection.end.row >= screen.cur.row)
1304	CLEAR_SELECTION ();	1247	CLEAR_SELECTION ();
1305	break;	1248	break;
1306	default:	1249	default:
1307	return;	1250	return;
1308	}	1251	}
1309		1252
1310	if (save[row].t)
1311	scr_blank_line (save[row], col, num, rstyle);	1253	scr_blank_line (ROW(row), col, num, rstyle);
1312	else
1313	scr_blank_screen_mem (save[row], rstyle);
1314	}	1254	}
1315		1255
1316	/* ------------------------------------------------------------------------- */	1256	/* ------------------------------------------------------------------------- */
1317	/*	1257	/*
1318	* Erase part of whole of the screen	1258	* Erase part of whole of the screen
…		…
1322	*/	1262	*/
1323	void	1263	void
1324	rxvt_term::scr_erase_screen (int mode)	1264	rxvt_term::scr_erase_screen (int mode)
1325	{	1265	{
1326	int num;	1266	int num;
1327	int32_t row, row_offset;	1267	int32_t row;
1328	rend_t ren;	1268	rend_t ren;
1329	XGCValues gcvalue;	1269	XGCValues gcvalue;
1330		1270
1331	want_refresh = 1;	1271	want_refresh = 1;
1332	ZERO_SCROLLBACK ();	1272	ZERO_SCROLLBACK ();
1333
1334	row_offset = (int32_t)saveLines;
1335		1273
1336	switch (mode)	1274	switch (mode)
1337	{	1275	{
1338	case 0: /* erase to end of screen */	1276	case 0: /* erase to end of screen */
1339	selection_check (1);	1277	selection_check (1);
…		…
1363	CLEAR_SELECTION ();	1301	CLEAR_SELECTION ();
1364		1302
1365	if (row >= nrow) /* Out Of Bounds */	1303	if (row >= nrow) /* Out Of Bounds */
1366	return;	1304	return;
1367		1305
1368	MIN_IT (num, (nrow - row));	1306	min_it (num, (nrow - row));
1369		1307
1370	if (rstyle & (RS_RVid | RS_Uline))	1308	if (rstyle & (RS_RVid | RS_Uline))
1371	ren = (rend_t) ~RS_None;	1309	ren = (rend_t) ~RS_None;
1372	else if (GET_BASEBG (rstyle) == Color_bg)	1310	else if (GET_BASEBG (rstyle) == Color_bg)
1373	{	1311	{
…		…
1384	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1322	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385	}	1323	}
1386		1324
1387	for (; num--; row++)	1325	for (; num--; row++)
1388	{	1326	{
1389	scr_blank_screen_mem (save[row + row_offset], rstyle);	1327	scr_blank_screen_mem (ROW (row), rstyle);
1390	save[row + row_offset].l = 0;	1328	ROW (row).l = 0;
1391	scr_blank_line (drawn[row], 0, ncol, ren);	1329	scr_blank_line (drawn[row], 0, ncol, ren);
1392	}	1330	}
1393	}	1331	}
1394		1332
1395	#if ENABLE_FRILLS	1333	#if ENABLE_FRILLS
…		…
1397	rxvt_term::scr_erase_savelines ()	1335	rxvt_term::scr_erase_savelines ()
1398	{	1336	{
1399	want_refresh = 1;	1337	want_refresh = 1;
1400	ZERO_SCROLLBACK ();	1338	ZERO_SCROLLBACK ();
1401		1339
1402	nscrolled = 0;	1340	nsaved = 0;
1403	}	1341	}
1404	#endif	1342	#endif
1405		1343
1406	/* ------------------------------------------------------------------------- */	1344	/* ------------------------------------------------------------------------- */
1407	/*	1345	/*
…		…
1409	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1347	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1410	*/	1348	*/
1411	void	1349	void
1412	rxvt_term::scr_E ()	1350	rxvt_term::scr_E ()
1413	{	1351	{
1414	int i, j, k;
1415	rend_t *r1, fs;	1352	rend_t fs;
1416		1353
1417	want_refresh = 1;	1354	want_refresh = 1;
1418	ZERO_SCROLLBACK ();	1355	ZERO_SCROLLBACK ();
1419		1356
1420	num_scr_allow = 0;	1357	num_scr_allow = 0;
1421	selection_check (3);	1358	selection_check (3);
1422		1359
1423	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1360	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424	for (k = saveLines, i = nrow; i--; k++)	1361	for (int row = nrow; row--; )
1425	{	1362	{
1426	save[k].l = ncol; /* make the `E's selectable */	1363	line_t &line = ROW(row);
		1364
1427	fill_text (save[k].t, 'E', ncol);	1365	fill_text (line.t, 'E', ncol);
1428	for (r1 = save[k].r, j = ncol; j--; )	1366	rend_t *r1 = line.r;
		1367
		1368	for (int j = ncol; j--; )
1429	*r1++ = fs;	1369	*r1++ = fs;
		1370
		1371	line.l = ncol; /* make the `E's selectable */
1430	}	1372	}
1431	}	1373	}
1432		1374
1433	/* ------------------------------------------------------------------------- */	1375	/* ------------------------------------------------------------------------- */
1434	/*	1376	/*
…		…
1455	count = end;	1397	count = end;
1456	}	1398	}
1457		1399
1458	scr_do_wrap ();	1400	scr_do_wrap ();
1459		1401
1460	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);	1402	scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461	}	1403	}
1462		1404
1463	/* ------------------------------------------------------------------------- */	1405	/* ------------------------------------------------------------------------- */
1464	/*	1406	/*
1465	* Insert/Delete <count> characters from the current position	1407	* Insert/Delete <count> characters from the current position
…		…
1477	return;	1419	return;
1478		1420
1479	scr_do_wrap ();	1421	scr_do_wrap ();
1480		1422
1481	selection_check (1);	1423	selection_check (1);
1482	MIN_IT (count, (ncol - screen.cur.col));	1424	min_it (count, (ncol - screen.cur.col));
1483		1425
1484	row = screen.cur.row + saveLines;	1426	row = screen.cur.row;
1485		1427
1486	line_t *line = save + row;	1428	line_t *line = &ROW(row);
1487		1429
1488	switch (insdel)	1430	switch (insdel)
1489	{	1431	{
1490	case INSERT:	1432	case INSERT:
1491	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1433	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492	{	1434	{
1493	line->t[col] = line->t[col - count];	1435	line->t[col] = line->t[col - count];
1494	line->r[col] = line->r[col - count];	1436	line->r[col] = line->r[col - count];
1495	}	1437	}
1496		1438
1497	if (line->l != -1)	1439	if (!line->is_longer ())
1498	{	1440	{
1499	line->l += count;	1441	line->l += count;
1500	MIN_IT (line->l, ncol);	1442	min_it (line->l, ncol);
1501	}	1443	}
1502		1444
1503	if (selection.op && current_screen == selection.screen	1445	if (selection.op && current_screen == selection.screen
1504	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1446	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505	{	1447	{
…		…
1512	selection.mark.col += count; /* XXX: yes? */	1454	selection.mark.col += count; /* XXX: yes? */
1513	selection.end.col += count;	1455	selection.end.col += count;
1514	}	1456	}
1515	}	1457	}
1516		1458
1517	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1459	scr_blank_line (*line, screen.cur.col, count, rstyle);
1518	break;	1460	break;
1519		1461
1520	case ERASE:	1462	case ERASE:
1521	screen.cur.col += count; /* don't worry if > ncol */	1463	screen.cur.col += count; /* don't worry if > ncol */
1522	selection_check (1);	1464	selection_check (1);
1523	screen.cur.col -= count;	1465	screen.cur.col -= count;
1524	scr_blank_line (save[row], screen.cur.col, count, rstyle);	1466	scr_blank_line (*line, screen.cur.col, count, rstyle);
1525	break;	1467	break;
1526		1468
1527	case DELETE:	1469	case DELETE:
1528	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1470	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529		1471
…		…
1533	line->r[col] = line->r[col + count];	1475	line->r[col] = line->r[col + count];
1534	}	1476	}
1535		1477
1536	scr_blank_line (*line, ncol - count, count, tr);	1478	scr_blank_line (*line, ncol - count, count, tr);
1537		1479
1538	if (line->is_cont ()) /* break line continuation */	1480	if (line->is_longer ()) /* break line continuation */
1539	line->l = ncol;	1481	line->l = ncol;
1540		1482
1541	line->l -= count;	1483	line->l = max (line->l - count, 0);
1542	MAX_IT (line->l, 0);
1543		1484
1544	if (selection.op && current_screen == selection.screen	1485	if (selection.op && current_screen == selection.screen
1545	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1486	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546	{	1487	{
1547	if (selection.end.row != screen.cur.row	1488	if (selection.end.row != screen.cur.row
…		…
1567	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1508	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568	*/	1509	*/
1569	void	1510	void
1570	rxvt_term::scr_scroll_region (int top, int bot)	1511	rxvt_term::scr_scroll_region (int top, int bot)
1571	{	1512	{
1572	MAX_IT (top, 0);	1513	max_it (top, 0);
1573	MIN_IT (bot, (int)nrow - 1);	1514	min_it (bot, (int)nrow - 1);
1574		1515
1575	if (top > bot)	1516	if (top > bot)
1576	return;	1517	return;
1577		1518
1578	screen.tscroll = top;	1519	screen.tscroll = top;
…		…
1676	XGCValues gcvalue;	1617	XGCValues gcvalue;
1677		1618
1678	if (rvideo != mode)	1619	if (rvideo != mode)
1679	{	1620	{
1680	rvideo = mode;	1621	rvideo = mode;
1681	SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);	1622	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682	#if XPM_BACKGROUND	1623	#if XPM_BACKGROUND
1683	if (bgPixmap.pixmap == None)	1624	if (bgPixmap.pixmap == None)
1684	#endif	1625	#endif
1685	#if TRANSPARENT	1626	#if TRANSPARENT
1686	if (! (options & Opt_transparent) || am_transparent == 0)	1627	if (! (options & Opt_transparent) || am_transparent == 0)
…		…
1822	eheight = height;	1763	eheight = height;
1823	}	1764	}
1824	#endif	1765	#endif
1825		1766
1826	#ifdef DEBUG_STRICT	1767	#ifdef DEBUG_STRICT
1827	x = max (x, 0);	1768	#if 0
1828	x = min (x, (int)width);	1769	// that's not debugging //TODO //FIXME
1829	y = max (y, 0);	1770	clamp_it (x, 0, width);
1830	y = min (y, (int)height);	1771	clamp_it (y, 0, height);
		1772	#endif
1831	#endif	1773	#endif
1832		1774
1833	/* round down */	1775	/* round down */
1834	rc[PART_BEG].col = Pixel2Col (x);	1776	rc[PART_BEG].col = Pixel2Col (x);
1835	rc[PART_BEG].row = Pixel2Row (y);	1777	rc[PART_BEG].row = Pixel2Row (y);
…		…
1838	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);	1780	rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839		1781
1840	/* sanity checks */	1782	/* sanity checks */
1841	for (i = PART_BEG; i < RC_COUNT; i++)	1783	for (i = PART_BEG; i < RC_COUNT; i++)
1842	{	1784	{
1843	MIN_IT (rc[i].col, ncol - 1);	1785	min_it (rc[i].col, ncol - 1);
1844	MIN_IT (rc[i].row, nrow - 1);	1786	min_it (rc[i].row, nrow - 1);
1845	}	1787	}
1846		1788
1847	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1789	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1848	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1790	fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849		1791
…		…
1874		1816
1875	oldviewstart = view_start;	1817	oldviewstart = view_start;
1876		1818
1877	if (y < len)	1819	if (y < len)
1878	{	1820	{
1879	p = (nrow + nscrolled) * (len - y) / len;	1821	p = (nrow + nsaved) * (len - y) / len;
1880	p -= (long) (nrow - 1);	1822	p -= (long) (nrow - 1);
1881	p = max (p, 0);	1823	p = max (p, 0);
1882	}	1824	}
1883		1825
1884	view_start = (unsigned int)min (p, nscrolled);	1826	view_start = (unsigned int)min (p, nsaved);
1885		1827
1886	return scr_changeview (oldviewstart);	1828	return scr_changeview (oldviewstart);
1887	}	1829	}
1888		1830
1889	/* ------------------------------------------------------------------------- */	1831	/* ------------------------------------------------------------------------- */
…		…
1900	oldviewstart = view_start;	1842	oldviewstart = view_start;
1901		1843
1902	if (direction == UP)	1844	if (direction == UP)
1903	{	1845	{
1904	n = view_start + nlines;	1846	n = view_start + nlines;
1905	view_start = min (n, nscrolled);	1847	view_start = min (n, nsaved);
1906	}	1848	}
1907	else	1849	else
1908	{	1850	{
1909	n = view_start - nlines;	1851	n = view_start - nlines;
1910	view_start = max (n, 0);	1852	view_start = max (n, 0);
…		…
1954	/* ARGSUSED */	1896	/* ARGSUSED */
1955	void	1897	void
1956	rxvt_term::scr_printscreen (int fullhist)	1898	rxvt_term::scr_printscreen (int fullhist)
1957	{	1899	{
1958	#ifdef PRINTPIPE	1900	#ifdef PRINTPIPE
1959	int i, r1, nrows, row_offset;	1901	int nrows, row_start;
1960	FILE *fd;	1902	FILE *fd;
1961		1903
1962	if ((fd = popen_printer ()) == NULL)	1904	if ((fd = popen_printer ()) == NULL)
1963	return;	1905	return;
1964		1906
1965	nrows = nrow;
1966	row_offset = saveLines;
1967
1968	if (!fullhist)	1907	if (fullhist)
1969	row_offset -= view_start;	1908	{
		1909	nrows = nrow + nsaved;
		1910	row_start = -nsaved;
		1911	}
1970	else	1912	else
1971	{	1913	{
1972	nrows += nscrolled;	1914	nrows = nrow;
1973	row_offset -= nscrolled;	1915	row_start = -view_start;
1974	}	1916	}
1975		1917
1976	wctomb (0, 0);	1918	wctomb (0, 0);
1977		1919
1978	for (r1 = 0; r1 < nrows; r1++)	1920	for (int r1 = 0; r1 < nrows; r1++)
1979	{	1921	{
1980	text_t *tp = save[r1 + row_offset].t;	1922	text_t *tp = ROW(r1).t;
1981	int len = save[r1 + row_offset].l;	1923	int len = ROW(r1).l;
1982		1924
1983	for (i = len >= 0 ? len : ncol - 1; i--; )	1925	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984	{	1926	{
1985	char mb[MB_LEN_MAX];	1927	char mb[MB_LEN_MAX];
1986	text_t t = *tp++;	1928	text_t t = *tp++;
1987	if (t == NOCHAR)	1929	if (t == NOCHAR)
1988	continue;	1930	continue;
…		…
2016	{	1958	{
2017	unsigned char must_clear, /* use draw_string not draw_image_string */	1959	unsigned char must_clear, /* use draw_string not draw_image_string */
2018	showcursor; /* show the cursor */	1960	showcursor; /* show the cursor */
2019	int16_t col, row, /* column/row we're processing */	1961	int16_t col, row, /* column/row we're processing */
2020	ocrow; /* old cursor row */	1962	ocrow; /* old cursor row */
2021	int i, /* tmp */	1963	int i; /* tmp */
2022	row_offset; /* basic offset in screen structure */
2023	#ifndef NO_CURSORCOLOR	1964	#ifndef NO_CURSORCOLOR
2024	rend_t cc1; /* store colours at cursor position (s) */	1965	rend_t cc1; /* store colours at cursor position (s) */
2025	#endif	1966	#endif
2026	rend_t *crp; // cursor rendition pointer	1967	rend_t *crp; // cursor rendition pointer
2027		1968
…		…
2033	/*	1974	/*
2034	* A: set up vars	1975	* A: set up vars
2035	*/	1976	*/
2036	must_clear = 0;	1977	must_clear = 0;
2037	refresh_count = 0;	1978	refresh_count = 0;
2038
2039	row_offset = saveLines - view_start;
2040		1979
2041	#if XPM_BACKGROUND	1980	#if XPM_BACKGROUND
2042	must_clear |= bgPixmap.pixmap != None;	1981	must_clear |= bgPixmap.pixmap != None;
2043	#endif	1982	#endif
2044	#if TRANSPARENT	1983	#if TRANSPARENT
…		…
2067		2006
2068	if (showcursor)	2007	if (showcursor)
2069	{	2008	{
2070	int col = screen.cur.col;	2009	int col = screen.cur.col;
2071		2010
2072	while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)	2011	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073	col--;	2012	col--;
2074		2013
2075	crp = &screen.line[screen.cur.row]->r[col];	2014	crp = &ROW(screen.cur.row).r[col];
2076		2015
2077	if (showcursor && focus)	2016	if (showcursor && focus)
2078	{	2017	{
2079	if (options & Opt_cursorUnderline)	2018	if (options & Opt_cursorUnderline)
2080	*crp ^= RS_Uline;	2019	*crp ^= RS_Uline;
…		…
2148	* D: CopyArea pass - very useful for slower links	2087	* D: CopyArea pass - very useful for slower links
2149	* This has been deliberately kept simple.	2088	* This has been deliberately kept simple.
2150	*/	2089	*/
2151	i = num_scr;	2090	i = num_scr;
2152	if (!display->is_local	2091	if (!display->is_local
2153	&& refresh_type == FAST_REFRESH && num_scr_allow && i	2092	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154	&& abs (i) < nrow && !must_clear)	2093	&& abs (num_scr) < nrow && !must_clear)
2155	{	2094	{
2156	int16_t nits;	2095	int16_t nits;
2157	int j;	2096	int j;
2158	int len, wlen;	2097	int len, wlen;
2159		2098
…		…
2162	row = i > 0 ? 0 : j - 1;	2101	row = i > 0 ? 0 : j - 1;
2163	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2102	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164	{	2103	{
2165	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2104	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166	{	2105	{
2167	line_t s = save[row + row_offset];	2106	line_t s = ROW(row - view_start);
2168	line_t d = drawn[row];	2107	line_t d = drawn[row];
2169	line_t d2 = drawn[row + i];	2108	line_t d2 = drawn[row + i];
2170		2109
2171	for (nits = 0, col = ncol; col--; )	2110	for (nits = 0, col = ncol; col--; )
2172	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2111	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2192		2131
2193	if (len != -1)	2132	if (len != -1)
2194	{	2133	{
2195	/* also comes here at end if needed because of >= above */	2134	/* also comes here at end if needed because of >= above */
2196	if (wlen < len)	2135	if (wlen < len)
2197	SWAP_IT (wlen, len, int);	2136	::swap (wlen, len);
2198		2137
2199	XCopyArea (display->display, vt, vt,	2138	XCopyArea (display->display, vt, vt,
2200	gc, 0, Row2Pixel (len + i),	2139	gc, 0, Row2Pixel (len + i),
2201	(unsigned int)TermWin_TotalWidth (),	2140	(unsigned int)TermWin_TotalWidth (),
2202	(unsigned int)Height2Pixel (wlen - len + 1),	2141	(unsigned int)Height2Pixel (wlen - len + 1),
…		…
2210	/*	2149	/*
2211	* E: main pass across every character	2150	* E: main pass across every character
2212	*/	2151	*/
2213	for (row = 0; row < nrow; row++)	2152	for (row = 0; row < nrow; row++)
2214	{	2153	{
2215	text_t *stp = save[row + row_offset].t;	2154	text_t *stp = ROW(row - view_start).t;
2216	rend_t *srp = save[row + row_offset].r;	2155	rend_t *srp = ROW(row - view_start).r;
2217	text_t *dtp = drawn[row].t;	2156	text_t *dtp = drawn[row].t;
2218	rend_t *drp = drawn[row].r;	2157	rend_t *drp = drawn[row].r;
2219		2158
2220	/*	2159	/*
2221	* E2: OK, now the real pass	2160	* E2: OK, now the real pass
…		…
2334	fore = Color_UL;	2273	fore = Color_UL;
2335	#endif	2274	#endif
2336		2275
2337	if (invert)	2276	if (invert)
2338	{	2277	{
2339	SWAP_IT (fore, back, int);	2278	::swap (fore, back);
2340		2279
2341	#ifndef NO_BOLD_UNDERLINE_REVERSE	2280	#ifndef NO_BOLD_UNDERLINE_REVERSE
2342	if (ISSET_PIXCOLOR (Color_RV))	2281	if (ISSET_PIXCOLOR (Color_RV))
2343	back = Color_RV;	2282	back = Color_RV;
2344		2283
…		…
2432	else if (oldcursor.row >= 0)	2371	else if (oldcursor.row >= 0)
2433	{	2372	{
2434	int cursorwidth = 1;	2373	int cursorwidth = 1;
2435	int col = oldcursor.col;	2374	int col = oldcursor.col;
2436		2375
2437	while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)	2376	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438	col--;	2377	col--;
2439		2378
2440	while (col + cursorwidth < ncol	2379	while (col + cursorwidth < ncol
2441	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2380	&& drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442	cursorwidth++;	2381	cursorwidth++;
…		…
2477	}	2416	}
2478		2417
2479	void	2418	void
2480	rxvt_term::scr_remap_chars ()	2419	rxvt_term::scr_remap_chars ()
2481	{	2420	{
2482	for (int i = nrow + saveLines; i--; )	2421	for (int i = total_rows; i--; )
2483	scr_remap_chars (save[i]);	2422	scr_remap_chars (save[i]);
2484		2423
2485	for (int i = nrow; i--; )	2424	for (int i = nrow; i--; )
2486	{	2425	{
2487	scr_remap_chars (drawn[i]);	2426	scr_remap_chars (drawn[i]);
…		…
2535		2474
2536	/* ------------------------------------------------------------------------- */	2475	/* ------------------------------------------------------------------------- */
2537	void	2476	void
2538	rxvt_term::scr_reverse_selection ()	2477	rxvt_term::scr_reverse_selection ()
2539	{	2478	{
		2479	if (selection.op
2540	if (selection.op && current_screen == selection.screen)	2480	&& current_screen == selection.screen
		2481	&& selection.end.row >= -view_start)
2541	{	2482	{
2542	int end_row = saveLines - view_start;	2483	int view_end = -view_start + nrow;
2543	int i = selection.beg.row + saveLines;	2484	int row, col;
2544	int col, row = selection.end.row + saveLines;
2545	rend_t *srp;
2546		2485
2547	#if ENABLE_FRILLS	2486	#if ENABLE_FRILLS
2548	if (selection.rect)	2487	if (selection.rect)
2549	{	2488	{
2550	end_row += nrow;	2489	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2551
2552	for (; i <= row && i <= end_row; i++)
2553	for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)	2490	for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2554	srp[col] ^= RS_RVid;	2491	srp[col] ^= RS_RVid;
2555	}	2492	}
2556	else	2493	else
2557	#endif	2494	#endif
2558	{	2495	{
2559	if (i >= end_row)	2496	if (selection.beg.row >= -view_start)
		2497	{
2560	col = selection.beg.col;	2498	col = selection.beg.col;
		2499	row = selection.beg.row;
		2500	}
2561	else	2501	else
2562	{	2502	{
2563	col = 0;	2503	col = 0;
2564	i = end_row;	2504	row = view_start;
2565	}	2505	}
2566		2506
2567	end_row += nrow;	2507	for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569	for (; i < row && i < end_row; i++, col = 0)
2570	for (srp = save[i].r; col < ncol; col++)	2508	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571	srp[col] ^= RS_RVid;	2509	srp[col] ^= RS_RVid;
2572		2510
2573	if (i == row && i < end_row)	2511	if (row == selection.end.row)
2574	for (srp = save[i].r; col < selection.end.col; col++)	2512	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575	srp[col] ^= RS_RVid;	2513	srp[col] ^= RS_RVid;
2576	}	2514	}
2577	}	2515	}
2578	}	2516	}
2579		2517
…		…
2588	{	2526	{
2589	int row, wrote;	2527	int row, wrote;
2590	unsigned int width, towrite;	2528	unsigned int width, towrite;
2591	char r1[] = "\n";	2529	char r1[] = "\n";
2592		2530
2593	for (row = saveLines - nscrolled;	2531	for (row = saveLines - nsaved;
2594	row < saveLines + nrow - 1; row++)	2532	row < saveLines + nrow - 1; row++)
2595	{	2533	{
2596	width = save[row].l >= 0 ? save[row].l	2534	width = save[row].l >= 0 ? save[row].l
2597	: ncol;	2535	: ncol;
2598	for (towrite = width; towrite; towrite -= wrote)	2536	for (towrite = width; towrite; towrite -= wrote)
…		…
2610	#endif	2548	#endif
2611		2549
2612	/* ------------------------------------------------------------------------- *	2550	/* ------------------------------------------------------------------------- *
2613	* CHARACTER SELECTION *	2551	* CHARACTER SELECTION *
2614	* ------------------------------------------------------------------------- */	2552	* ------------------------------------------------------------------------- */
2615
2616	/*
2617	* -nscrolled <= (selection row) <= nrow - 1
2618	*/
2619	void	2553	void
2620	rxvt_term::selection_check (int check_more)	2554	rxvt_term::selection_check (int check_more)
2621	{	2555	{
2622	row_col_t pos;	2556	row_col_t pos;
2623		2557
2624	if (!selection.op)	2558	if (!selection.op)
2625	return;	2559	return;
2626		2560
2627	pos.row = pos.col = 0;	2561	pos.row = pos.col = 0;
2628	if ((selection.beg.row < - (int32_t)nscrolled)	2562	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629	|| (selection.beg.row >= nrow)	2563	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630	|| (selection.mark.row < - (int32_t)nscrolled)	2564	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631	|| (selection.mark.row >= nrow)
2632	|| (selection.end.row < - (int32_t)nscrolled)
2633	|| (selection.end.row >= nrow)
2634	|| (check_more == 1	2565	|| (check_more == 1
2635	&& current_screen == selection.screen	2566	&& current_screen == selection.screen
2636	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2567	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2568	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638	|| (check_more == 2	2569	|| (check_more == 2
…		…
2944	* EXT: button 1 or 3 release	2875	* EXT: button 1 or 3 release
2945	*/	2876	*/
2946	void	2877	void
2947	rxvt_term::selection_make (Time tm)	2878	rxvt_term::selection_make (Time tm)
2948	{	2879	{
2949	int i, col, end_col, row, end_row;	2880	int i;
2950	wchar_t *new_selection_text;	2881	wchar_t *new_selection_text;
2951	text_t *t;	2882	text_t *t;
2952		2883
2953	switch (selection.op)	2884	switch (selection.op)
2954	{	2885	{
…		…
2970	return; /* nothing selected, go away */	2901	return; /* nothing selected, go away */
2971		2902
2972	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2903	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2904	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974		2905
2975	col = selection.beg.col;
2976	row = selection.beg.row + saveLines;
2977	end_row = selection.end.row + saveLines;
2978	int ofs = 0;	2906	int ofs = 0;
2979	int extra = 0;	2907	int extra = 0;
2980		2908
		2909	int col = selection.beg.col;
		2910	int row = selection.beg.row;
		2911
		2912	int end_col;
		2913
2981	for (; row <= end_row; row++, col = 0)	2914	for (; row <= selection.end.row; row++, col = 0)
2982	{	2915	{
2983	#if ENABLE_FRILLS	2916	#if ENABLE_FRILLS
2984	if (selection.rect)	2917	if (selection.rect)
2985	{	2918	{
2986	col = selection.beg.col;	2919	col = selection.beg.col;
2987	end_col = ncol + 1;	2920	end_col = ncol + 1;
2988	}	2921	}
2989	else	2922	else
2990	#endif	2923	#endif
2991	end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME	2924	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992		2925
2993	MAX_IT (col, 0);	2926	col = max (col, 0);
2994		2927
2995	if (row == end_row || selection.rect)	2928	if (row == selection.end.row || selection.rect)
2996	MIN_IT (end_col, selection.end.col);	2929	end_col = min (end_col, selection.end.col);
2997		2930
2998	t = &save[row].t[col];	2931	t = ROW(row).t + col;
2999	for (; col < end_col; col++)	2932	for (; col < end_col; col++)
3000	{	2933	{
3001	if (*t == NOCHAR)	2934	if (*t == NOCHAR)
3002	t++;	2935	t++;
3003	#if ENABLE_COMBINING	2936	#if ENABLE_COMBINING
…		…
3019	#endif	2952	#endif
3020	else	2953	else
3021	new_selection_text[ofs++] = *t++;	2954	new_selection_text[ofs++] = *t++;
3022	}	2955	}
3023		2956
3024	if (save[row].l != -1 && row != end_row)	2957	if (!ROW(row).is_longer () && row != selection.end.row)
3025	new_selection_text[ofs++] = C0_LF;	2958	new_selection_text[ofs++] = C0_LF;
3026	}	2959	}
3027		2960
3028	if (end_col != selection.end.col)	2961	if (end_col != selection.end.col)
3029	new_selection_text[ofs++] = C0_LF;	2962	new_selection_text[ofs++] = C0_LF;
…		…
3088	*/	3021	*/
3089	void	3022	void
3090	rxvt_term::selection_start_colrow (int col, int row)	3023	rxvt_term::selection_start_colrow (int col, int row)
3091	{	3024	{
3092	want_refresh = 1;	3025	want_refresh = 1;
		3026
		3027	selection.mark.row = row - view_start;
3093	selection.mark.col = col;	3028	selection.mark.col = col;
3094	selection.mark.row = row - view_start;
3095		3029
3096	MAX_IT (selection.mark.row, - (int32_t)nscrolled);	3030	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3097	MIN_IT (selection.mark.row, (int32_t)nrow - 1);	3031	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3098	MAX_IT (selection.mark.col, 0);
3099	MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3100		3032
3101	while (selection.mark.col > 0	3033	while (selection.mark.col > 0
3102	&& save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)	3034	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3103	--selection.mark.col;	3035	--selection.mark.col;
3104		3036
3105	if (selection.op)	3037	if (selection.op)
3106	{ /* clear the old selection */	3038	{ /* clear the old selection */
3107	selection.beg.row = selection.end.row = selection.mark.row;	3039	selection.beg.row = selection.end.row = selection.mark.row;
…		…
3131	text_t *stp;	3063	text_t *stp;
3132	rend_t *srp;	3064	rend_t *srp;
3133		3065
3134	if (dirn == UP)	3066	if (dirn == UP)
3135	{	3067	{
3136	bound.row = saveLines - nscrolled - 1;	3068	bound.row = - nsaved - 1;
3137	bound.col = 0;	3069	bound.col = 0;
3138	dirnadd = -1;	3070	dirnadd = -1;
3139	}	3071	}
3140	else	3072	else
3141	{	3073	{
3142	bound.row = saveLines + nrow;	3074	bound.row = nrow;
3143	bound.col = ncol - 1;	3075	bound.col = ncol - 1;
3144	dirnadd = 1;	3076	dirnadd = 1;
3145	}	3077	}
3146		3078
3147	row = mark->row + saveLines;	3079	row = mark->row;
3148	col = mark->col;	3080	col = max (mark->col, 0);
3149	MAX_IT (col, 0);	3081
3150	/* find the edge of a word */	3082	/* find the edge of a word */
3151	stp = &save[row].t[col];	3083	stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3152	w1 = DELIMIT_TEXT (*stp);	3084	srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3153
3154	srp = &save[row].r[col];
3155	w2 = DELIMIT_REND (*srp);
3156		3085
3157	for (;;)	3086	for (;;)
3158	{	3087	{
3159	for (; col != bound.col; col += dirnadd)	3088	for (; col != bound.col; col += dirnadd)
3160	{	3089	{
…		…
3170	break;	3099	break;
3171	}	3100	}
3172		3101
3173	if ((col == bound.col) && (row != bound.row))	3102	if ((col == bound.col) && (row != bound.row))
3174	{	3103	{
3175	if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ())	3104	if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3176	{	3105	{
3177	trow = row + dirnadd;	3106	trow = row + dirnadd;
3178	tcol = dirn == UP ? ncol - 1 : 0;	3107	tcol = dirn == UP ? ncol - 1 : 0;
3179		3108
3180	if (save[trow].t == NULL)	3109	if (!ROW(trow).t)
3181	break;	3110	break;
3182		3111
3183	stp = & (save[trow].t[tcol]);	3112	stp = ROW(trow).t + tcol;
3184	srp = & (save[trow].r[tcol]);	3113	srp = ROW(trow).r + tcol;
3185		3114
3186	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)	3115	if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3187	break;	3116	break;
3188		3117
3189	row = trow;	3118	row = trow;
…		…
3197	Old_Word_Selection_You_Die:	3126	Old_Word_Selection_You_Die:
3198	if (dirn == DN)	3127	if (dirn == DN)
3199	col++; /* put us on one past the end */	3128	col++; /* put us on one past the end */
3200		3129
3201	/* Poke the values back in */	3130	/* Poke the values back in */
3202	ret->row = row - saveLines;	3131	ret->row = row;
3203	ret->col = col;	3132	ret->col = col;
3204	}	3133	}
3205		3134
3206	/* ------------------------------------------------------------------------- */	3135	/* ------------------------------------------------------------------------- */
3207	/*	3136	/*
…		…
3212	* flag == 2 ==> button 3 motion	3141	* flag == 2 ==> button 3 motion
3213	*/	3142	*/
3214	void	3143	void
3215	rxvt_term::selection_extend (int x, int y, int flag)	3144	rxvt_term::selection_extend (int x, int y, int flag)
3216	{	3145	{
3217	int col, row;	3146	int col = clamp (Pixel2Col (x), 0, ncol);
3218		3147	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3219	col = Pixel2Col (x);
3220	row = Pixel2Row (y);
3221	MAX_IT (row, 0);
3222	MIN_IT (row, (int)nrow - 1);
3223	MAX_IT (col, 0);
3224	MIN_IT (col, (int)ncol);
3225		3148
3226	/*	3149	/*
3227	* If we're selecting characters (single click) then we must check first	3150	* If we're selecting characters (single click) then we must check first
3228	* if we are at the same place as the original mark. If we are then	3151	* if we are at the same place as the original mark. If we are then
3229	* select nothing. Otherwise, if we're to the right of the mark, you have to	3152	* select nothing. Otherwise, if we're to the right of the mark, you have to
…		…
3254	* Extend the selection to the specified col/row	3177	* Extend the selection to the specified col/row
3255	*/	3178	*/
3256	void	3179	void
3257	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3180	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3258	{	3181	{
3259	int end_col;
3260	row_col_t pos;	3182	row_col_t pos;
3261	enum {	3183	enum {
3262	LEFT, RIGHT	3184	LEFT, RIGHT
3263	} closeto = RIGHT;	3185	} closeto = RIGHT;
3264		3186
…		…
3295	selection.beg.col = selection.end.col = selection.mark.col;	3217	selection.beg.col = selection.end.col = selection.mark.col;
3296	selection.beg.row = selection.end.row = selection.mark.row;	3218	selection.beg.row = selection.end.row = selection.mark.row;
3297	}	3219	}
3298		3220
3299	pos.col = col;	3221	pos.col = col;
3300	pos.row = row;	3222	pos.row = row - view_start;
3301
3302	pos.row -= view_start; /* adjust for scroll */
3303		3223
3304	/*	3224	/*
3305	* This is mainly xterm style selection with a couple of differences, mainly	3225	* This is mainly xterm style selection with a couple of differences, mainly
3306	* in the way button3 drag extension works.	3226	* in the way button3 drag extension works.
3307	* We're either doing: button1 drag; button3 press; or button3 drag	3227	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3366	}	3286	}
3367	}	3287	}
3368		3288
3369	if (selection.clicks == 1)	3289	if (selection.clicks == 1)
3370	{	3290	{
3371	end_col = save[selection.beg.row + saveLines].l;	3291	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372		3292	&& !ROW(selection.beg.row).is_longer ()
3373	if (selection.beg.col > end_col
3374	&& end_col != -1
3375	#if ENABLE_FRILLS	3293	#if ENABLE_FRILLS
3376	&& !selection.rect	3294	&& !selection.rect
3377	#endif	3295	#endif
3378	)	3296	)
3379	selection.beg.col = ncol;	3297	selection.beg.col = ncol;
3380		3298
3381	end_col = save[selection.end.row + saveLines].l;
3382
3383	if (	3299	if (
3384	selection.end.col > end_col	3300	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385	&& end_col != -1	3301	&& !ROW(selection.end.row).is_longer ()
3386	#if ENABLE_FRILLS	3302	#if ENABLE_FRILLS
3387	&& !selection.rect	3303	&& !selection.rect
3388	#endif	3304	#endif
3389	)	3305	)
3390	selection.end.col = ncol;	3306	selection.end.col = ncol;
…		…
3400	else if (selection.clicks == 3)	3316	else if (selection.clicks == 3)
3401	{	3317	{
3402	#if ENABLE_FRILLS	3318	#if ENABLE_FRILLS
3403	if (options & Opt_tripleclickwords)	3319	if (options & Opt_tripleclickwords)
3404	{	3320	{
3405	int end_row;
3406
3407	selection_delimit_word (UP, &selection.beg, &selection.beg);	3321	selection_delimit_word (UP, &selection.beg, &selection.beg);
3408	end_row = save[selection.mark.row + saveLines].l;
3409		3322
3410	for (end_row = selection.mark.row; end_row < nrow; end_row++)	3323	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3411	{	3324	{
3412	end_col = save[end_row + saveLines].l;	3325	if (!ROW(end_row).is_longer ())
3413
3414	if (end_col != -1)
3415	{	3326	{
3416	selection.end.row = end_row;	3327	selection.end.row = end_row;
3417	selection.end.col = end_col;	3328	selection.end.col = ROW(end_row).l;
3418	selection_remove_trailing_spaces ();	3329	selection_remove_trailing_spaces ();
3419	break;	3330	break;
3420	}	3331	}
3421	}	3332	}
3422	}	3333	}
…		…
3429	selection.beg.col = 0;	3340	selection.beg.col = 0;
3430	selection.end.col = ncol;	3341	selection.end.col = ncol;
3431		3342
3432	// select a complete logical line	3343	// select a complete logical line
3433	while (selection.beg.row > -saveLines	3344	while (selection.beg.row > -saveLines
3434	&& save[selection.beg.row - 1 + saveLines].is_cont ())	3345	&& ROW(selection.beg.row - 1).is_longer ())
3435	selection.beg.row--;	3346	selection.beg.row--;
3436		3347
3437	while (selection.end.row < nrow	3348	while (selection.end.row < nrow
3438	&& save[selection.end.row + saveLines].is_cont ())	3349	&& ROW(selection.end.row).is_longer ())
3439	selection.end.row++;	3350	selection.end.row++;
3440	}	3351	}
3441	}	3352	}
3442		3353
3443	if (button3 && buttonpress)	3354	if (button3 && buttonpress)
…		…
3454	}	3365	}
3455	}	3366	}
3456		3367
3457	#if ENABLE_FRILLS	3368	#if ENABLE_FRILLS
3458	if (selection.rect && selection.beg.col > selection.end.col)	3369	if (selection.rect && selection.beg.col > selection.end.col)
3459	SWAP_IT (selection.beg.col, selection.end.col, int);	3370	::swap (selection.beg.col, selection.end.col);
3460	#endif	3371	#endif
3461	}	3372	}
3462		3373
3463	#if ENABLE_FRILLS	3374	#if ENABLE_FRILLS
3464	void	3375	void
…		…
3468	text_t *stp;	3379	text_t *stp;
3469		3380
3470	end_col = selection.end.col;	3381	end_col = selection.end.col;
3471	end_row = selection.end.row;	3382	end_row = selection.end.row;
3472		3383
3473	for ( ; end_row >= selection.beg.row; )	3384	for (; end_row >= selection.beg.row; )
3474	{	3385	{
3475	stp = save[end_row + saveLines].t;	3386	stp = ROW(end_row).t;
3476		3387
3477	while (--end_col >= 0)	3388	while (--end_col >= 0)
3478	{	3389	{
3479	if (stp[end_col] != ' '	3390	if (stp[end_col] != ' '
3480	&& stp[end_col] != '\t'	3391	&& stp[end_col] != '\t'
3481	&& stp[end_col] != NOCHAR)	3392	&& stp[end_col] != NOCHAR)
3482	break;	3393	break;
3483	}	3394	}
3484		3395
3485	if (end_col >= 0	3396	if (end_col >= 0
3486	|| save[end_row - 1 + saveLines].l != -1)	3397	|| !ROW(end_row - 1).is_longer ())
3487	{	3398	{
3488	selection.end.col = end_col + 1;	3399	selection.end.col = end_col + 1;
3489	selection.end.row = end_row;	3400	selection.end.row = end_row;
3490	break;	3401	break;
3491	}	3402	}
…		…
3662	*/	3573	*/
3663	void	3574	void
3664	rxvt_term::pixel_position (int *x, int *y)	3575	rxvt_term::pixel_position (int *x, int *y)
3665	{	3576	{
3666	*x = Pixel2Col (*x);	3577	*x = Pixel2Col (*x);
3667	/* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */	3578	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3668	*y = Pixel2Row (*y);	3579	*y = Pixel2Row (*y);
3669	/* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */	3580	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3670	}	3581	}
3671		3582
3672	/* ------------------------------------------------------------------------- */	3583	/* ------------------------------------------------------------------------- */
3673	#ifdef USE_XIM	3584	#ifdef USE_XIM
3674	void	3585	void
…		…
3696		3607
3697	if (x < 0) x = ncol - w;	3608	if (x < 0) x = ncol - w;
3698	if (y < 0) y = nrow - h;	3609	if (y < 0) y = nrow - h;
3699		3610
3700	// make space for border	3611	// make space for border
3701	w += 2; MIN_IT (w, ncol);	3612	w += 2; min_it (w, ncol);
3702	h += 2; MIN_IT (h, nrow);	3613	h += 2; min_it (h, nrow);
3703		3614
3704	x -= 1; MAX_IT (x, 0);	3615	x -= 1; max_it (x, 0);
3705	y -= 1; MAX_IT (y, 0);	3616	y -= 1; max_it (y, 0);
3706		3617
3707	MIN_IT (x, ncol - w);	3618	min_it (x, ncol - w);
3708	MIN_IT (y, nrow - h);	3619	min_it (y, nrow - h);
3709		3620
3710	ov_x = x; ov_y = y;	3621	ov_x = x; ov_y = y;
3711	ov_w = w; ov_h = h;	3622	ov_w = w; ov_h = h;
3712		3623
3713	ov_text = new text_t *[h];	3624	ov_text = new text_t *[h];
…		…
3799	rxvt_term::scr_swap_overlay ()	3710	rxvt_term::scr_swap_overlay ()
3800	{	3711	{
3801	if (!ov_text)	3712	if (!ov_text)
3802	return;	3713	return;
3803		3714
3804	int row_offset = ov_y + saveLines - view_start;
3805
3806	// swap screen mem with overlay	3715	// swap screen mem with overlay
3807	for (int y = ov_h; y--; )	3716	for (int y = ov_h; y--; )
3808	{	3717	{
3809	text_t *t1 = ov_text[y];	3718	text_t *t1 = ov_text[y];
3810	rend_t *r1 = ov_rend[y];	3719	rend_t *r1 = ov_rend[y];
3811		3720
3812	text_t *t2 = save[y + row_offset].t + ov_x;	3721	text_t *t2 = ROW(y - view_start).t + ov_x;
3813	rend_t *r2 = save[y + row_offset].r + ov_x;	3722	rend_t *r2 = ROW(y - view_start).r + ov_x;
3814		3723
3815	for (int x = ov_w; x--; )	3724	for (int x = ov_w; x--; )
3816	{	3725	{
3817	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3726	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3818	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3727	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
…		…
3820	}	3729	}
3821	}	3730	}
3822		3731
3823	#endif	3732	#endif
3824	/* ------------------------------------------------------------------------- */	3733	/* ------------------------------------------------------------------------- */
		3734

Diff Legend

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