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.205 by root, Tue Jan 3 04:18:47 2006 UTC vs.
Revision 1.244 by root, Fri Jan 20 10:27:08 2006 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*--------------------------------*-C-*--------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
115	* SCREEN `COMMON' ROUTINES *	115	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	116	* ------------------------------------------------------------------------- */
117		117
118	/* Fill part/all of a line with blanks. */	118	/* Fill part/all of a line with blanks. */
119	void	119	void
120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)	120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121	{	121	{
122	if (!l.t)	122	if (!l.t)
123	{	123	{
124	lalloc (l);	124	lalloc (l);
125	col = 0;	125	col = 0;
126	width = ncol;	126	width = ncol;
127	}	127	}
128		128
		129	l.touch ();
		130
129	efs &= ~RS_baseattrMask;	131	efs &= ~RS_baseattrMask;
130	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131		133
132	text_t *et = l.t + col;	134	text_t *et = l.t + col;
133	rend_t *er = l.r + col;	135	rend_t *er = l.r + col;
…		…
140	}	142	}
141		143
142	/* ------------------------------------------------------------------------- */	144	/* ------------------------------------------------------------------------- */
143	/* Fill a full line with blanks - make sure it is allocated first */	145	/* Fill a full line with blanks - make sure it is allocated first */
144	void	146	void
145	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)	147	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
146	{	148	{
147	scr_blank_line (l, 0, ncol, efs);	149	scr_blank_line (l, 0, ncol, efs);
		150
		151	l.l = 0;
		152	l.f = 0;
148	}	153	}
149		154
150	/* ------------------------------------------------------------------------- *	155	/* ------------------------------------------------------------------------- *
151	* SCREEN INITIALISATION *	156	* SCREEN INITIALISATION *
152	* ------------------------------------------------------------------------- */	157	* ------------------------------------------------------------------------- */
…		…
174	if (nrow + saveLines < 2)	179	if (nrow + saveLines < 2)
175	{	180	{
176	//TODO//FIXME	181	//TODO//FIXME
177	saveLines++;	182	saveLines++;
178	prev_nrow--;	183	prev_nrow--;
179	nsaved++;	184	top_row--;
180	}	185	}
181		186
182	want_refresh = 1;	187	want_refresh = 1;
183		188
184	int prev_total_rows = prev_nrow + saveLines;	189	int prev_total_rows = prev_nrow + saveLines;
…		…
189		194
190	if (!row_buf)	195	if (!row_buf)
191	{	196	{
192	/*	197	/*
193	* first time called so just malloc everything: don't rely on realloc	198	* first time called so just malloc everything: don't rely on realloc
194	* Note: this is still needed so that all the scrollback lines are NULL
195	*/	199	*/
196	nsaved = 0; /* no saved lines */	200	top_row = 0; /* no saved lines */
197	term_start = 0;	201	term_start = 0;
198		202
199	talloc = new rxvt_salloc (ncol * sizeof (text_t));	203	talloc = new rxvt_salloc (ncol * sizeof (text_t));
200	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201		205
202	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	206	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203	temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));	208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206		209
207	for (int row = nrow; row--; )	210	for (int row = nrow; row--; )
208	{	211	{
209	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);	212	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	213	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
…		…
231	selection.text = NULL;	234	selection.text = NULL;
232	selection.len = 0;	235	selection.len = 0;
233	selection.op = SELECTION_CLEAR;	236	selection.op = SELECTION_CLEAR;
234	selection.screen = PRIMARY;	237	selection.screen = PRIMARY;
235	selection.clicks = 0;	238	selection.clicks = 0;
236	CLEAR_ALL_SELECTION ();
237	rvideo = 0;	239	rvideo = 0;
238	}	240	}
239	else	241	else
240	{	242	{
241	/*	243	/*
…		…
255	}	257	}
256	}	258	}
257	#endif	259	#endif
258		260
259	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));	261	drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260	temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));	262	swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262		263
263	for (int row = min (nrow, prev_nrow); row--; )	264	for (int row = min (nrow, prev_nrow); row--; )
264	{	265	{
265	lresize (drawn_buf[row]);	266	lresize (drawn_buf[row]);
…		…
270	{	271	{
271	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	272	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	273	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273	}	274	}
274		275
		276	line_t *old_buf = row_buf;
275	line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));	277	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276		278
277	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	279	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278	int pend = MOD (term_start - nsaved , prev_total_rows);	280	int pend = MOD (term_start + top_row , prev_total_rows);
279	int q = total_rows; // rewrapped row	281	int q = total_rows; // rewrapped row
280		282
281	if (nsaved)	283	if (top_row)
282	{	284	{
283	// re-wrap lines, this is rather ugly, possibly because I am too dumb	285	// re-wrap lines, this is rather ugly, possibly because I am too dumb
284	// to come up with a lean and mean algorithm.	286	// to come up with a lean and mean algorithm.
285		287
286	row_col_t ocur = screen.cur;	288	row_col_t ocur = screen.cur;
…		…
290	{	292	{
291	p = MOD (p - 1, prev_total_rows);	293	p = MOD (p - 1, prev_total_rows);
292	#ifdef DEBUG_STRICT	294	#ifdef DEBUG_STRICT
293	assert (old_buf [MOD (p, prev_total_rows)].t);	295	assert (old_buf [MOD (p, prev_total_rows)].t);
294	#endif	296	#endif
295
296	int plines = 1;	297	int plines = 1;
297	int llen = old_buf [MOD (p, prev_total_rows)].l;	298	int llen = old_buf [MOD (p, prev_total_rows)].l;
298		299
299	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	300	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300	{	301	{
…		…
318	// re-assemble the full line by destination lines	319	// re-assemble the full line by destination lines
319	for (int qrow = q; qlines--; qrow++)	320	for (int qrow = q; qlines--; qrow++)
320	{	321	{
321	qline = row_buf + qrow;	322	qline = row_buf + qrow;
322	lalloc (*qline);	323	lalloc (*qline);
		324	qline->l = ncol;
323	qline->set_is_longer ();	325	qline->is_longer (1);
324		326
325	int qcol = 0;	327	int qcol = 0;
326		328
		329	// see below for cursor adjustment rationale
		330	if (p == ocur.row)
		331	screen.cur.row = q - (total_rows - nrow);
		332
327	// fill a single destination line	333	// fill a single destination line
328	while (lofs < llen && qcol < ncol)	334	while (lofs < llen && qcol < ncol)
329	{	335	{
330	int prow = lofs / prev_ncol;	336	int prow = lofs / prev_ncol;
331	int pcol = lofs % prev_ncol;	337	int pcol = lofs % prev_ncol;
…		…
341		347
342	line_t &pline = old_buf [prow];	348	line_t &pline = old_buf [prow];
343		349
344	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	350	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
345		351
		352	#if DEBUG_STRICT
346	assert (len);	353	assert (len);
347	assert (pline.t);	354	assert (pline.t);
		355	#endif
348		356
349	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	357	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	358	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
351		359
352	lofs += len;	360	lofs += len;
353	qcol += len;	361	qcol += len;
354	}	362	}
355	}	363	}
356		364
357	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;	365	qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358	#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY	366	qline->is_longer (0);
359	if (qline->l < 0)
360	{
361	fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362	qline->l = 0;
363	}
364	#endif
365	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);	367	scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366	}	368	}
367	while (p != pend && q > 0);	369	while (p != pend && q > 0);
368		370
369	term_start = total_rows - nrow;	371	term_start = total_rows - nrow;
370	nsaved = term_start - q;	372	top_row = q - term_start;
371		373
372	// make sure all terminal lines exist	374	// make sure all terminal lines exist
373	while (nsaved < 0)	375	while (top_row > 0)
374	scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);	376	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376	}	377	}
377	else	378	else
378	{	379	{
379	// if no scrollback exists (yet), wing, instead of wrap	380	// if no scrollback exists (yet), wing, instead of wrap
380		381
…		…
393	}	394	}
394		395
395	term_start = 0;	396	term_start = 0;
396	}	397	}
397		398
398	#ifdef DEBUG_STRICT //TODO: remove
399	for (int i = -nsaved; i < nrow; i++)
400	assert (ROW (i).t);
401	#endif
402
403	free (old_buf);	399	free (old_buf);
404	delete old_ta;	400	delete old_ta;
405	delete old_ra;	401	delete old_ra;
406		402
407	clamp_it (screen.cur.row, 0, nrow - 1);	403	clamp_it (screen.cur.row, 0, nrow - 1);
…		…
409		405
410	if (tabs)	406	if (tabs)
411	free (tabs);	407	free (tabs);
412	}	408	}
413		409
		410	CLEAR_ALL_SELECTION ();
		411
414	prev_nrow = nrow;	412	prev_nrow = nrow;
415	prev_ncol = ncol;	413	prev_ncol = ncol;
416		414
417	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	415	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
418		416
419	for (int col = ncol; col--; )	417	for (int col = ncol; col--; )
420	tabs [col] = col % TABSIZE == 0;	418	tabs [col] = col % TABSIZE == 0;
421		419
422	tt_winch ();	420	tt_winch ();
423		421
424	PERL_INVOKE ((this, HOOK_RESET, DT_END));	422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425	}	423	}
426		424
427	/* ------------------------------------------------------------------------- */	425	/* ------------------------------------------------------------------------- */
428	/*	426	/*
429	* Free everything. That way malloc debugging can find leakage.	427	* Free everything. That way malloc debugging can find leakage.
430	*/	428	*/
431	void	429	void
432	rxvt_term::scr_release ()	430	rxvt_term::scr_release () NOTHROW
433	{	431	{
434	delete talloc; talloc = 0;	432	delete talloc; talloc = 0;
435	delete ralloc; ralloc = 0;	433	delete ralloc; ralloc = 0;
436		434
437	free (row_buf);	435	free (row_buf);
438	free (swap_buf);	436	free (swap_buf);
439	free (drawn_buf);	437	free (drawn_buf);
440	free (temp_buf);
441	free (tabs);	438	free (tabs);
442		439
443	row_buf = 0; // signal that we freed all the arrays	440	row_buf = 0; // signal that we freed all the arrays
444	}	441	}
445		442
446	/* ------------------------------------------------------------------------- */	443	/* ------------------------------------------------------------------------- */
447	/*	444	/*
448	* Hard reset	445	* Hard reset
449	*/	446	*/
450	void	447	void
451	rxvt_term::scr_poweron ()	448	rxvt_term::scr_poweron () NOTHROW
452	{	449	{
453	scr_release ();	450	scr_release ();
454	prev_nrow = prev_ncol = 0;	451	prev_nrow = prev_ncol = 0;
455	scr_reset ();	452	scr_reset ();
456		453
457	scr_clear (true);	454	scr_clear (true);
458	scr_refresh (SLOW_REFRESH);	455	scr_refresh ();
459	}	456	}
460		457
461	/* ------------------------------------------------------------------------- *	458	/* ------------------------------------------------------------------------- *
462	* PROCESS SCREEN COMMANDS *	459	* PROCESS SCREEN COMMANDS *
463	* ------------------------------------------------------------------------- */	460	* ------------------------------------------------------------------------- */
…		…
465	* Save and Restore cursor	462	* Save and Restore cursor
466	* XTERM_SEQ: Save cursor : ESC 7	463	* XTERM_SEQ: Save cursor : ESC 7
467	* XTERM_SEQ: Restore cursor: ESC 8	464	* XTERM_SEQ: Restore cursor: ESC 8
468	*/	465	*/
469	void	466	void
470	rxvt_term::scr_cursor (int mode)	467	rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
471	{	468	{
472	screen_t *s;	469	screen_t *s;
473		470
474	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)	471	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
475	if (current_screen == SECONDARY)	472	if (current_screen == SECONDARY)
…		…
514	* Swap between primary and secondary screens	511	* Swap between primary and secondary screens
515	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h	512	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
516	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	513	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
517	*/	514	*/
518	int	515	int
519	rxvt_term::scr_change_screen (int scrn)	516	rxvt_term::scr_change_screen (int scrn) NOTHROW
520	{	517	{
521	want_refresh = 1;	518	want_refresh = 1;
522	view_start = 0;	519	view_start = 0;
523		520
524	if (current_screen == scrn)	521	if (current_screen == scrn)
…		…
555	return scrn;	552	return scrn;
556	}	553	}
557		554
558	// clear WrapNext indicator, solidifying position on next line	555	// clear WrapNext indicator, solidifying position on next line
559	void	556	void
560	rxvt_term::scr_do_wrap ()	557	rxvt_term::scr_do_wrap () NOTHROW
561	{	558	{
562	if (!(screen.flags & Screen_WrapNext))	559	if (!(screen.flags & Screen_WrapNext))
563	return;	560	return;
564		561
565	screen.flags &= ~Screen_WrapNext;	562	screen.flags &= ~Screen_WrapNext;
…		…
575	/* ------------------------------------------------------------------------- */	572	/* ------------------------------------------------------------------------- */
576	/*	573	/*
577	* Change the colour for following text	574	* Change the colour for following text
578	*/	575	*/
579	void	576	void
580	rxvt_term::scr_color (unsigned int color, int fgbg)	577	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
581	{	578	{
582	if (color > maxTermCOLOR)	579	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583	color = fgbg;	580	color = fgbg;
584		581
585	if (fgbg == Color_fg)	582	if (fgbg == Color_fg)
586	rstyle = SET_FGCOLOR (rstyle, color);	583	rstyle = SET_FGCOLOR (rstyle, color);
587	else	584	else
…		…
591	/* ------------------------------------------------------------------------- */	588	/* ------------------------------------------------------------------------- */
592	/*	589	/*
593	* Change the rendition style for following text	590	* Change the rendition style for following text
594	*/	591	*/
595	void	592	void
596	rxvt_term::scr_rendition (int set, int style)	593	rxvt_term::scr_rendition (int set, int style) NOTHROW
597	{	594	{
598	if (set)	595	if (set)
599	rstyle |= style;	596	rstyle |= style;
600	else if (style == ~RS_None)	597	else if (style == ~RS_None)
601	rstyle = DEFAULT_RSTYLE;	598	rstyle = DEFAULT_RSTYLE;
…		…
608	* Scroll text between <row1> and <row2> inclusive, by <count> lines	605	* Scroll text between <row1> and <row2> inclusive, by <count> lines
609	* count positive ==> scroll up	606	* count positive ==> scroll up
610	* count negative ==> scroll down	607	* count negative ==> scroll down
611	*/	608	*/
612	int	609	int
613	rxvt_term::scr_scroll_text (int row1, int row2, int count)	610	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
614	{	611	{
615	if (count == 0 || (row1 > row2))	612	if (count == 0 || (row1 > row2))
616	return 0;	613	return 0;
617		614
618	want_refresh = 1;	615	want_refresh = 1;
619	num_scr += count;	616	num_scr += count;
620		617
621	if (count > 0	618	if (count > 0
622	&& row1 == 0	619	&& row1 == 0
623	&& row2 == nrow - 1
624	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	620	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625	{	621	{
626	nsaved = min (nsaved + count, saveLines);	622	top_row = max (top_row - count, -saveLines);
627		623
628	PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));	624	// scroll everything up 'count' lines
		625	term_start = (term_start + count) % total_rows;
		626
		627	// sever bottommost line
		628	{
		629	line_t &l = ROW(row2 - count);
		630	l.is_longer (0);
		631	l.touch ();
		632	}
		633
		634	// erase newly scrolled-in lines
		635	for (int i = count; i--; )
		636	{
		637	// basically this is a slightly optimized scr_blank_screen_mem
		638	// it is worth the effort on slower machines
		639	line_t &l = ROW(nrow - 1 - i);
		640
		641	scr_blank_line (l, 0, l.l, rstyle);
		642
		643	l.l = 0;
		644	l.f = 0;
		645	}
		646
		647	// now copy lines below the scroll region bottom to the
		648	// bottom of the screen again, so they look as if they
		649	// hadn't moved.
		650	for (int i = nrow; --i > row2; )
		651	{
		652	line_t &l1 = ROW(i - count);
		653	line_t &l2 = ROW(i);
		654
		655	::swap (l1, l2);
		656	l2.touch ();
		657	}
629		658
630	term_start = (term_start + count) % total_rows;	659	// move and/or clear selection, if any
631
632	if (selection.op && current_screen == selection.screen)	660	if (selection.op && current_screen == selection.screen)
633	{	661	{
634	selection.beg.row -= count;	662	selection.beg.row -= count;
635	selection.end.row -= count;	663	selection.end.row -= count;
636	selection.mark.row -= count;	664	selection.mark.row -= count;
637		665
638	if (selection.beg.row < -nsaved	666	if (selection.beg.row < top_row
639	|| selection.end.row < -nsaved	667	|| selection.end.row < top_row
640	|| selection.mark.row < -nsaved)	668	|| selection.mark.row < top_row)
641	{	669	{
642	CLEAR_ALL_SELECTION ();	670	CLEAR_ALL_SELECTION ();
643	selection.op = SELECTION_CLEAR;	671	selection.op = SELECTION_CLEAR;
644	}	672	}
645	}	673	}
646		674
647	for (int i = count; i--; )	675	// finally move the view window, if desired
648	{
649	ROW(row2 - i).l = 0;
650	scr_blank_screen_mem (ROW(row2 - i), rstyle);
651	}
652
653	if (OPTION (Opt_scrollWithBuffer)	676	if (OPTION (Opt_scrollWithBuffer)
654	&& view_start != 0	677	&& view_start != 0
655	&& view_start != saveLines)	678	&& view_start != -saveLines)
656	scr_page (UP, count);	679	scr_page (UP, count);
		680
		681	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
		682	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
657	}	683	}
658	else	684	else
659	{	685	{
660	if (selection.op && current_screen == selection.screen)	686	if (selection.op && current_screen == selection.screen)
661	{	687	{
…		…
685		711
686	int rows = row2 - row1 + 1;	712	int rows = row2 - row1 + 1;
687		713
688	min_it (count, rows);	714	min_it (count, rows);
689		715
		716	line_t *temp_buf = row_buf + total_rows;
		717
690	for (int row = 0; row < rows; row++)	718	for (int row = 0; row < rows; row++)
691	{	719	{
692	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	720	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693		721
694	if (!IN_RANGE_EXC (row + count, 0, rows))	722	if (!IN_RANGE_EXC (row + count, 0, rows))
…		…
705	/* ------------------------------------------------------------------------- */	733	/* ------------------------------------------------------------------------- */
706	/*	734	/*
707	* Add text given in <str> of length <len> to screen struct	735	* Add text given in <str> of length <len> to screen struct
708	*/	736	*/
709	void	737	void
710	rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)	738	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
711	{	739	{
712	if (len <= 0) /* sanity */	740	if (len <= 0) /* sanity */
713	return;	741	return;
714		742
715	unsigned char checksel;	743	unsigned char checksel;
716	unicode_t c;	744	unicode_t c;
717	int last_col;	745	int ncol = this->ncol;
718	const unicode_t *strend = str + len;	746	const wchar_t *strend = str + len;
719		747
720	want_refresh = 1;	748	want_refresh = 1;
721	ZERO_SCROLLBACK ();	749	ZERO_SCROLLBACK ();
722	last_col = ncol;
723		750
724	if (nlines > 0)	751	if (minlines > 0)
725	{	752	{
726	nlines += screen.cur.row - screen.bscroll;	753	minlines += screen.cur.row - screen.bscroll;
		754
727	if (nlines > 0	755	if (minlines > 0
728	&& screen.tscroll == 0	756	&& screen.tscroll == 0
729	&& screen.bscroll == (nrow - 1))	757	&& screen.bscroll == nrow - 1)
730	{	758	{
731	/* _at least_ this many lines need to be scrolled */	759	/* _at least_ this many lines need to be scrolled */
732	scr_scroll_text (screen.tscroll, screen.bscroll, nlines);	760	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733	screen.cur.row -= nlines;	761	screen.cur.row -= minlines;
734	}	762	}
735	}	763	}
736		764
737	#ifdef DEBUG_STRICT	765	#ifdef DEBUG_STRICT
738	assert (screen.cur.col < last_col);	766	assert (screen.cur.col < ncol);
739	assert (screen.cur.row < nrow	767	assert (screen.cur.row < nrow
740	&& screen.cur.row >= -nsaved);	768	&& screen.cur.row >= top_row);
741	#endif	769	#endif
742	int row = screen.cur.row;	770	int row = screen.cur.row;
743		771
744	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	772	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745		773
746	line_t *line = &ROW(row);	774	line_t *line = &ROW(row);
747		775
748	while (str < strend)	776	while (str < strend)
749	{	777	{
750	c = *str++;	778	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751		779
752	if (c < 0x20)	780	if (c < 0x20)
753	if (c == C0_LF)	781	if (c == C0_LF)
754	{	782	{
755	if (!line->is_longer ()) /* XXX: think about this */
756	max_it (line->l, screen.cur.col);	783	max_it (line->l, screen.cur.col);
757		784
758	screen.flags &= ~Screen_WrapNext;	785	screen.flags &= ~Screen_WrapNext;
759		786
760	if (screen.cur.row == screen.bscroll)	787	if (screen.cur.row == screen.bscroll)
761	scr_scroll_text (screen.tscroll, screen.bscroll, 1);	788	scr_scroll_text (screen.tscroll, screen.bscroll, 1);
…		…
765	line = &ROW(row); /* _must_ refresh */	792	line = &ROW(row); /* _must_ refresh */
766	continue;	793	continue;
767	}	794	}
768	else if (c == C0_CR)	795	else if (c == C0_CR)
769	{	796	{
770	if (!line->is_longer ()) /* XXX: think about this */
771	max_it (line->l, screen.cur.col);	797	max_it (line->l, screen.cur.col);
772		798
773	screen.flags &= ~Screen_WrapNext;	799	screen.flags &= ~Screen_WrapNext;
774	screen.cur.col = 0;	800	screen.cur.col = 0;
775	continue;	801	continue;
776	}	802	}
…		…
793	CLEAR_SELECTION ();	819	CLEAR_SELECTION ();
794	}	820	}
795		821
796	if (screen.flags & Screen_WrapNext)	822	if (screen.flags & Screen_WrapNext)
797	{	823	{
798	line->set_is_longer ();
799
800	scr_do_wrap ();	824	scr_do_wrap ();
801		825
		826	line->l = ncol;
		827	line->is_longer (1);
		828
802	row = screen.cur.row;	829	row = screen.cur.row;
803	line = &ROW(row); /* _must_ refresh */	830	line = &ROW(row); /* _must_ refresh */
804	}	831	}
805		832
806	// some utf-8 decoders "decode" surrogate characters: let's fix this.	833	// some utf-8 decoders "decode" surrogate characters: let's fix this.
…		…
811	// do wcwidth before further replacements, as wcwidth might return -1	838	// do wcwidth before further replacements, as wcwidth might return -1
812	// for the line drawing characters below as they might be invalid in the current	839	// for the line drawing characters below as they might be invalid in the current
813	// locale.	840	// locale.
814	int width = c < 0x100 ? 1 : wcwidth (c);	841	int width = c < 0x100 ? 1 : wcwidth (c);
815		842
816	if (charsets[screen.charset] == '0') // DEC SPECIAL	843	if (charsets [screen.charset] == '0') // DEC SPECIAL
817	{	844	{
818	// vt100 special graphics and line drawing	845	// vt100 special graphics and line drawing
819	// 5f-7e standard vt100	846	// 5f-7e standard vt100
820	// 40-5e rxvt extension for extra curses acs chars	847	// 40-5e rxvt extension for extra curses acs chars
821	static uint16_t vt100_0[62] = { // 41 .. 7e	848	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
873	}	900	}
874		901
875	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	902	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876		903
877	// if the character doesn't fit into the remaining columns...	904	// if the character doesn't fit into the remaining columns...
878	if (screen.cur.col > last_col - width && last_col >= width)	905	if (screen.cur.col > ncol - width && ncol >= width)
879	{	906	{
880	// ...output spaces	907	// ...output spaces
881	c = ' ';	908	c = ' ';
882	// and try the same character next loop iteration	909	// and try the same character next loop iteration
883	--str;	910	--str;
884	}	911	}
885		912
		913	line->touch ();
		914
886	do	915	do
887	{	916	{
888	line->t[screen.cur.col] = c;	917	line->t[screen.cur.col] = c;
889	line->r[screen.cur.col] = rend;	918	line->r[screen.cur.col] = rend;
890		919
891	if (screen.cur.col < last_col - 1)	920	if (screen.cur.col < ncol - 1)
892	screen.cur.col++;	921	screen.cur.col++;
893	else	922	else
894	{	923	{
895	line->l = last_col;	924	line->l = ncol;
896	if (screen.flags & Screen_Autowrap)	925	if (screen.flags & Screen_Autowrap)
897	screen.flags |= Screen_WrapNext;	926	screen.flags |= Screen_WrapNext;
898	break;	927	break;
899	}	928	}
900		929
…		…
902	}	931	}
903	while (--width > 0);	932	while (--width > 0);
904		933
905	// pad with spaces when overwriting wide character with smaller one	934	// pad with spaces when overwriting wide character with smaller one
906	if (!width)	935	if (!width)
		936	{
		937	line->touch ();
		938
907	for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)	939	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
908	{	940	{
909	line->t[c] = ' ';	941	line->t[c] = ' ';
910	line->r[c] = rend;	942	line->r[c] = rend;
911	}	943	}
		944	}
912	}	945	}
913	else // width == 0	946	else // width == 0
914	{	947	{
915	#if ENABLE_COMBINING	948	#if ENABLE_COMBINING
916	// handle combining characters	949	// handle combining characters
917	// we just tag the accent on the previous on-screen character.	950	// we just tag the accent on the previous on-screen character.
918	// this is arguably not correct, but also arguably not wrong.	951	// this is arguably not correct, but also arguably not wrong.
919	// we don't handle double-width characters nicely yet.	952	// we don't handle double-width characters nicely yet.
		953	line_t *linep;
920	text_t *tp;	954	text_t *tp;
921	rend_t *rp;	955	rend_t *rp;
922		956
923	if (screen.cur.col > 0)	957	if (screen.cur.col > 0)
924	{	958	{
		959	linep = line;
925	tp = line->t + screen.cur.col - 1;	960	tp = line->t + screen.cur.col - 1;
926	rp = line->r + screen.cur.col - 1;	961	rp = line->r + screen.cur.col - 1;
927
928	while (*tp == NOCHAR && tp > line->t)
929	tp--, rp--;
930	}	962	}
931	else if (screen.cur.row > 0	963	else if (screen.cur.row > 0
932	&& ROW(screen.cur.row - 1).is_longer ())	964	&& ROW(screen.cur.row - 1).is_longer ())
933	{	965	{
934	line_t *line = &ROW(screen.cur.row - 1);	966	linep = &ROW(screen.cur.row - 1);
935
936	tp = line->t + last_col - 1;	967	tp = line->t + ncol - 1;
937	rp = line->r + last_col - 1;	968	rp = line->r + ncol - 1;
938
939	while (*tp == NOCHAR && tp > line->t)
940	tp--, rp--;
941	}	969	}
942	else	970	else
943	continue;	971	continue;
		972
		973	linep->touch ();
		974
		975	while (*tp == NOCHAR && tp > linep->t)
		976	tp--, rp--;
944		977
945	// first try to find a precomposed character	978	// first try to find a precomposed character
946	unicode_t n = rxvt_compose (*tp, c);	979	unicode_t n = rxvt_compose (*tp, c);
947	if (n == NOCHAR)	980	if (n == NOCHAR)
948	n = rxvt_composite.compose (*tp, c);	981	n = rxvt_composite.compose (*tp, c);
…		…
951	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));	984	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952	#endif	985	#endif
953	}	986	}
954	}	987	}
955		988
956	if (!line->is_longer ()) /* XXX: think about this */
957	max_it (line->l, screen.cur.col);	989	max_it (line->l, screen.cur.col);
958		990
959	#ifdef DEBUG_STRICT	991	#ifdef DEBUG_STRICT
960	assert (screen.cur.row >= 0);	992	assert (screen.cur.row >= 0);
961	#endif	993	#endif
962	}	994	}
…		…
965	/*	997	/*
966	* Process Backspace. Move back the cursor back a position, wrap if have to	998	* Process Backspace. Move back the cursor back a position, wrap if have to
967	* XTERM_SEQ: CTRL-H	999	* XTERM_SEQ: CTRL-H
968	*/	1000	*/
969	void	1001	void
970	rxvt_term::scr_backspace ()	1002	rxvt_term::scr_backspace () NOTHROW
971	{	1003	{
972	want_refresh = 1;	1004	want_refresh = 1;
973		1005
974	if (screen.cur.col == 0)	1006	if (screen.cur.col == 0)
975	{	1007	{
…		…
993	* Process Horizontal Tab	1025	* Process Horizontal Tab
994	* count: +ve = forward; -ve = backwards	1026	* count: +ve = forward; -ve = backwards
995	* XTERM_SEQ: CTRL-I	1027	* XTERM_SEQ: CTRL-I
996	*/	1028	*/
997	void	1029	void
998	rxvt_term::scr_tab (int count, bool ht)	1030	rxvt_term::scr_tab (int count, bool ht) NOTHROW
999	{	1031	{
1000	int i, x;	1032	int i, x;
1001		1033
1002	want_refresh = 1;	1034	want_refresh = 1;
1003	i = x = screen.cur.col;	1035	i = x = screen.cur.col;
…		…
1012		1044
1013	for (; ++i < ncol; )	1045	for (; ++i < ncol; )
1014	if (tabs[i])	1046	if (tabs[i])
1015	{	1047	{
1016	x = i;	1048	x = i;
		1049
1017	if (!--count)	1050	if (!--count)
1018	break;	1051	break;
1019	}	1052	}
1020	else	1053	else
1021	ht &= l.t[i] == ' '	1054	ht &= l.t[i] == ' '
…		…
1028	// buffer so they can be selected and pasted.	1061	// buffer so they can be selected and pasted.
1029	if (ht && OPTION (Opt_pastableTabs))	1062	if (ht && OPTION (Opt_pastableTabs))
1030	{	1063	{
1031	base_rend = SET_FONT (base_rend, 0);	1064	base_rend = SET_FONT (base_rend, 0);
1032		1065
1033	if (!l.is_longer ()) /* XXX: think about this */	1066	l.touch (x);
1034	max_it (l.l, x);
1035		1067
1036	i = screen.cur.col;	1068	i = screen.cur.col;
1037		1069
1038	l.t[i] = '\t';	1070	l.t[i] = '\t';
1039	l.r[i] = base_rend;	1071	l.r[i] = base_rend;
…		…
1070	* Move cursor left in row. If we're at the left boundary, shift everything	1102	* Move cursor left in row. If we're at the left boundary, shift everything
1071	* in that row right. Clear left column.	1103	* in that row right. Clear left column.
1072	*/	1104	*/
1073	#if ENABLE_FRILLS	1105	#if ENABLE_FRILLS
1074	void	1106	void
1075	rxvt_term::scr_backindex ()	1107	rxvt_term::scr_backindex () NOTHROW
1076	{	1108	{
1077	if (screen.cur.col > 0)	1109	if (screen.cur.col > 0)
1078	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1110	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1079	else	1111	else
1080	scr_insdel_chars (1, INSERT);	1112	scr_insdel_chars (1, INSERT);
…		…
1087	* Move cursor right in row. If we're at the right boundary, shift everything	1119	* Move cursor right in row. If we're at the right boundary, shift everything
1088	* in that row left. Clear right column.	1120	* in that row left. Clear right column.
1089	*/	1121	*/
1090	#if ENABLE_FRILLS	1122	#if ENABLE_FRILLS
1091	void	1123	void
1092	rxvt_term::scr_forwardindex ()	1124	rxvt_term::scr_forwardindex () NOTHROW
1093	{	1125	{
1094	if (screen.cur.col < ncol - 1)	1126	if (screen.cur.col < ncol - 1)
1095	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1127	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096	else	1128	else
1097	{	1129	{
1098	if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN	1130	line_t &l = ROW(screen.cur.row);
1099	ROW(screen.cur.row).l = ncol;	1131
		1132	l.touch ();
		1133	l.is_longer (0);
1100		1134
1101	scr_gotorc (0, 0, R_RELATIVE);	1135	scr_gotorc (0, 0, R_RELATIVE);
1102	scr_insdel_chars (1, DELETE);	1136	scr_insdel_chars (1, DELETE);
1103	scr_gotorc (0, ncol - 1, R_RELATIVE);	1137	scr_gotorc (0, ncol - 1, R_RELATIVE);
1104	}	1138	}
…		…
1108	/* ------------------------------------------------------------------------- */	1142	/* ------------------------------------------------------------------------- */
1109	/*	1143	/*
1110	* Goto Row/Column	1144	* Goto Row/Column
1111	*/	1145	*/
1112	void	1146	void
1113	rxvt_term::scr_gotorc (int row, int col, int relative)	1147	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1114	{	1148	{
1115	want_refresh = 1;	1149	want_refresh = 1;
1116	ZERO_SCROLLBACK ();	1150	ZERO_SCROLLBACK ();
1117		1151
1118	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1152	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1156	/* ------------------------------------------------------------------------- */	1190	/* ------------------------------------------------------------------------- */
1157	/*	1191	/*
1158	* direction should be UP or DN	1192	* direction should be UP or DN
1159	*/	1193	*/
1160	void	1194	void
1161	rxvt_term::scr_index (enum page_dirn direction)	1195	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1162	{	1196	{
1163	int dirn;	1197	int dirn;
1164		1198
1165	want_refresh = 1;	1199	want_refresh = 1;
1166	ZERO_SCROLLBACK ();	1200	ZERO_SCROLLBACK ();
…		…
1185	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1219	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1186	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1220	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1187	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1221	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1188	*/	1222	*/
1189	void	1223	void
1190	rxvt_term::scr_erase_line (int mode)	1224	rxvt_term::scr_erase_line (int mode) NOTHROW
1191	{	1225	{
1192	unsigned int col, num;	1226	unsigned int col, num;
1193		1227
1194	want_refresh = 1;	1228	want_refresh = 1;
1195	ZERO_SCROLLBACK ();	1229	ZERO_SCROLLBACK ();
1196		1230
1197	selection_check (1);	1231	selection_check (1);
1198		1232
1199	line_t &line = ROW(screen.cur.row);	1233	line_t &line = ROW(screen.cur.row);
		1234
		1235	line.touch ();
		1236	line.is_longer (0);
1200		1237
1201	switch (mode)	1238	switch (mode)
1202	{	1239	{
1203	case 0: /* erase to end of line */	1240	case 0: /* erase to end of line */
1204	col = screen.cur.col;	1241	col = screen.cur.col;
…		…
1236	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1273	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1237	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1274	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1238	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1275	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1239	*/	1276	*/
1240	void	1277	void
1241	rxvt_term::scr_erase_screen (int mode)	1278	rxvt_term::scr_erase_screen (int mode) NOTHROW
1242	{	1279	{
1243	int num;	1280	int num;
1244	int32_t row;	1281	int32_t row;
1245	rend_t ren;	1282	rend_t ren;
1246	XGCValues gcvalue;	1283	XGCValues gcvalue;
…		…
1299	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1336	XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300	}	1337	}
1301		1338
1302	for (; num--; row++)	1339	for (; num--; row++)
1303	{	1340	{
1304	ROW (row).l = 0;
1305	scr_blank_screen_mem (ROW (row), rstyle);	1341	scr_blank_screen_mem (ROW(row), rstyle);
1306	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1342	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307	}	1343	}
1308	}	1344	}
1309		1345
1310	#if ENABLE_FRILLS	1346	#if ENABLE_FRILLS
1311	void	1347	void
1312	rxvt_term::scr_erase_savelines ()	1348	rxvt_term::scr_erase_savelines () NOTHROW
1313	{	1349	{
1314	want_refresh = 1;	1350	want_refresh = 1;
1315	ZERO_SCROLLBACK ();	1351	ZERO_SCROLLBACK ();
1316		1352
1317	nsaved = 0;	1353	top_row = 0;
1318	}	1354	}
1319	#endif	1355	#endif
1320		1356
1321	/* ------------------------------------------------------------------------- */	1357	/* ------------------------------------------------------------------------- */
1322	/*	1358	/*
1323	* Fill the screen with `E's	1359	* Fill the screen with `E's
1324	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1360	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1325	*/	1361	*/
1326	void	1362	void
1327	rxvt_term::scr_E ()	1363	rxvt_term::scr_E () NOTHROW
1328	{	1364	{
1329	rend_t fs;	1365	rend_t fs;
1330		1366
1331	want_refresh = 1;	1367	want_refresh = 1;
1332	ZERO_SCROLLBACK ();	1368	ZERO_SCROLLBACK ();
…		…
1343	rend_t *r1 = line.r;	1379	rend_t *r1 = line.r;
1344		1380
1345	for (int j = ncol; j--; )	1381	for (int j = ncol; j--; )
1346	*r1++ = fs;	1382	*r1++ = fs;
1347		1383
1348	line.l = ncol; /* make the `E's selectable */	1384	line.is_longer (0);
		1385	line.touch (ncol);
1349	}	1386	}
1350	}	1387	}
1351		1388
1352	/* ------------------------------------------------------------------------- */	1389	/* ------------------------------------------------------------------------- */
1353	/*	1390	/*
1354	* Insert/Delete <count> lines	1391	* Insert/Delete <count> lines
1355	*/	1392	*/
1356	void	1393	void
1357	rxvt_term::scr_insdel_lines (int count, int insdel)	1394	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1358	{	1395	{
1359	int end;	1396	int end;
1360		1397
1361	ZERO_SCROLLBACK ();	1398	ZERO_SCROLLBACK ();
1362		1399
…		…
1382	/* ------------------------------------------------------------------------- */	1419	/* ------------------------------------------------------------------------- */
1383	/*	1420	/*
1384	* Insert/Delete <count> characters from the current position	1421	* Insert/Delete <count> characters from the current position
1385	*/	1422	*/
1386	void	1423	void
1387	rxvt_term::scr_insdel_chars (int count, int insdel)	1424	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1388	{	1425	{
1389	int col, row;	1426	int col, row;
1390	rend_t tr;	1427	rend_t tr;
1391		1428
1392	want_refresh = 1;	1429	want_refresh = 1;
…		…
1401	min_it (count, ncol - screen.cur.col);	1438	min_it (count, ncol - screen.cur.col);
1402		1439
1403	row = screen.cur.row;	1440	row = screen.cur.row;
1404		1441
1405	line_t *line = &ROW(row);	1442	line_t *line = &ROW(row);
		1443
		1444	line->touch ();
		1445	line->is_longer (0);
1406		1446
1407	switch (insdel)	1447	switch (insdel)
1408	{	1448	{
1409	case INSERT:	1449	case INSERT:
1410	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1450	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411	{	1451	{
1412	line->t[col] = line->t[col - count];	1452	line->t[col] = line->t[col - count];
1413	line->r[col] = line->r[col - count];	1453	line->r[col] = line->r[col - count];
1414	}	1454	}
1415		1455
1416	if (!line->is_longer ())	1456	line->l = min (line->l + count, ncol);
1417	{
1418	line->l += count;
1419	min_it (line->l, ncol);
1420	}
1421		1457
1422	if (selection.op && current_screen == selection.screen	1458	if (selection.op && current_screen == selection.screen
1423	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1459	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424	{	1460	{
1425	if (selection.end.row != screen.cur.row	1461	if (selection.end.row != screen.cur.row
…		…
1438		1474
1439	case ERASE:	1475	case ERASE:
1440	screen.cur.col += count; /* don't worry if > ncol */	1476	screen.cur.col += count; /* don't worry if > ncol */
1441	selection_check (1);	1477	selection_check (1);
1442	screen.cur.col -= count;	1478	screen.cur.col -= count;
		1479
		1480	line->l = max (line->l - count, 0);
1443	scr_blank_line (*line, screen.cur.col, count, rstyle);	1481	scr_blank_line (*line, screen.cur.col, count, rstyle);
1444	break;	1482	break;
1445		1483
1446	case DELETE:	1484	case DELETE:
1447	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1485	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1450	{	1488	{
1451	line->t[col] = line->t[col + count];	1489	line->t[col] = line->t[col + count];
1452	line->r[col] = line->r[col + count];	1490	line->r[col] = line->r[col + count];
1453	}	1491	}
1454		1492
		1493	line->l = max (line->l - count, 0);
1455	scr_blank_line (*line, ncol - count, count, tr);	1494	scr_blank_line (*line, ncol - count, count, tr);
1456
1457	if (line->is_longer ()) /* break line continuation */
1458	line->l = ncol;
1459
1460	line->l = max (line->l - count, 0);
1461		1495
1462	if (selection.op && current_screen == selection.screen	1496	if (selection.op && current_screen == selection.screen
1463	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1497	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464	{	1498	{
1465	if (selection.end.row != screen.cur.row	1499	if (selection.end.row != screen.cur.row
…		…
1483	/*	1517	/*
1484	* Set the scrolling region	1518	* Set the scrolling region
1485	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1519	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1486	*/	1520	*/
1487	void	1521	void
1488	rxvt_term::scr_scroll_region (int top, int bot)	1522	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1489	{	1523	{
1490	max_it (top, 0);	1524	max_it (top, 0);
1491	min_it (bot, nrow - 1);	1525	min_it (bot, nrow - 1);
1492		1526
1493	if (top > bot)	1527	if (top > bot)
…		…
1503	* Make the cursor visible/invisible	1537	* Make the cursor visible/invisible
1504	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1538	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1505	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1539	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1506	*/	1540	*/
1507	void	1541	void
1508	rxvt_term::scr_cursor_visible (int mode)	1542	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1509	{	1543	{
1510	want_refresh = 1;	1544	want_refresh = 1;
1511		1545
1512	if (mode)	1546	if (mode)
1513	screen.flags |= Screen_VisibleCursor;	1547	screen.flags |= Screen_VisibleCursor;
…		…
1520	* Set/unset automatic wrapping	1554	* Set/unset automatic wrapping
1521	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1555	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1522	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1556	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1523	*/	1557	*/
1524	void	1558	void
1525	rxvt_term::scr_autowrap (int mode)	1559	rxvt_term::scr_autowrap (int mode) NOTHROW
1526	{	1560	{
1527	if (mode)	1561	if (mode)
1528	screen.flags |= Screen_Autowrap;	1562	screen.flags |= Screen_Autowrap;
1529	else	1563	else
1530	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1564	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1539	* and the cursor cannot be moved outside.	1573	* and the cursor cannot be moved outside.
1540	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1574	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1541	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1575	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1542	*/	1576	*/
1543	void	1577	void
1544	rxvt_term::scr_relative_origin (int mode)	1578	rxvt_term::scr_relative_origin (int mode) NOTHROW
1545	{	1579	{
1546	if (mode)	1580	if (mode)
1547	screen.flags |= Screen_Relative;	1581	screen.flags |= Screen_Relative;
1548	else	1582	else
1549	screen.flags &= ~Screen_Relative;	1583	screen.flags &= ~Screen_Relative;
…		…
1556	* Set insert/replace mode	1590	* Set insert/replace mode
1557	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1591	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1558	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1592	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1559	*/	1593	*/
1560	void	1594	void
1561	rxvt_term::scr_insert_mode (int mode)	1595	rxvt_term::scr_insert_mode (int mode) NOTHROW
1562	{	1596	{
1563	if (mode)	1597	if (mode)
1564	screen.flags |= Screen_Insert;	1598	screen.flags |= Screen_Insert;
1565	else	1599	else
1566	screen.flags &= ~Screen_Insert;	1600	screen.flags &= ~Screen_Insert;
…		…
1572	* XTERM_SEQ: Set tab at current column : ESC H	1606	* XTERM_SEQ: Set tab at current column : ESC H
1573	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1607	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1574	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1608	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1575	*/	1609	*/
1576	void	1610	void
1577	rxvt_term::scr_set_tab (int mode)	1611	rxvt_term::scr_set_tab (int mode) NOTHROW
1578	{	1612	{
1579	if (mode < 0)	1613	if (mode < 0)
1580	memset (tabs, 0, ncol * sizeof (char));	1614	memset (tabs, 0, ncol * sizeof (char));
1581	else if (screen.cur.col < ncol)	1615	else if (screen.cur.col < ncol)
1582	tabs[screen.cur.col] = (mode ? 1 : 0);	1616	tabs [screen.cur.col] = !!mode;
1583	}	1617	}
1584		1618
1585	/* ------------------------------------------------------------------------- */	1619	/* ------------------------------------------------------------------------- */
1586	/*	1620	/*
1587	* Set reverse/normal video	1621	* Set reverse/normal video
1588	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1622	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1589	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1623	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1590	*/	1624	*/
1591	void	1625	void
1592	rxvt_term::scr_rvideo_mode (int mode)	1626	rxvt_term::scr_rvideo_mode (int mode) NOTHROW
1593	{	1627	{
1594	XGCValues gcvalue;	1628	XGCValues gcvalue;
1595		1629
1596	if (rvideo != mode)	1630	if (rvideo != mode)
1597	{	1631	{
…		…
1619	/*	1653	/*
1620	* Report current cursor position	1654	* Report current cursor position
1621	* XTERM_SEQ: Report position: ESC [ 6 n	1655	* XTERM_SEQ: Report position: ESC [ 6 n
1622	*/	1656	*/
1623	void	1657	void
1624	rxvt_term::scr_report_position ()	1658	rxvt_term::scr_report_position () NOTHROW
1625	{	1659	{
1626	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1660	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1627	}	1661	}
1628		1662
1629	/* ------------------------------------------------------------------------- *	1663	/* ------------------------------------------------------------------------- *
…		…
1632		1666
1633	/*	1667	/*
1634	* Set font style	1668	* Set font style
1635	*/	1669	*/
1636	void	1670	void
1637	rxvt_term::set_font_style ()	1671	rxvt_term::set_font_style () NOTHROW
1638	{	1672	{
		1673	#if 0
1639	switch (charsets[screen.charset])	1674	switch (charsets [screen.charset])
1640	{	1675	{
1641	case '0': /* DEC Special Character & Line Drawing Set */	1676	case '0': /* DEC Special Character & Line Drawing Set */
1642	break;	1677	break;
1643	case 'A': /* United Kingdom (UK) */	1678	case 'A': /* United Kingdom (UK) */
1644	break;	1679	break;
…		…
1651	case 'C': /* Finnish character set */	1686	case 'C': /* Finnish character set */
1652	break;	1687	break;
1653	case 'K': /* German character set */	1688	case 'K': /* German character set */
1654	break;	1689	break;
1655	}	1690	}
		1691	#endif
1656	}	1692	}
1657		1693
1658	/* ------------------------------------------------------------------------- */	1694	/* ------------------------------------------------------------------------- */
1659	/*	1695	/*
1660	* Choose a font	1696	* Choose a font
…		…
1662	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1698	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1663	* XTERM_SEQ: Invoke G2 character set: ESC N	1699	* XTERM_SEQ: Invoke G2 character set: ESC N
1664	* XTERM_SEQ: Invoke G3 character set: ESC O	1700	* XTERM_SEQ: Invoke G3 character set: ESC O
1665	*/	1701	*/
1666	void	1702	void
1667	rxvt_term::scr_charset_choose (int set)	1703	rxvt_term::scr_charset_choose (int set) NOTHROW
1668	{	1704	{
1669	screen.charset = set;	1705	screen.charset = set;
1670	set_font_style ();	1706	set_font_style ();
1671	}	1707	}
1672		1708
…		…
1678	* XTERM_SEQ: Set G2 character set: ESC * <C>	1714	* XTERM_SEQ: Set G2 character set: ESC * <C>
1679	* XTERM_SEQ: Set G3 character set: ESC + <C>	1715	* XTERM_SEQ: Set G3 character set: ESC + <C>
1680	* See set_font_style for possible values for <C>	1716	* See set_font_style for possible values for <C>
1681	*/	1717	*/
1682	void	1718	void
1683	rxvt_term::scr_charset_set (int set, unsigned int ch)	1719	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1684	{	1720	{
1685	charsets[set] = (unsigned char)ch;	1721	charsets[set] = (unsigned char)ch;
1686	set_font_style ();	1722	set_font_style ();
1687	}	1723	}
1688		1724
…		…
1693		1729
1694	/*	1730	/*
1695	* refresh matching text.	1731	* refresh matching text.
1696	*/	1732	*/
1697	bool	1733	bool
1698	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1734	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1699	{	1735	{
1700	bool found = false;	1736	bool found = false;
1701		1737
1702	for (int i = 0; i < nrow; i++)	1738	for (int i = 0; i < nrow; i++)
1703	{	1739	{
…		…
1723	PART_END,	1759	PART_END,
1724	RC_COUNT	1760	RC_COUNT
1725	};	1761	};
1726		1762
1727	void	1763	void
1728	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1764	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1729	{	1765	{
1730	int i;	1766	int i;
1731	row_col_t rc[RC_COUNT];	1767	row_col_t rc[RC_COUNT];
1732		1768
1733	if (!drawn_buf) /* sanity check */	1769	if (!drawn_buf) /* sanity check */
…		…
1756	}	1792	}
1757		1793
1758	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1794	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1759	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1795	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1760		1796
		1797	num_scr_allow = 0;
		1798
1761	if (refresh)	1799	if (refresh)
1762	scr_refresh (SLOW_REFRESH);	1800	scr_refresh ();
1763	}	1801	}
1764		1802
1765	/* ------------------------------------------------------------------------- */	1803	/* ------------------------------------------------------------------------- */
1766	/*	1804	/*
1767	* Refresh the entire screen	1805	* Refresh the entire screen
1768	*/	1806	*/
1769	void	1807	void
1770	rxvt_term::scr_touch (bool refresh)	1808	rxvt_term::scr_touch (bool refresh) NOTHROW
1771	{	1809	{
1772	scr_expose (0, 0, width, height, refresh);	1810	scr_expose (0, 0, width, height, refresh);
1773	}	1811	}
1774		1812
1775	/* ------------------------------------------------------------------------- */	1813	/* ------------------------------------------------------------------------- */
1776	/*	1814	/*
1777	* Move the display so that the line represented by scrollbar value Y is at	1815	* Move the display so that the line represented by scrollbar value Y is at
1778	* the top of the screen	1816	* the top of the screen
1779	*/	1817	*/
1780	int	1818	void
1781	rxvt_term::scr_move_to (int y, int len)	1819	rxvt_term::scr_move_to (int y, int len) NOTHROW
1782	{	1820	{
1783	long p = 0;	1821	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784	unsigned int oldviewstart;
1785
1786	oldviewstart = view_start;
1787
1788	if (y < len)
1789	{
1790	p = (nrow + nsaved) * (len - y) / len;
1791	p -= (long) (nrow - 1);
1792	p = max (p, 0);
1793	}
1794
1795	view_start = (unsigned int)min (p, nsaved);
1796
1797	return scr_changeview (oldviewstart);
1798	}	1822	}
1799		1823
1800	/* ------------------------------------------------------------------------- */	1824	/* ------------------------------------------------------------------------- */
1801	/*	1825	/*
1802	* Page the screen up/down nlines	1826	* Page the screen up/down nlines
1803	* direction should be UP or DN	1827	* direction should be UP or DN
1804	*/	1828	*/
1805	int	1829	bool
1806	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1830	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1807	{	1831	{
1808	int n;	1832	int new_view_start =
1809	unsigned int oldviewstart;
1810
1811	oldviewstart = view_start;
1812
1813	if (direction == UP)
1814	{
1815	n = view_start + nlines;
1816	view_start = min (n, nsaved);
1817	}
1818	else
1819	{
1820	n = view_start - nlines;	1833	direction == UP ? view_start - nlines
1821	view_start = max (n, 0);	1834	: view_start + nlines;
1822	}
1823		1835
1824	return scr_changeview (oldviewstart);	1836	return scr_changeview (new_view_start);
1825	}	1837	}
1826		1838
1827	int	1839	bool
1828	rxvt_term::scr_changeview (unsigned int oldviewstart)	1840	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1829	{	1841	{
		1842	clamp_it (new_view_start, top_row, 0);
		1843
		1844	if (new_view_start == view_start)
		1845	return false;
		1846
		1847	num_scr += new_view_start - view_start;
		1848	view_start = new_view_start;
		1849	want_refresh = 1;
		1850
1830	PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1851	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831		1852
1832	if (view_start != oldviewstart)	1853	return true;
1833	{
1834	want_refresh = 1;
1835	num_scr -= (view_start - oldviewstart);
1836	}
1837
1838	return (int) (view_start - oldviewstart);
1839	}	1854	}
1840		1855
1841	/* ------------------------------------------------------------------------- */	1856	/* ------------------------------------------------------------------------- */
1842	void	1857	void
1843	rxvt_term::scr_bell ()	1858	rxvt_term::scr_bell () NOTHROW
1844	{	1859	{
1845	#ifndef NO_BELL	1860	#ifndef NO_BELL
1846		1861
1847	# ifndef NO_MAPALERT	1862	# ifndef NO_MAPALERT
1848	# ifdef MAPALERT_OPTION	1863	# ifdef MAPALERT_OPTION
…		…
1852	# endif	1867	# endif
1853		1868
1854	if (OPTION (Opt_visualBell))	1869	if (OPTION (Opt_visualBell))
1855	{	1870	{
1856	scr_rvideo_mode (!rvideo); /* refresh also done */	1871	scr_rvideo_mode (!rvideo); /* refresh also done */
		1872	display->flush ();
1857	rxvt_usleep (VISUAL_BELL_DURATION);	1873	rxvt_usleep (VISUAL_BELL_DURATION);
1858	scr_rvideo_mode (!rvideo); /* refresh also done */	1874	scr_rvideo_mode (!rvideo); /* refresh also done */
1859	}	1875	}
1860	else	1876	else
1861	XBell (display->display, 0);	1877	XBell (display->display, 0);
…		…
1864	}	1880	}
1865		1881
1866	/* ------------------------------------------------------------------------- */	1882	/* ------------------------------------------------------------------------- */
1867	/* ARGSUSED */	1883	/* ARGSUSED */
1868	void	1884	void
1869	rxvt_term::scr_printscreen (int fullhist)	1885	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1870	{	1886	{
1871	#ifdef PRINTPIPE	1887	#ifdef PRINTPIPE
1872	int nrows, row_start;	1888	int nrows, row_start;
1873	FILE *fd;	1889	FILE *fd;
1874		1890
1875	if ((fd = popen_printer ()) == NULL)	1891	if ((fd = popen_printer ()) == NULL)
1876	return;	1892	return;
1877		1893
1878	if (fullhist)	1894	if (fullhist)
1879	{	1895	{
1880	nrows = nrow + nsaved;	1896	nrows = nrow - top_row;
1881	row_start = -nsaved;	1897	row_start = top_row;
1882	}	1898	}
1883	else	1899	else
1884	{	1900	{
1885	nrows = nrow;	1901	nrows = nrow;
1886	row_start = -view_start;	1902	row_start = view_start;
1887	}	1903	}
1888		1904
1889	wctomb (0, 0);	1905	wctomb (0, 0);
1890		1906
1891	for (int r1 = 0; r1 < nrows; r1++)	1907	for (int r1 = 0; r1 < nrows; r1++)
…		…
1923	* Refresh the screen	1939	* Refresh the screen
1924	* drawn_text/drawn_rend contain the screen information before the update.	1940	* drawn_text/drawn_rend contain the screen information before the update.
1925	* screen.text/screen.rend contain what the screen will change to.	1941	* screen.text/screen.rend contain what the screen will change to.
1926	*/	1942	*/
1927	void	1943	void
1928	rxvt_term::scr_refresh (unsigned char refresh_type)	1944	rxvt_term::scr_refresh () NOTHROW
1929	{	1945	{
1930	unsigned char must_clear, /* use draw_string not draw_image_string */	1946	unsigned char must_clear, /* use draw_string not draw_image_string */
1931	showcursor; /* show the cursor */	1947	showcursor; /* show the cursor */
1932	int16_t col, row, /* column/row we're processing */	1948	int16_t col, row, /* column/row we're processing */
1933	ocrow; /* old cursor row */	1949	ocrow; /* old cursor row */
…		…
2019		2035
2020	/* make sure no outline cursor is left around */	2036	/* make sure no outline cursor is left around */
2021	setoldcursor = 0;	2037	setoldcursor = 0;
2022	if (ocrow != -1)	2038	if (ocrow != -1)
2023	{	2039	{
2024	if (screen.cur.row + view_start != ocrow	2040	if (screen.cur.row - view_start != ocrow
2025	|| screen.cur.col != oldcursor.col)	2041	|| screen.cur.col != oldcursor.col)
2026	{	2042	{
2027	if (ocrow < nrow	2043	if (ocrow < nrow
2028	&& oldcursor.col < ncol)	2044	&& oldcursor.col < ncol)
2029	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);	2045	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
…		…
2037	else if (!focus)	2053	else if (!focus)
2038	setoldcursor = 1;	2054	setoldcursor = 1;
2039		2055
2040	if (setoldcursor)	2056	if (setoldcursor)
2041	{	2057	{
2042	if (screen.cur.row + view_start >= nrow)	2058	if (screen.cur.row - view_start >= nrow)
2043	oldcursor.row = -1;	2059	oldcursor.row = -1;
2044	else	2060	else
2045	{	2061	{
2046	oldcursor.row = screen.cur.row + view_start;	2062	oldcursor.row = screen.cur.row - view_start;
2047	oldcursor.col = screen.cur.col;	2063	oldcursor.col = screen.cur.col;
2048	}	2064	}
2049	}	2065	}
2050	}	2066	}
2051		2067
2052	PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2068	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053	#if ENABLE_OVERLAY	2069	#if ENABLE_OVERLAY
2054	scr_swap_overlay ();	2070	scr_swap_overlay ();
2055	#endif	2071	#endif
2056		2072
2057	#ifndef NO_SLOW_LINK_SUPPORT	2073	#ifndef NO_SLOW_LINK_SUPPORT
2058	/*	2074	/*
2059	* D: CopyArea pass - very useful for slower links	2075	* D: CopyArea pass - very useful for slower links
2060	* This has been deliberately kept simple.	2076	* This has been deliberately kept simple.
2061	*/	2077	*/
2062	i = num_scr;
2063	if (!display->is_local	2078	if (!display->is_local
2064	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2079	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065	&& abs (num_scr) < nrow && !must_clear)	2080	&& abs (num_scr) < nrow && !must_clear)
2066	{	2081	{
2067	int16_t nits;	2082	int16_t nits;
2068	int j;	2083	int j;
2069	int len, wlen;	2084	int len, wlen;
		2085	dLocal (int, num_scr);
2070		2086
2071	j = nrow;	2087	j = nrow;
2072	wlen = len = -1;	2088	wlen = len = -1;
2073	row = i > 0 ? 0 : j - 1;	2089	row = i > 0 ? 0 : j - 1;
2074	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2090	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075	{	2091	{
2076	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2092	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077	{	2093	{
2078	line_t s = ROW(row - view_start);	2094	line_t s = ROW(view_start + row);
2079	line_t d = drawn_buf[row];	2095	line_t d = drawn_buf[row];
2080	line_t d2 = drawn_buf[row + i];	2096	line_t d2 = drawn_buf[row + i];
2081		2097
2082	for (nits = 0, col = ncol; col--; )	2098	for (nits = 0, col = ncol; col--; )
2083	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])	2099	if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
…		…
2107	if (wlen < len)	2123	if (wlen < len)
2108	::swap (wlen, len);	2124	::swap (wlen, len);
2109		2125
2110	XCopyArea (display->display, vt, vt,	2126	XCopyArea (display->display, vt, vt,
2111	gc, 0, Row2Pixel (len + i),	2127	gc, 0, Row2Pixel (len + i),
2112	(unsigned int)TermWin_TotalWidth (),	2128	(unsigned int)this->width,
2113	(unsigned int)Height2Pixel (wlen - len + 1),	2129	(unsigned int)Height2Pixel (wlen - len + 1),
2114	0, Row2Pixel (len));	2130	0, Row2Pixel (len));
2115	len = -1;	2131	len = -1;
2116	}	2132	}
2117	}	2133	}
…		…
2121	/*	2137	/*
2122	* E: main pass across every character	2138	* E: main pass across every character
2123	*/	2139	*/
2124	for (row = 0; row < nrow; row++)	2140	for (row = 0; row < nrow; row++)
2125	{	2141	{
2126	text_t *stp = ROW(row - view_start).t;	2142	text_t *stp = ROW(view_start + row).t;
2127	rend_t *srp = ROW(row - view_start).r;	2143	rend_t *srp = ROW(view_start + row).r;
2128	text_t *dtp = drawn_buf[row].t;	2144	text_t *dtp = drawn_buf[row].t;
2129	rend_t *drp = drawn_buf[row].r;	2145	rend_t *drp = drawn_buf[row].r;
2130		2146
2131	/*	2147	/*
2132	* E2: OK, now the real pass	2148	* E2: OK, now the real pass
…		…
2320	} /* for (row....) */	2336	} /* for (row....) */
2321		2337
2322	#if ENABLE_OVERLAY	2338	#if ENABLE_OVERLAY
2323	scr_swap_overlay ();	2339	scr_swap_overlay ();
2324	#endif	2340	#endif
2325	PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));	2341	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326		2342
2327	/*	2343	/*
2328	* G: cleanup cursor and display outline cursor if necessary	2344	* G: cleanup cursor and display outline cursor if necessary
2329	*/	2345	*/
2330	if (showcursor)	2346	if (showcursor)
…		…
2369	/*	2385	/*
2370	* H: cleanup selection	2386	* H: cleanup selection
2371	*/	2387	*/
2372	scr_reverse_selection ();	2388	scr_reverse_selection ();
2373		2389
2374	if (refresh_type & SMOOTH_REFRESH)
2375	XFlush (display->display);
2376
2377	num_scr = 0;	2390	num_scr = 0;
2378	num_scr_allow = 1;	2391	num_scr_allow = 1;
2379	}	2392	}
2380		2393
2381	void	2394	void
2382	rxvt_term::scr_remap_chars (const line_t &l)	2395	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2383	{	2396	{
2384	if (!l.t)	2397	if (!l.t)
2385	return;	2398	return;
2386		2399
		2400	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
		2401
2387	for (int i = ncol; i--; )	2402	for (int i = ncol; i--; )
2388	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2403	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389	}	2404	}
2390		2405
2391	void	2406	void
2392	rxvt_term::scr_remap_chars ()	2407	rxvt_term::scr_remap_chars () NOTHROW
2393	{	2408	{
2394	for (int i = total_rows; i--; )	2409	for (int i = total_rows; i--; )
2395	scr_remap_chars (row_buf [i]);	2410	scr_remap_chars (row_buf [i]);
2396		2411
2397	for (int i = nrow; i--; )	2412	for (int i = nrow; i--; )
…		…
2400	scr_remap_chars (swap_buf [i]);	2415	scr_remap_chars (swap_buf [i]);
2401	}	2416	}
2402	}	2417	}
2403		2418
2404	void	2419	void
2405	rxvt_term::scr_recolour ()	2420	rxvt_term::scr_recolour () NOTHROW
2406	{	2421	{
2407	if (1	2422	if (1
2408	#if TRANSPARENT	2423	#if TRANSPARENT
2409	&& !am_transparent	2424	&& !am_transparent
2410	#endif	2425	#endif
…		…
2431	want_refresh = 1;	2446	want_refresh = 1;
2432	}	2447	}
2433		2448
2434	/* ------------------------------------------------------------------------- */	2449	/* ------------------------------------------------------------------------- */
2435	void	2450	void
2436	rxvt_term::scr_clear (bool really)	2451	rxvt_term::scr_clear (bool really) NOTHROW
2437	{	2452	{
2438	if (!mapped)	2453	if (!mapped)
2439	return;	2454	return;
2440		2455
2441	num_scr_allow = 0;	2456	num_scr_allow = 0;
…		…
2443		2458
2444	if (really)	2459	if (really)
2445	XClearWindow (display->display, vt);	2460	XClearWindow (display->display, vt);
2446	}	2461	}
2447		2462
2448	/* ------------------------------------------------------------------------- */
2449	void	2463	void
		2464	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
		2465	{
		2466	int view_end = view_start + nrow;
		2467	int row, col;
		2468
		2469	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
		2470	{
		2471	text_t *stp = ROW(row).t;
		2472	rend_t *srp = ROW(row).r;
		2473
		2474	for (col = beg_col; col < end_col; col++)
		2475	srp[col] ^= rstyle1;
		2476
		2477	while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
		2478	srp[col] ^= rstyle2;
		2479
		2480	if (++col < end_col)
		2481	srp[col] ^= rstyle2;
		2482	}
		2483	}
		2484
		2485	void
		2486	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
		2487	{
		2488	int view_end = view_start + nrow;
		2489	int row, col;
		2490
		2491	if (beg_row >= view_start)
		2492	{
		2493	col = beg_col;
		2494	row = beg_row;
		2495	}
		2496	else
		2497	{
		2498	col = 0;
		2499	row = view_start;
		2500	}
		2501
		2502	for (; row < min (end_row, view_end); row++, col = 0)
		2503	for (rend_t *srp = ROW(row).r; col < ncol; col++)
		2504	srp[col] ^= rstyle;
		2505
		2506	if (row == end_row)
		2507	for (rend_t *srp = ROW(row).r; col < end_col; col++)
		2508	srp[col] ^= rstyle;
		2509	}
		2510
		2511	/* ------------------------------------------------------------------------- */
		2512	void
2450	rxvt_term::scr_reverse_selection ()	2513	rxvt_term::scr_reverse_selection () NOTHROW
2451	{	2514	{
2452	if (selection.op	2515	if (selection.op
2453	&& current_screen == selection.screen	2516	&& current_screen == selection.screen
2454	&& selection.end.row >= -view_start)	2517	&& selection.end.row >= view_start)
2455	{	2518	{
2456	int view_end = -view_start + nrow;
2457	int row, col;
2458
2459	#if ENABLE_FRILLS	2519	#if ENABLE_FRILLS
2460	if (selection.rect)	2520	if (selection.rect)
2461	{	2521	scr_xor_rect (selection.beg.row, selection.beg.col,
2462	for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)	2522	selection.end.row, selection.end.col,
2463	{	2523	RS_RVid, RS_RVid | RS_Uline);
2464	text_t *stp = ROW(row).t;
2465	rend_t *srp = ROW(row).r;
2466
2467	for (col = selection.beg.col; col < selection.end.col; col++)
2468	srp[col] ^= RS_RVid;
2469
2470	while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471	srp[col] ^= RS_RVid | RS_Uline;
2472
2473	if (++col < selection.end.col)
2474	srp[col] ^= RS_RVid | RS_Uline;
2475	}
2476	}
2477	else	2524	else
2478	#endif	2525	#endif
2479	{	2526	scr_xor_span (selection.beg.row, selection.beg.col,
2480	if (selection.beg.row >= -view_start)	2527	selection.end.row, selection.end.col,
2481	{	2528	RS_RVid);
2482	col = selection.beg.col;
2483	row = selection.beg.row;
2484	}
2485	else
2486	{
2487	col = 0;
2488	row = -view_start;
2489	}
2490
2491	for (; row < min (selection.end.row, view_end); row++, col = 0)
2492	for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493	srp[col] ^= RS_RVid;
2494
2495	if (row == selection.end.row)
2496	for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497	srp[col] ^= RS_RVid;
2498	}
2499	}	2529	}
2500	}	2530	}
2501		2531
2502	/* ------------------------------------------------------------------------- */	2532	/* ------------------------------------------------------------------------- */
2503	/*	2533	/*
2504	* Dump the whole scrollback and screen to the passed filedescriptor. The	2534	* Dump the whole scrollback and screen to the passed filedescriptor. The
2505	* invoking routine must close the fd.	2535	* invoking routine must close the fd.
2506	*/	2536	*/
2507	#if 0	2537	#if 0
2508	void	2538	void
2509	rxvt_term::scr_dump (int fd)	2539	rxvt_term::scr_dump (int fd) NOTHROW
2510	{	2540	{
2511	int row, wrote;	2541	int row, wrote;
2512	unsigned int width, towrite;	2542	unsigned int width, towrite;
2513	char r1[] = "\n";	2543	char r1[] = "\n";
2514		2544
…		…
2533		2563
2534	/* ------------------------------------------------------------------------- *	2564	/* ------------------------------------------------------------------------- *
2535	* CHARACTER SELECTION *	2565	* CHARACTER SELECTION *
2536	* ------------------------------------------------------------------------- */	2566	* ------------------------------------------------------------------------- */
2537	void	2567	void
2538	rxvt_term::selection_check (int check_more)	2568	rxvt_term::selection_check (int check_more) NOTHROW
2539	{	2569	{
2540	row_col_t pos;	2570	row_col_t pos;
2541		2571
2542	if (!selection.op)	2572	if (!selection.op)
2543	return;	2573	return;
2544		2574
2545	pos.row = pos.col = 0;	2575	pos.row = pos.col = 0;
2546	if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)	2576	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547	|| !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)	2577	|| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548	|| !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)	2578	|| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549	|| (check_more == 1	2579	|| (check_more == 1
2550	&& current_screen == selection.screen	2580	&& current_screen == selection.screen
2551	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2581	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2582	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553	|| (check_more == 2	2583	|| (check_more == 2
…		…
2564	/* ------------------------------------------------------------------------- */	2594	/* ------------------------------------------------------------------------- */
2565	/*	2595	/*
2566	* Paste a selection direct to the command fd	2596	* Paste a selection direct to the command fd
2567	*/	2597	*/
2568	void	2598	void
2569	rxvt_term::paste (unsigned char *data, unsigned int len)	2599	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2570	{	2600	{
2571	/* convert normal newline chars into common keyboard Return key sequence */	2601	/* convert normal newline chars into common keyboard Return key sequence */
2572	for (unsigned int i = 0; i < len; i++)	2602	for (unsigned int i = 0; i < len; i++)
2573	if (data[i] == C0_LF)	2603	if (data[i] == C0_LF)
2574	data[i] = C0_CR;	2604	data[i] = C0_CR;
…		…
2580	/*	2610	/*
2581	* Respond to a notification that a primary selection has been sent	2611	* Respond to a notification that a primary selection has been sent
2582	* EXT: SelectionNotify	2612	* EXT: SelectionNotify
2583	*/	2613	*/
2584	void	2614	void
2585	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2615	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2586	{	2616	{
2587	if (prop == None) /* check for failed XConvertSelection */	2617	if (prop == None) /* check for failed XConvertSelection */
2588	{	2618	{
2589	if ((selection_type & Sel_CompoundText))	2619	if ((selection_type & Sel_CompoundText))
2590	{	2620	{
…		…
2718	{	2748	{
2719	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2749	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720	char *s = rxvt_wcstombs (w);	2750	char *s = rxvt_wcstombs (w);
2721	free (w);	2751	free (w);
2722	// TODO: strlen == only the first element will be converted. well...	2752	// TODO: strlen == only the first element will be converted. well...
2723	paste ((unsigned char *)s, strlen (s));	2753	paste (s, strlen (s));
2724	free (s);	2754	free (s);
2725	}	2755	}
2726	else	2756	else
2727	#endif	2757	#endif
2728	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2758	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729	&& cl)	2759	&& cl)
2730	{	2760	{
2731	for (int i = 0; i < cr; i++)	2761	for (int i = 0; i < cr; i++)
2732	paste ((unsigned char *)cl[i], strlen (cl[i]));	2762	paste (cl[i], strlen (cl[i]));
2733		2763
2734	XFreeStringList (cl);	2764	XFreeStringList (cl);
2735	}	2765	}
2736	else	2766	else
2737	paste (ct.value, ct.nitems); // paste raw	2767	paste ((char *)ct.value, ct.nitems); // paste raw
2738		2768
2739	bailout:	2769	bailout:
2740	XFree (ct.value);	2770	XFree (ct.value);
2741		2771
2742	if (selection_wait == Sel_normal)	2772	if (selection_wait == Sel_normal)
2743	selection_wait = Sel_none;	2773	selection_wait = Sel_none;
2744	}	2774	}
2745		2775
2746	void	2776	void
2747	rxvt_term::incr_cb (time_watcher &w)	2777	rxvt_term::incr_cb (time_watcher &w) NOTHROW
2748	{	2778	{
2749	selection_wait = Sel_none;	2779	selection_wait = Sel_none;
2750		2780
2751	incr_buf_size = 0;	2781	incr_buf_size = 0;
2752	free (incr_buf);	2782	free (incr_buf);
2753		2783
2754	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2784	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2755	}	2785	}
2756		2786
2757	void	2787	void
2758	rxvt_term::selection_property (Window win, Atom prop)	2788	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2759	{	2789	{
2760	if (prop == None || selection_wait != Sel_incr)	2790	if (prop == None || selection_wait != Sel_incr)
2761	return;	2791	return;
2762		2792
2763	selection_paste (win, prop, true);	2793	selection_paste (win, prop, true);
…		…
2772	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2802	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773	* will auto fallback to CUT_BUFFER0	2803	* will auto fallback to CUT_BUFFER0
2774	* EXT: button 2 release	2804	* EXT: button 2 release
2775	*/	2805	*/
2776	void	2806	void
2777	rxvt_term::selection_request (Time tm, int x, int y)	2807	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2778	{	2808	{
2779	if (x < 0 || x >= width || y < 0 || y >= height)	2809	/* After making a selection with selection_make this function will always
2780	return; /* outside window */	2810	* return the internal selection, which is not correct IMO, now much more since
2781		2811	* I added the selnum parameter.
		2812	*/
		2813	#if 0
2782	if (selection.text)	2814	if (selection.text)
2783	{ /* internal selection */	2815	{ /* internal selection */
2784	char *str = rxvt_wcstombs (selection.text, selection.len);	2816	char *str = rxvt_wcstombs (selection.text, selection.len);
2785	paste ((unsigned char *)str, strlen (str));	2817	paste (str, strlen (str));
2786	free (str);	2818	free (str);
2787	return;	2819	return;
2788	}	2820	}
2789	else	2821	else
		2822	#endif
2790	{	2823	{
2791	int i;
2792
2793	selection_request_time = tm;	2824	selection_request_time = tm;
2794	selection_wait = Sel_normal;	2825	selection_wait = Sel_normal;
2795		2826
2796	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2797	{
2798	#if X_HAVE_UTF8_STRING	2827	#if X_HAVE_UTF8_STRING
2799	selection_type = Sel_UTF8String;	2828	selection_type = Sel_UTF8String;
2800	if (selection_request_other (xa[XA_UTF8_STRING], i))	2829	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2801	return;	2830	return;
2802	#else	2831	#else
2803	selection_type = Sel_CompoundText;	2832	selection_type = Sel_CompoundText;
2804	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2833	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2805	return;	2834	return;
2806	#endif	2835	#endif
2807	}
2808	}	2836	}
2809		2837
2810	selection_wait = Sel_none; /* don't loop in selection_paste () */	2838	selection_wait = Sel_none; /* don't loop in selection_paste () */
2811	selection_paste (display->root, XA_CUT_BUFFER0, false);	2839	selection_paste (display->root, XA_CUT_BUFFER0, false);
2812	}	2840	}
2813		2841
2814	int	2842	int
2815	rxvt_term::selection_request_other (Atom target, int selnum)	2843	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2816	{	2844	{
2817	Atom sel;	2845	Atom sel;
2818		2846
2819	selection_type |= selnum;	2847	selection_type |= selnum;
2820		2848
…		…
2839	/*	2867	/*
2840	* Clear all selected text	2868	* Clear all selected text
2841	* EXT: SelectionClear	2869	* EXT: SelectionClear
2842	*/	2870	*/
2843	void	2871	void
2844	rxvt_term::selection_clear ()	2872	rxvt_term::selection_clear () NOTHROW
2845	{	2873	{
2846	want_refresh = 1;	2874	want_refresh = 1;
2847	free (selection.text);	2875	free (selection.text);
2848	selection.text = NULL;	2876	selection.text = NULL;
2849	selection.len = 0;	2877	selection.len = 0;
…		…
2882	selection.op = SELECTION_DONE;	2910	selection.op = SELECTION_DONE;
2883		2911
2884	if (selection.clicks == 4)	2912	if (selection.clicks == 4)
2885	return; /* nothing selected, go away */	2913	return; /* nothing selected, go away */
2886		2914
2887	if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	2915	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888	return;	2916	return;
2889		2917
2890	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	2918	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));	2919	new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2892		2920
…		…
2906	col = selection.beg.col;	2934	col = selection.beg.col;
2907	end_col = ncol + 1;	2935	end_col = ncol + 1;
2908	}	2936	}
2909	else	2937	else
2910	#endif	2938	#endif
2911	end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN	2939	end_col = ROW(row).l;
2912		2940
2913	col = max (col, 0);	2941	col = max (col, 0);
2914		2942
2915	if (row == selection.end.row	2943	if (row == selection.end.row
2916	#if ENABLE_FRILLS	2944	#if ENABLE_FRILLS
…		…
2918	#endif	2946	#endif
2919	)	2947	)
2920	min_it (end_col, selection.end.col);	2948	min_it (end_col, selection.end.col);
2921		2949
2922	t = ROW(row).t + col;	2950	t = ROW(row).t + col;
		2951
2923	for (; col < end_col; col++)	2952	for (; col < end_col; col++)
2924	{	2953	{
2925	if (*t == NOCHAR)	2954	if (*t == NOCHAR)
2926	t++;	2955	t++;
2927	#if ENABLE_COMBINING	2956	#if ENABLE_COMBINING
…		…
2976		3005
2977	// we usually allocate much more than necessary, so realloc it smaller again	3006	// we usually allocate much more than necessary, so realloc it smaller again
2978	selection.len = ofs;	3007	selection.len = ofs;
2979	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));	3008	selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980		3009
2981	if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))	3010	if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982	return;	3011	return;
2983		3012
2984	selection_grab (tm);	3013	selection_grab (tm);
2985	}	3014	}
2986		3015
2987	bool	3016	bool
2988	rxvt_term::selection_grab (Time tm)	3017	rxvt_term::selection_grab (Time tm) NOTHROW
2989	{	3018	{
2990	selection_time = tm;	3019	selection_time = tm;
2991		3020
2992	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3021	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2993	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3022	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994	{	3023	{
2995	display->set_selection_owner (this);	3024	display->set_selection_owner (this);
2996	return true;	3025	return true;
2997	}	3026	}
2998	else	3027	else
		3028	{
		3029	selection_clear ();
2999	return false;	3030	return false;
		3031	}
3000		3032
3001	#if 0	3033	#if 0
3002	XTextProperty ct;	3034	XTextProperty ct;
3003		3035
3004	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3036	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
…		…
3013	/*	3045	/*
3014	* Mark or select text based upon number of clicks: 1, 2, or 3	3046	* Mark or select text based upon number of clicks: 1, 2, or 3
3015	* EXT: button 1 press	3047	* EXT: button 1 press
3016	*/	3048	*/
3017	void	3049	void
3018	rxvt_term::selection_click (int clicks, int x, int y)	3050	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3019	{	3051	{
3020	clicks = ((clicks - 1) % 3) + 1;	3052	clicks = ((clicks - 1) % 3) + 1;
3021	selection.clicks = clicks; /* save clicks so extend will work */	3053	selection.clicks = clicks; /* save clicks so extend will work */
3022		3054
		3055	if (clicks == 2 && !selection.rect
		3056	&& HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
		3057	{
		3058	MEvent.clicks = 1; // what a mess
		3059	selection.screen = current_screen;
		3060	selection.op = SELECTION_CONT;
		3061	return;
		3062	}
		3063
3023	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));	3064	selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024		3065
3025	if (clicks == 2 || clicks == 3)	3066	if (clicks == 2 || clicks == 3)
3026	selection_extend_colrow (selection.mark.col,	3067	selection_extend_colrow (selection.mark.col,
3027	selection.mark.row + view_start,	3068	selection.mark.row - view_start,
3028	0, /* button 3 */	3069	0, /* button 3 */
3029	1, /* button press */	3070	1, /* button press */
3030	0); /* click change */	3071	0); /* click change */
3031	}	3072	}
3032		3073
3033	/* ------------------------------------------------------------------------- */	3074	/* ------------------------------------------------------------------------- */
3034	/*	3075	/*
3035	* Mark a selection at the specified col/row	3076	* Mark a selection at the specified col/row
3036	*/	3077	*/
3037	void	3078	void
3038	rxvt_term::selection_start_colrow (int col, int row)	3079	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3039	{	3080	{
3040	want_refresh = 1;	3081	want_refresh = 1;
3041		3082
3042	selection.mark.row = row - view_start;	3083	selection.mark.row = row + view_start;
3043	selection.mark.col = col;	3084	selection.mark.col = col;
3044		3085
3045	selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);	3086	selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3087	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047		3088
3048	while (selection.mark.col > 0	3089	while (selection.mark.col > 0
3049	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3090	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050	--selection.mark.col;	3091	--selection.mark.col;
…		…
3069	#define DELIMIT_TEXT(x) \	3110	#define DELIMIT_TEXT(x) \
3070	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3111	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3071	#define DELIMIT_REND(x) 1	3112	#define DELIMIT_REND(x) 1
3072		3113
3073	void	3114	void
3074	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3115	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3075	{	3116	{
3076	int col, row, dirnadd, tcol, trow, w1, w2;	3117	int col, row, dirnadd, tcol, trow, w1, w2;
3077	row_col_t bound;	3118	row_col_t bound;
3078	text_t *stp;	3119	text_t *stp;
3079	rend_t *srp;	3120	rend_t *srp;
3080		3121
3081	if (dirn == UP)	3122	if (dirn == UP)
3082	{	3123	{
3083	bound.row = - nsaved - 1;	3124	bound.row = top_row - 1;
3084	bound.col = 0;	3125	bound.col = 0;
3085	dirnadd = -1;	3126	dirnadd = -1;
3086	}	3127	}
3087	else	3128	else
3088	{	3129	{
…		…
3136	}	3177	}
3137	}	3178	}
3138	break;	3179	break;
3139	}	3180	}
3140		3181
3141	Old_Word_Selection_You_Die:
3142	if (dirn == DN)	3182	if (dirn == DN)
3143	col++; /* put us on one past the end */	3183	col++; /* put us on one past the end */
3144		3184
3145	/* Poke the values back in */	3185	/* Poke the values back in */
3146	ret->row = row;	3186	ret->row = row;
…		…
3154	* flag == 0 ==> button 1	3194	* flag == 0 ==> button 1
3155	* flag == 1 ==> button 3 press	3195	* flag == 1 ==> button 3 press
3156	* flag == 2 ==> button 3 motion	3196	* flag == 2 ==> button 3 motion
3157	*/	3197	*/
3158	void	3198	void
3159	rxvt_term::selection_extend (int x, int y, int flag)	3199	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3160	{	3200	{
3161	int col = clamp (Pixel2Col (x), 0, ncol);	3201	int col = clamp (Pixel2Col (x), 0, ncol);
3162	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3202	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3163		3203
3164	/*	3204	/*
…		…
3167	* select nothing. Otherwise, if we're to the right of the mark, you have to	3207	* select nothing. Otherwise, if we're to the right of the mark, you have to
3168	* be _past_ a character for it to be selected.	3208	* be _past_ a character for it to be selected.
3169	*/	3209	*/
3170	if (((selection.clicks % 3) == 1) && !flag	3210	if (((selection.clicks % 3) == 1) && !flag
3171	&& (col == selection.mark.col	3211	&& (col == selection.mark.col
3172	&& (row == selection.mark.row + view_start)))	3212	&& (row == selection.mark.row - view_start)))
3173	{	3213	{
3174	/* select nothing */	3214	/* select nothing */
3175	selection.beg.row = selection.end.row = 0;	3215	selection.beg.row = selection.end.row = 0;
3176	selection.beg.col = selection.end.col = 0;	3216	selection.beg.col = selection.end.col = 0;
3177	selection.clicks = 4;	3217	selection.clicks = 4;
…		…
3190	/* ------------------------------------------------------------------------- */	3230	/* ------------------------------------------------------------------------- */
3191	/*	3231	/*
3192	* Extend the selection to the specified col/row	3232	* Extend the selection to the specified col/row
3193	*/	3233	*/
3194	void	3234	void
3195	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3235	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3196	{	3236	{
3197	row_col_t pos;	3237	row_col_t pos;
3198	enum {	3238	enum {
3199	LEFT, RIGHT	3239	LEFT, RIGHT
3200	} closeto = RIGHT;	3240	} closeto = RIGHT;
…		…
3232	selection.beg.col = selection.end.col = selection.mark.col;	3272	selection.beg.col = selection.end.col = selection.mark.col;
3233	selection.beg.row = selection.end.row = selection.mark.row;	3273	selection.beg.row = selection.end.row = selection.mark.row;
3234	}	3274	}
3235		3275
3236	pos.col = col;	3276	pos.col = col;
3237	pos.row = row - view_start;	3277	pos.row = view_start + row;
3238		3278
3239	/*	3279	/*
3240	* This is mainly xterm style selection with a couple of differences, mainly	3280	* This is mainly xterm style selection with a couple of differences, mainly
3241	* in the way button3 drag extension works.	3281	* in the way button3 drag extension works.
3242	* We're either doing: button1 drag; button3 press; or button3 drag	3282	* We're either doing: button1 drag; button3 press; or button3 drag
…		…
3386	#endif	3426	#endif
3387	}	3427	}
3388		3428
3389	#if ENABLE_FRILLS	3429	#if ENABLE_FRILLS
3390	void	3430	void
3391	rxvt_term::selection_remove_trailing_spaces ()	3431	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3392	{	3432	{
3393	int32_t end_col, end_row;	3433	int32_t end_col, end_row;
3394	text_t *stp;	3434	text_t *stp;
3395		3435
3396	end_col = selection.end.col;	3436	end_col = selection.end.col;
…		…
3434	/*	3474	/*
3435	* Double click on button 3 when already selected	3475	* Double click on button 3 when already selected
3436	* EXT: button 3 double click	3476	* EXT: button 3 double click
3437	*/	3477	*/
3438	void	3478	void
3439	rxvt_term::selection_rotate (int x, int y)	3479	rxvt_term::selection_rotate (int x, int y) NOTHROW
3440	{	3480	{
3441	selection.clicks = selection.clicks % 3 + 1;	3481	selection.clicks = selection.clicks % 3 + 1;
3442	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3482	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3443	}	3483	}
3444		3484
…		…
3446	/*	3486	/*
3447	* Respond to a request for our current selection	3487	* Respond to a request for our current selection
3448	* EXT: SelectionRequest	3488	* EXT: SelectionRequest
3449	*/	3489	*/
3450	void	3490	void
3451	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3491	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3452	{	3492	{
3453	XSelectionEvent ev;	3493	XSelectionEvent ev;
3454	dDisp;	3494	dDisp;
3455		3495
3456	ev.type = SelectionNotify;	3496	ev.type = SelectionNotify;
…		…
3584		3624
3585	/*	3625	/*
3586	* return col/row values corresponding to x/y pixel values	3626	* return col/row values corresponding to x/y pixel values
3587	*/	3627	*/
3588	void	3628	void
3589	rxvt_term::pixel_position (int *x, int *y)	3629	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3590	{	3630	{
3591	*x = Pixel2Col (*x);	3631	*x = Pixel2Col (*x);
3592	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */	3632	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3593	*y = Pixel2Row (*y);	3633	*y = Pixel2Row (*y);
3594	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */	3634	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3595	}	3635	}
3596		3636
3597	/* ------------------------------------------------------------------------- */	3637	/* ------------------------------------------------------------------------- */
3598	#ifdef USE_XIM	3638	#ifdef USE_XIM
3599	void	3639	void
3600	rxvt_term::im_set_position (XPoint &pos)	3640	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3601	{	3641	{
3602	XWindowAttributes xwa;	3642	XWindowAttributes xwa;
3603		3643
3604	XGetWindowAttributes (display->display, vt, &xwa);	3644	XGetWindowAttributes (display->display, vt, &xwa);
3605		3645
…		…
3608	}	3648	}
3609	#endif	3649	#endif
3610		3650
3611	#if ENABLE_OVERLAY	3651	#if ENABLE_OVERLAY
3612	void	3652	void
3613	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3653	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3614	{	3654	{
3615	if (nrow < 1 || ncol < 1)	3655	if (nrow < 1 || ncol < 1)
3616	return;	3656	return;
3617		3657
3618	want_refresh = 1;	3658	want_refresh = 1;
…		…
3663	*rp = r;	3703	*rp = r;
3664	}	3704	}
3665	}	3705	}
3666		3706
3667	void	3707	void
3668	rxvt_term::scr_overlay_off ()	3708	rxvt_term::scr_overlay_off () NOTHROW
3669	{	3709	{
3670	if (!ov_text)	3710	if (!ov_text)
3671	return;	3711	return;
3672		3712
3673	want_refresh = 1;	3713	want_refresh = 1;
…		…
3681	delete [] ov_text; ov_text = 0;	3721	delete [] ov_text; ov_text = 0;
3682	delete [] ov_rend; ov_rend = 0;	3722	delete [] ov_rend; ov_rend = 0;
3683	}	3723	}
3684		3724
3685	void	3725	void
3686	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3726	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3687	{	3727	{
3688	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3728	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3689	return;	3729	return;
3690		3730
3691	x++, y++;	3731	x++, y++;
…		…
3693	ov_text[y][x] = text;	3733	ov_text[y][x] = text;
3694	ov_rend[y][x] = rend;	3734	ov_rend[y][x] = rend;
3695	}	3735	}
3696		3736
3697	void	3737	void
3698	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3738	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3699	{	3739	{
3700	while (*s)	3740	while (*s)
3701	scr_overlay_set (x++, y, *s++);	3741	scr_overlay_set (x++, y, *s++);
3702	}	3742	}
3703		3743
3704	void	3744	void
3705	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3745	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3706	{	3746	{
3707	while (*s)	3747	while (*s)
3708	{	3748	{
3709	text_t t = *s++;	3749	text_t t = *s++;
3710	int width = wcwidth (t);	3750	int width = wcwidth (t);
…		…
3716	}	3756	}
3717	}	3757	}
3718	}	3758	}
3719		3759
3720	void	3760	void
3721	rxvt_term::scr_swap_overlay ()	3761	rxvt_term::scr_swap_overlay () NOTHROW
3722	{	3762	{
3723	if (!ov_text)	3763	if (!ov_text)
3724	return;	3764	return;
3725		3765
3726	// swap screen mem with overlay	3766	// swap screen mem with overlay
3727	for (int y = ov_h; y--; )	3767	for (int y = ov_h; y--; )
3728	{	3768	{
3729	text_t *t1 = ov_text[y];	3769	text_t *t1 = ov_text[y];
3730	rend_t *r1 = ov_rend[y];	3770	rend_t *r1 = ov_rend[y];
3731		3771
3732	text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;	3772	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3733	rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;	3773	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3734		3774
3735	for (int x = ov_w; x--; )	3775	for (int x = ov_w; x--; )
3736	{	3776	{
3737	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3777	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3738	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3778	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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