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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

…		…
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-2007 Marc Lehmann <schmorp@schmorp.de>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
		7	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7	*	8	*
8	* This program is free software; you can redistribute it and/or modify	9	* 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	10	* 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	11	* the Free Software Foundation; either version 3 of the License, or
11	* (at your option) any later version.	12	* (at your option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
27	#include "../config.h" /* NECESSARY */	28	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	29	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	30	#include "rxvtperl.h" /* NECESSARY */
30		31
31	#include <inttypes.h>	32	#include <inttypes.h>
32
33	#include "salloc.C" // HACK, should be a separate compile!
34		33
35	static inline void	34	static inline void
36	fill_text (text_t *start, text_t value, int len)	35	fill_text (text_t *start, text_t value, int len)
37	{	36	{
38	while (len--)	37	while (len--)
…		…
98		97
99	/* Fill part/all of a line with blanks. */	98	/* Fill part/all of a line with blanks. */
100	void	99	void
101	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW	100	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102	{	101	{
103	if (!l.t)	102	if (!l.valid ())
104	{	103	{
105	lalloc (l);	104	l.alloc ();
106	col = 0;	105	col = 0;
107	width = ncol;	106	width = ncol;
108	}	107	}
109		108
110	l.touch ();	109	l.touch ();
…		…
152	l.r[col] = rend;	151	l.r[col] = rend;
153	col++;	152	col++;
154	} while (col < ncol && l.t[col] == NOCHAR);	153	} while (col < ncol && l.t[col] == NOCHAR);
155	}	154	}
156		155
		156	// set the rendition of a single wide character beginning at the given column
		157	void
		158	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		159	{
		160	do {
		161	l.r[col] = rend;
		162	col++;
		163	} while (col < ncol && l.t[col] == NOCHAR);
		164	}
		165
157	/* ------------------------------------------------------------------------- *	166	/* ------------------------------------------------------------------------- *
158	* SCREEN INITIALISATION *	167	* SCREEN INITIALISATION *
159	* ------------------------------------------------------------------------- */	168	* ------------------------------------------------------------------------- */
160		169
161	void	170	void
		171	rxvt_term::scr_alloc () NOTHROW
		172	{
		173	int tsize = sizeof (text_t) * ncol;
		174	int rsize = sizeof (rend_t) * ncol;
		175
		176	// we assume that rend_t size is a sufficient alignment
		177	// factor for text_t and line_t values, and we only
		178	// need to adjust tsize.
		179	tsize = (tsize + sizeof (rend_t) - 1);
		180	tsize -= tsize % sizeof (rend_t);
		181
		182	int all_rows = total_rows + nrow + nrow;
		183
		184	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
		185	chunk = chunk_alloc (chunk_size, 0);
		186
		187	char base = (char )chunk + sizeof (line_t) * all_rows;
		188
		189	for (int row = 0; row < all_rows; ++row)
		190	{
		191	line_t &l = ((line_t *)chunk) [row];
		192
		193	l.t = (text_t *)base; base += tsize;
		194	l.r = (rend_t *)base; base += rsize;
		195	l.l = -1;
		196	l.f = 0;
		197	}
		198
		199	drawn_buf = (line_t *)chunk;
		200	swap_buf = drawn_buf + nrow;
		201	row_buf = swap_buf + nrow;
		202	}
		203
		204	void
		205	rxvt_term::copy_line (line_t &dst, line_t &src)
		206	{
		207	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		208	dst.l = min (src.l, ncol);
		209	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		210	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		211	dst.f = src.f;
		212	}
		213
		214	void ecb_cold
162	rxvt_term::scr_reset ()	215	rxvt_term::scr_reset ()
163	{	216	{
164	#if ENABLE_OVERLAY	217	#if ENABLE_OVERLAY
165	scr_overlay_off ();	218	scr_overlay_off ();
166	#endif	219	#endif
…		…
192	total_rows = nrow + saveLines;	245	total_rows = nrow + saveLines;
193		246
194	screen.tscroll = 0;	247	screen.tscroll = 0;
195	screen.bscroll = nrow - 1;	248	screen.bscroll = nrow - 1;
196		249
		250	void *prev_chunk = chunk;
		251	size_t prev_chunk_size = chunk_size;
		252	line_t *prev_drawn_buf = drawn_buf;
		253	line_t *prev_swap_buf = swap_buf;
		254	line_t *prev_row_buf = row_buf;
		255
		256	scr_alloc ();
		257
197	if (!row_buf)	258	if (!prev_row_buf)
198	{	259	{
199	/*
200	* first time called so just malloc everything: don't rely on realloc
201	*/
202	top_row = 0;	260	top_row = 0;
203	term_start = 0;	261	term_start = 0;
204
205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212	for (int row = nrow; row--; )
213	{
214	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217	}
218		262
219	memset (charsets, 'B', sizeof (charsets));	263	memset (charsets, 'B', sizeof (charsets));
220	rstyle = DEFAULT_RSTYLE;	264	rstyle = DEFAULT_RSTYLE;
221	screen.flags = Screen_DefaultFlags;	265	screen.flags = Screen_DefaultFlags;
222	screen.cur.row = screen.cur.col = 0;	266	screen.cur.row = screen.cur.col = 0;
…		…
245	{	289	{
246	/*	290	/*
247	* add or delete rows as appropriate	291	* add or delete rows as appropriate
248	*/	292	*/
249		293
250	rxvt_salloc old_ta = talloc; talloc = new rxvt_salloc (ncol sizeof (text_t));	294	int common_col = min (prev_ncol, ncol);
251	rxvt_salloc old_ra = ralloc; ralloc = new rxvt_salloc (ncol sizeof (rend_t));
252
253	#if 0
254	if (nrow < prev_nrow)
255	{
256	for (int row = nrow; row < prev_nrow; row++)
257	{
258	lfree (swap_buf [row]);
259	lfree (drawn_buf[row]);
260	}
261	}
262	#endif
263
264	drawn_buf = (line_t )rxvt_realloc (drawn_buf, nrow sizeof (line_t));
265	swap_buf = (line_t )rxvt_realloc (swap_buf , nrow sizeof (line_t));
266		295
267	for (int row = min (nrow, prev_nrow); row--; )	296	for (int row = min (nrow, prev_nrow); row--; )
268	{	297	{
269	lresize (drawn_buf[row]);	298	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270	lresize (swap_buf [row]);	299	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271	}	300	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272		301
273	for (int row = prev_nrow; row < nrow; row++)	302	copy_line (swap_buf [row], prev_swap_buf [row]);
274	{	303	}
275	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277	}
278
279	line_t *old_buf = row_buf;
280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281		304
282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	305	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283	int pend = MOD (term_start + top_row , prev_total_rows);	306	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	307	int q = total_rows; // rewrapped row
285		308
…		…
293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	316	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294		317
295	do	318	do
296	{	319	{
297	p = MOD (p - 1, prev_total_rows);	320	p = MOD (p - 1, prev_total_rows);
298	assert (old_buf [MOD (p, prev_total_rows)].t);	321	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299	int plines = 1;	322	int plines = 1;
300	int llen = old_buf [MOD (p, prev_total_rows)].l;	323	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301		324
302	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	325	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303	{	326	{
304	p = MOD (p - 1, prev_total_rows);	327	p = MOD (p - 1, prev_total_rows);
305		328
306	plines++;	329	plines++;
307	llen += prev_ncol;	330	llen += prev_ncol;
…		…
320		343
321	// re-assemble the full line by destination lines	344	// re-assemble the full line by destination lines
322	for (int qrow = q; qlines--; qrow++)	345	for (int qrow = q; qlines--; qrow++)
323	{	346	{
324	qline = row_buf + qrow;	347	qline = row_buf + qrow;
325	lalloc (*qline);	348	qline->alloc (); // redundant with next line
326	qline->l = ncol;	349	qline->l = ncol;
327	qline->is_longer (1);	350	qline->is_longer (1);
328		351
329	int qcol = 0;	352	int qcol = 0;
330		353
…		…
345	// this seems to upset applications/shells/readline	368	// this seems to upset applications/shells/readline
346	// least.	369	// least.
347	if (prow == ocur.row)	370	if (prow == ocur.row)
348	screen.cur.row = q - (total_rows - nrow);	371	screen.cur.row = q - (total_rows - nrow);
349		372
350	line_t &pline = old_buf [prow];	373	line_t &pline = prev_row_buf [prow];
351		374
352	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	375	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353		376
354	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	377	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	378	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
376	{	399	{
377	// if no scrollback exists (yet), wing, instead of wrap	400	// if no scrollback exists (yet), wing, instead of wrap
378		401
379	for (int row = min (nrow, prev_nrow); row--; )	402	for (int row = min (nrow, prev_nrow); row--; )
380	{	403	{
381	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	404	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382	line_t &qline = row_buf [row];	405	line_t &dst = row_buf [row];
383		406
384	qline = pline;	407	copy_line (dst, src);
385	lresize (qline);
386	}	408	}
387		409
388	for (int row = prev_nrow; row < nrow; row++)	410	for (int row = prev_nrow; row < nrow; row++)
389	{
390	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	411	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391	}
392		412
393	term_start = 0;	413	term_start = 0;
394	}	414	}
395
396	free (old_buf);
397	delete old_ta;
398	delete old_ra;
399		415
400	clamp_it (screen.cur.row, 0, nrow - 1);	416	clamp_it (screen.cur.row, 0, nrow - 1);
401	clamp_it (screen.cur.col, 0, ncol - 1);	417	clamp_it (screen.cur.col, 0, ncol - 1);
402	}	418	}
403		419
		420	for (int row = nrow; row--; )
		421	{
		422	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		423	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		424	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		425	}
		426
		427	chunk_free (prev_chunk, prev_chunk_size);
		428
404	free (tabs);	429	free (tabs);
405	tabs = (char *)rxvt_malloc (ncol);	430	tabs = (char *)rxvt_malloc (ncol);
406		431
407	for (int col = ncol; col--; )	432	for (int col = ncol; col--; )
408	tabs [col] = col % TABSIZE == 0;	433	tabs [col] = col % TABSIZE == 0;
…		…
415	tt_winch ();	440	tt_winch ();
416		441
417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	442	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418	}	443	}
419		444
420	/* ------------------------------------------------------------------------- */	445	void ecb_cold
421	/*
422	* Free everything. That way malloc debugging can find leakage.
423	*/
424	void
425	rxvt_term::scr_release () NOTHROW	446	rxvt_term::scr_release () NOTHROW
426	{	447	{
427	if (row_buf)	448	chunk_free (chunk, chunk_size);
428	{	449	chunk = 0;
429	delete talloc; talloc = 0;	450	row_buf = 0;
430	delete ralloc; ralloc = 0;
431		451
432	free (row_buf);
433	free (swap_buf);
434	free (drawn_buf);
435	row_buf = 0; // signal that we freed all the arrays above
436
437	free (tabs);	452	free (tabs);
438	tabs = 0;	453	tabs = 0;
439	}
440	}	454	}
441		455
442	/* ------------------------------------------------------------------------- */	456	/* ------------------------------------------------------------------------- */
443	/*	457	/*
444	* Hard/Soft reset	458	* Hard/Soft reset
445	*/	459	*/
446	void	460	void ecb_cold
447	rxvt_term::scr_poweron ()	461	rxvt_term::scr_poweron ()
448	{	462	{
449	scr_release ();	463	scr_release ();
		464
450	prev_nrow = prev_ncol = 0;	465	prev_nrow = prev_ncol = 0;
451	rvideo_mode = false;	466	rvideo_mode = false;
452	scr_soft_reset ();	467	scr_soft_reset ();
453	scr_reset ();	468	scr_reset ();
454		469
455	scr_clear (true);	470	scr_clear (true);
456	scr_refresh ();	471	scr_refresh ();
457	}	472	}
458		473
459	void	474	void ecb_cold
460	rxvt_term::scr_soft_reset ()	475	rxvt_term::scr_soft_reset () NOTHROW
461	{	476	{
462	/* only affects modes, nothing drastic such as clearing the screen */	477	/* only affects modes, nothing drastic such as clearing the screen */
463	#if ENABLE_OVERLAY	478	#if ENABLE_OVERLAY
464	scr_overlay_off ();	479	scr_overlay_off ();
465	#endif	480	#endif
…		…
520	assert (s->cur.row >= 0);	535	assert (s->cur.row >= 0);
521	assert (s->cur.col >= 0);	536	assert (s->cur.col >= 0);
522	}	537	}
523		538
524	void	539	void
525	rxvt_term::scr_swap_screen ()	540	rxvt_term::scr_swap_screen () NOTHROW
526	{	541	{
527	if (!option (Opt_secondaryScreen))	542	if (!option (Opt_secondaryScreen))
528	return;	543	return;
529		544
530	for (int i = prev_nrow; i--; )	545	for (int i = prev_nrow; i--; )
…		…
549	return;	564	return;
550		565
551	want_refresh = 1;	566	want_refresh = 1;
552	view_start = 0;	567	view_start = 0;
553		568
554	selection_check (2); /* check for boundary cross */	569	/* check for boundary cross */
		570	row_col_t pos;
		571	pos.row = pos.col = 0;
		572	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		573	&& ROWCOL_IS_AFTER (selection.end, pos))
		574	CLEAR_SELECTION ();
555		575
556	current_screen = scrn;	576	current_screen = scrn;
557		577
558	#if NSCREENS	578	#if NSCREENS
559	if (option (Opt_secondaryScreen))	579	if (option (Opt_secondaryScreen))
…		…
625	/*	645	/*
626	* Scroll text between <row1> and <row2> inclusive, by <count> lines	646	* Scroll text between <row1> and <row2> inclusive, by <count> lines
627	* count positive ==> scroll up	647	* count positive ==> scroll up
628	* count negative ==> scroll down	648	* count negative ==> scroll down
629	*/	649	*/
630	int	650	int ecb_hot
631	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	651	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632	{	652	{
633	if (count == 0 \|\| (row1 > row2))	653	if (count == 0 \|\| (row1 > row2))
634	return 0;	654	return 0;
635		655
…		…
644		664
645	top_row = max (top_row - count, -saveLines);	665	top_row = max (top_row - count, -saveLines);
646		666
647	// sever bottommost line	667	// sever bottommost line
648	{	668	{
649	line_t &l = ROW(row2 - 1);	669	line_t &l = ROW(row2);
650	l.is_longer (0);	670	l.is_longer (0);
651	l.touch ();	671	l.touch ();
652	}	672	}
653		673
654	// scroll everything up 'count' lines	674	// scroll everything up 'count' lines
…		…
682	else	702	else
683	scr_blank_screen_mem (l, rstyle);	703	scr_blank_screen_mem (l, rstyle);
684	}	704	}
685		705
686	// move and/or clear selection, if any	706	// move and/or clear selection, if any
687	if (selection.op && current_screen == selection.screen)	707	if (selection.op && current_screen == selection.screen
		708	&& selection.beg.row <= row2)
688	{	709	{
689	selection.beg.row -= count;	710	selection.beg.row -= count;
690	selection.end.row -= count;	711	selection.end.row -= count;
691	selection.mark.row -= count;	712	selection.mark.row -= count;
692		713
693	if (selection.beg.row < top_row	714	selection_check (0);
694	\|\| selection.end.row < top_row
695	\|\| selection.mark.row < top_row)
696	{
697	CLEAR_ALL_SELECTION ();
698	selection.op = SELECTION_CLEAR;
699	}
700	}	715	}
701		716
702	// finally move the view window, if desired	717	// finally move the view window, if desired
703	if (option (Opt_scrollWithBuffer)	718	if (option (Opt_scrollWithBuffer)
704	&& view_start != 0	719	&& view_start != 0
705	&& view_start != -saveLines)	720	&& view_start != -saveLines)
706	scr_page (UP, count);	721	scr_page (count);
707		722
708	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	723	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
709	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	724	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
710	}	725	}
711	else	726	else
…		…
734	}	749	}
735		750
736	// use a simple and robust scrolling algorithm, this	751	// use a simple and robust scrolling algorithm, this
737	// part of scr_scroll_text is not time-critical.	752	// part of scr_scroll_text is not time-critical.
738		753
		754	// sever line above scroll region
		755	if (row1)
		756	{
		757	line_t &l = ROW(row1 - 1);
		758	l.is_longer (0);
		759	l.touch ();
		760	}
		761
739	int rows = row2 - row1 + 1;	762	int rows = row2 - row1 + 1;
740		763
741	min_it (count, rows);	764	min_it (count, rows);
742		765
743	line_t *temp_buf = row_buf + total_rows;	766	line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744		767
745	for (int row = 0; row < rows; row++)	768	for (int row = 0; row < rows; row++)
746	{	769	{
747	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);	770	temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748		771
…		…
750	scr_blank_screen_mem (temp_buf [row], rstyle);	773	scr_blank_screen_mem (temp_buf [row], rstyle);
751	}	774	}
752		775
753	for (int row = 0; row < rows; row++)	776	for (int row = 0; row < rows; row++)
754	ROW(row1 + row) = temp_buf [row];	777	ROW(row1 + row) = temp_buf [row];
		778
		779	// sever bottommost line
		780	{
		781	line_t &l = ROW(row2);
		782	l.is_longer (0);
		783	l.touch ();
		784	}
755	}	785	}
756		786
757	return count;	787	return count;
758	}	788	}
759		789
760	/* ------------------------------------------------------------------------- */	790	/* ------------------------------------------------------------------------- */
761	/*	791	/*
762	* Add text given in <str> of length <len> to screen struct	792	* Add text given in <str> of length <len> to screen struct
763	*/	793	*/
764	void	794	void ecb_hot
765	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	795	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
766	{	796	{
767	if (len <= 0) /* sanity */	797	if (len <= 0) /* sanity */
768	return;	798	return;
769		799
770	unsigned char checksel;	800	bool checksel;
771	unicode_t c;	801	unicode_t c;
772	int ncol = this->ncol;	802	int ncol = this->ncol;
773	const wchar_t *strend = str + len;	803	const wchar_t *strend = str + len;
774		804
775	want_refresh = 1;	805	want_refresh = 1;
…		…
982	}	1012	}
983	else if (screen.cur.row > 0	1013	else if (screen.cur.row > 0
984	&& ROW(screen.cur.row - 1).is_longer ())	1014	&& ROW(screen.cur.row - 1).is_longer ())
985	{	1015	{
986	linep = &ROW(screen.cur.row - 1);	1016	linep = &ROW(screen.cur.row - 1);
987	tp = line->t + ncol - 1;	1017	tp = linep->t + ncol - 1;
988	rp = line->r + ncol - 1;	1018	rp = linep->r + ncol - 1;
989	}	1019	}
990	else	1020	else
991	continue;	1021	continue;
992		1022
993	linep->touch ();	1023	linep->touch ();
…		…
1119	* XTERM_SEQ: ESC 6	1149	* XTERM_SEQ: ESC 6
1120	* Move cursor left in row. If we're at the left boundary, shift everything	1150	* Move cursor left in row. If we're at the left boundary, shift everything
1121	* in that row right. Clear left column.	1151	* in that row right. Clear left column.
1122	*/	1152	*/
1123	#if !ENABLE_MINIMAL	1153	#if !ENABLE_MINIMAL
1124	void	1154	void ecb_cold
1125	rxvt_term::scr_backindex () NOTHROW	1155	rxvt_term::scr_backindex () NOTHROW
1126	{	1156	{
1127	if (screen.cur.col > 0)	1157	if (screen.cur.col > 0)
1128	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);	1158	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);
1129	else	1159	else
…		…
1136	* XTERM_SEQ: ESC 9	1166	* XTERM_SEQ: ESC 9
1137	* Move cursor right in row. If we're at the right boundary, shift everything	1167	* Move cursor right in row. If we're at the right boundary, shift everything
1138	* in that row left. Clear right column.	1168	* in that row left. Clear right column.
1139	*/	1169	*/
1140	#if !ENABLE_MINIMAL	1170	#if !ENABLE_MINIMAL
1141	void	1171	void ecb_cold
1142	rxvt_term::scr_forwardindex () NOTHROW	1172	rxvt_term::scr_forwardindex () NOTHROW
1143	{	1173	{
1144	if (screen.cur.col < ncol - 1)	1174	if (screen.cur.col < ncol - 1)
1145	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1175	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1146	else	1176	else
…		…
1211	* direction should be UP or DN	1241	* direction should be UP or DN
1212	*/	1242	*/
1213	void	1243	void
1214	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1244	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1215	{	1245	{
1216	int dirn;
1217
1218	want_refresh = 1;	1246	want_refresh = 1;
1219	ZERO_SCROLLBACK ();	1247	ZERO_SCROLLBACK ();
1220		1248
1221	dirn = ((direction == UP) ? 1 : -1);
1222
1223	screen.flags &= ~Screen_WrapNext;	1249	screen.flags &= ~Screen_WrapNext;
1224		1250
1225	if ((screen.cur.row == screen.bscroll && direction == UP)	1251	if ((screen.cur.row == screen.bscroll && direction == UP)
1226	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1252	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1227	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1253	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1228	else	1254	else
1229	screen.cur.row += dirn;	1255	screen.cur.row += direction;
1230		1256
1231	clamp_it (screen.cur.row, 0, nrow - 1);	1257	clamp_it (screen.cur.row, 0, nrow - 1);
1232	selection_check (0);	1258	selection_check (0);
1233	}	1259	}
1234		1260
…		…
1297	scr_blank_line (line, col, num, rstyle);	1323	scr_blank_line (line, col, num, rstyle);
1298	}	1324	}
1299		1325
1300	/* ------------------------------------------------------------------------- */	1326	/* ------------------------------------------------------------------------- */
1301	/*	1327	/*
1302	* Erase part of whole of the screen	1328	* Erase part or whole of the screen
1303	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1329	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1330	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1331	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306	*/	1332	*/
1307	void	1333	void
…		…
1316	ZERO_SCROLLBACK ();	1342	ZERO_SCROLLBACK ();
1317		1343
1318	switch (mode)	1344	switch (mode)
1319	{	1345	{
1320	case 0: /* erase to end of screen */	1346	case 0: /* erase to end of screen */
1321	selection_check (1);
1322	scr_erase_line (0);	1347	scr_erase_line (0);
1323	row = screen.cur.row + 1; /* possible OOB */	1348	row = screen.cur.row + 1; /* possible OOB */
1324	num = nrow - row;	1349	num = nrow - row;
1325	break;	1350	break;
1326	case 1: /* erase to beginning of screen */	1351	case 1: /* erase to beginning of screen */
1327	selection_check (3);
1328	scr_erase_line (1);	1352	scr_erase_line (1);
1329	row = 0;	1353	row = 0;
1330	num = screen.cur.row;	1354	num = screen.cur.row;
1331	break;	1355	break;
1332	case 2: /* erase whole screen */	1356	case 2: /* erase whole screen */
1333	selection_check (3);
1334	row = 0;	1357	row = 0;
1335	num = nrow;	1358	num = nrow;
1336	break;	1359	break;
1337	default:	1360	default:
1338	return;	1361	return;
…		…
1355	{	1378	{
1356	ren = DEFAULT_RSTYLE;	1379	ren = DEFAULT_RSTYLE;
1357		1380
1358	if (mapped)	1381	if (mapped)
1359	XClearArea (dpy, vt, 0,	1382	XClearArea (dpy, vt, 0,
1360	Row2Pixel (row - view_start), (unsigned int)width,	1383	Row2Pixel (row - view_start), (unsigned int)vt_width,
1361	(unsigned int)Height2Pixel (num), False);	1384	(unsigned int)Height2Pixel (num), False);
1362	}	1385	}
1363	else	1386	else
1364	{	1387	{
1365	ren = rstyle & (RS_fgMask \| RS_bgMask);	1388	ren = rstyle & (RS_fgMask \| RS_bgMask);
…		…
1368	{	1391	{
1369	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1392	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1393	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371	XFillRectangle (dpy, vt, gc,	1394	XFillRectangle (dpy, vt, gc,
1372	0, Row2Pixel (row - view_start),	1395	0, Row2Pixel (row - view_start),
1373	(unsigned int)width,	1396	(unsigned int)vt_width,
1374	(unsigned int)Height2Pixel (num));	1397	(unsigned int)Height2Pixel (num));
1375	gcvalue.foreground = pix_colors[Color_fg];	1398	gcvalue.foreground = pix_colors[Color_fg];
1376	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1399	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377	}	1400	}
1378	}	1401	}
…		…
1400	/* ------------------------------------------------------------------------- */	1423	/* ------------------------------------------------------------------------- */
1401	/*	1424	/*
1402	* Fill the screen with `E's	1425	* Fill the screen with `E's
1403	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1426	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1404	*/	1427	*/
1405	void	1428	void ecb_cold
1406	rxvt_term::scr_E () NOTHROW	1429	rxvt_term::scr_E () NOTHROW
1407	{	1430	{
1408	rend_t fs;	1431	rend_t fs;
1409		1432
1410	want_refresh = 1;	1433	want_refresh = 1;
1411	ZERO_SCROLLBACK ();	1434	ZERO_SCROLLBACK ();
1412		1435
1413	num_scr_allow = 0;	1436	num_scr_allow = 0;
1414	selection_check (3);	1437
		1438	row_col_t pos;
		1439	pos.row = pos.col = 0;
		1440	if (ROWCOL_IS_AFTER (selection.end, pos))
		1441	CLEAR_SELECTION ();
1415		1442
1416	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1443	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417	for (int row = nrow; row--; )	1444	for (int row = nrow; row--; )
1418	{	1445	{
1419	line_t &line = ROW(row);	1446	line_t &line = ROW(row);
…		…
1570	/* ------------------------------------------------------------------------- */	1597	/* ------------------------------------------------------------------------- */
1571	/*	1598	/*
1572	* Set the scrolling region	1599	* Set the scrolling region
1573	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1600	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574	*/	1601	*/
1575	void	1602	void ecb_cold
1576	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1603	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1577	{	1604	{
1578	max_it (top, 0);	1605	max_it (top, 0);
1579	min_it (bot, nrow - 1);	1606	min_it (bot, nrow - 1);
1580		1607
…		…
1590	/*	1617	/*
1591	* Make the cursor visible/invisible	1618	* Make the cursor visible/invisible
1592	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1619	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1620	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594	*/	1621	*/
1595	void	1622	void ecb_cold
1596	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1623	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1597	{	1624	{
1598	want_refresh = 1;	1625	want_refresh = 1;
1599		1626
1600	if (mode)	1627	if (mode)
…		…
1607	/*	1634	/*
1608	* Set/unset automatic wrapping	1635	* Set/unset automatic wrapping
1609	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1636	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1637	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611	*/	1638	*/
1612	void	1639	void ecb_cold
1613	rxvt_term::scr_autowrap (int mode) NOTHROW	1640	rxvt_term::scr_autowrap (int mode) NOTHROW
1614	{	1641	{
1615	if (mode)	1642	if (mode)
1616	screen.flags \|= Screen_Autowrap;	1643	screen.flags \|= Screen_Autowrap;
1617	else	1644	else
…		…
1626	* Relative mode: line numbers are relative to top margin of scrolling region	1653	* Relative mode: line numbers are relative to top margin of scrolling region
1627	* and the cursor cannot be moved outside.	1654	* and the cursor cannot be moved outside.
1628	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1655	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1656	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630	*/	1657	*/
1631	void	1658	void ecb_cold
1632	rxvt_term::scr_relative_origin (int mode) NOTHROW	1659	rxvt_term::scr_relative_origin (int mode) NOTHROW
1633	{	1660	{
1634	if (mode)	1661	if (mode)
1635	screen.flags \|= Screen_Relative;	1662	screen.flags \|= Screen_Relative;
1636	else	1663	else
…		…
1643	/*	1670	/*
1644	* Set insert/replace mode	1671	* Set insert/replace mode
1645	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1672	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1673	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647	*/	1674	*/
1648	void	1675	void ecb_cold
1649	rxvt_term::scr_insert_mode (int mode) NOTHROW	1676	rxvt_term::scr_insert_mode (int mode) NOTHROW
1650	{	1677	{
1651	if (mode)	1678	if (mode)
1652	screen.flags \|= Screen_Insert;	1679	screen.flags \|= Screen_Insert;
1653	else	1680	else
…		…
1659	* Set/Unset tabs	1686	* Set/Unset tabs
1660	* XTERM_SEQ: Set tab at current column : ESC H	1687	* XTERM_SEQ: Set tab at current column : ESC H
1661	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1688	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1689	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663	*/	1690	*/
1664	void	1691	void ecb_cold
1665	rxvt_term::scr_set_tab (int mode) NOTHROW	1692	rxvt_term::scr_set_tab (int mode) NOTHROW
1666	{	1693	{
1667	if (mode < 0)	1694	if (mode < 0)
1668	memset (tabs, 0, ncol);	1695	memset (tabs, 0, ncol);
1669	else if (screen.cur.col < ncol)	1696	else if (screen.cur.col < ncol)
…		…
1688	if (rvideo_state != on)	1715	if (rvideo_state != on)
1689	{	1716	{
1690	rvideo_state = on;	1717	rvideo_state = on;
1691		1718
1692	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1719	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693	#ifdef HAVE_BG_PIXMAP	1720	#ifdef HAVE_IMG
1694	if (bg_pixmap == None)	1721	if (bg_img == 0)
1695	#endif	1722	#endif
1696	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1723	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697		1724
1698	XGCValues gcvalue;	1725	XGCValues gcvalue;
1699	gcvalue.foreground = pix_colors[Color_fg];	1726	gcvalue.foreground = pix_colors[Color_fg];
…		…
1708	/* ------------------------------------------------------------------------- */	1735	/* ------------------------------------------------------------------------- */
1709	/*	1736	/*
1710	* Report current cursor position	1737	* Report current cursor position
1711	* XTERM_SEQ: Report position: ESC [ 6 n	1738	* XTERM_SEQ: Report position: ESC [ 6 n
1712	*/	1739	*/
1713	void	1740	void ecb_cold
1714	rxvt_term::scr_report_position () NOTHROW	1741	rxvt_term::scr_report_position () NOTHROW
1715	{	1742	{
1716	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1743	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717	}	1744	}
1718		1745
…		…
1721	* ------------------------------------------------------------------------- */	1748	* ------------------------------------------------------------------------- */
1722		1749
1723	/*	1750	/*
1724	* Set font style	1751	* Set font style
1725	*/	1752	*/
1726	void	1753	void ecb_cold
1727	rxvt_term::set_font_style () NOTHROW	1754	rxvt_term::set_font_style () NOTHROW
1728	{	1755	{
1729	#if 0	1756	#if 0
1730	switch (charsets [screen.charset])	1757	switch (charsets [screen.charset])
1731	{	1758	{
…		…
1753	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1780	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1754	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1781	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1755	* XTERM_SEQ: Invoke G2 character set: ESC N	1782	* XTERM_SEQ: Invoke G2 character set: ESC N
1756	* XTERM_SEQ: Invoke G3 character set: ESC O	1783	* XTERM_SEQ: Invoke G3 character set: ESC O
1757	*/	1784	*/
1758	void	1785	void ecb_cold
1759	rxvt_term::scr_charset_choose (int set) NOTHROW	1786	rxvt_term::scr_charset_choose (int set) NOTHROW
1760	{	1787	{
1761	screen.charset = set;	1788	screen.charset = set;
1762	set_font_style ();	1789	set_font_style ();
1763	}	1790	}
…		…
1784	* ------------------------------------------------------------------------- */	1811	* ------------------------------------------------------------------------- */
1785		1812
1786	/*	1813	/*
1787	* refresh matching text.	1814	* refresh matching text.
1788	*/	1815	*/
1789	bool	1816	bool ecb_cold
1790	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1817	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1791	{	1818	{
1792	bool found = false;	1819	bool found = false;
1793		1820
1794	for (int i = 0; i < nrow; i++)	1821	for (int i = 0; i < nrow; i++)
…		…
1813	PART_BEG = 0,	1840	PART_BEG = 0,
1814	PART_END,	1841	PART_END,
1815	RC_COUNT	1842	RC_COUNT
1816	};	1843	};
1817		1844
1818	void	1845	void ecb_hot
1819	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1846	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1820	{	1847	{
1821	int i;	1848	int i;
1822	row_col_t rc[RC_COUNT];	1849	row_col_t rc[RC_COUNT];
1823		1850
…		…
1860	* Refresh the entire screen	1887	* Refresh the entire screen
1861	*/	1888	*/
1862	void	1889	void
1863	rxvt_term::scr_touch (bool refresh) NOTHROW	1890	rxvt_term::scr_touch (bool refresh) NOTHROW
1864	{	1891	{
1865	scr_expose (0, 0, width, height, refresh);	1892	scr_expose (0, 0, vt_width, vt_height, refresh);
1866	}	1893	}
1867		1894
1868	/* ------------------------------------------------------------------------- */	1895	/* ------------------------------------------------------------------------- */
1869	/*	1896	/*
1870	* Move the display so that the line represented by scrollbar value Y is at	1897	* Move the display so that the line represented by scrollbar value Y is at
1871	* the top of the screen	1898	* the top of the screen
1872	*/	1899	*/
1873	void	1900	void
1874	rxvt_term::scr_move_to (int y, int len) NOTHROW	1901	rxvt_term::scr_move_to (int y, int len) NOTHROW
1875	{	1902	{
1876	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1903	// lerp (y, 0, len, top_row, nrow - 1)
		1904	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1877	}	1905	}
1878		1906
1879	/* ------------------------------------------------------------------------- */	1907	/* ------------------------------------------------------------------------- */
1880	/*	1908	/*
1881	* Page the screen up/down nlines	1909	* Page the screen up/down nlines
1882	* direction should be UP or DN	1910	* direction should be UP or DN
1883	*/	1911	*/
1884	bool	1912	bool
1885	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1913	rxvt_term::scr_page (int nlines) NOTHROW
1886	{	1914	{
1887	int new_view_start =
1888	direction == UP ? view_start - nlines
1889	: view_start + nlines;
1890
1891	return scr_changeview (new_view_start);	1915	return scr_changeview (view_start - nlines);
1892	}	1916	}
1893		1917
1894	bool	1918	bool
1895	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1919	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1896	{	1920	{
…		…
1949	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1973	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950	#endif	1974	#endif
1951	}	1975	}
1952		1976
1953	/* ------------------------------------------------------------------------- */	1977	/* ------------------------------------------------------------------------- */
1954	void	1978	void ecb_cold
1955	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1979	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1956	{	1980	{
1957	#ifdef PRINTPIPE	1981	#ifdef PRINTPIPE
1958	int nrows, row_start;	1982	int nrows, row_start;
1959	FILE *fd = popen_printer ();	1983	FILE *fd = popen_printer ();
…		…
2008	/*	2032	/*
2009	* Refresh the screen	2033	* Refresh the screen
2010	* drawn_text/drawn_rend contain the screen information before the update.	2034	* drawn_text/drawn_rend contain the screen information before the update.
2011	* screen.text/screen.rend contain what the screen will change to.	2035	* screen.text/screen.rend contain what the screen will change to.
2012	*/	2036	*/
2013	void	2037	void ecb_hot
2014	rxvt_term::scr_refresh () NOTHROW	2038	rxvt_term::scr_refresh () NOTHROW
2015	{	2039	{
2016	int16_t col, row, /* column/row we're processing */	2040	int16_t col, row, /* column/row we're processing */
2017	ocrow; /* old cursor row */	2041	ocrow; /* old cursor row */
2018	int i; /* tmp */	2042	int i; /* tmp */
2019	#ifndef NO_CURSORCOLOR
2020	rend_t cc1; /* store colours at cursor position (s) */
2021	#endif
2022	rend_t *crp; // cursor rendition pointer
2023	rend_t ccol1, /* Cursor colour */	2043	rend_t ccol1, /* Cursor colour */
2024	ccol2; /* Cursor colour2 */	2044	ccol2; /* Cursor colour2 */
		2045	rend_t cur_rend;
		2046	int cur_col;
		2047	int cursorwidth;
2025		2048
2026	want_refresh = 0; /* screen is current */	2049	want_refresh = 0; /* screen is current */
2027		2050
2028	if (refresh_type == NO_REFRESH \|\| !mapped)	2051	if (refresh_type == NO_REFRESH \|\| !mapped)
2029	return;	2052	return;
…		…
2032	* A: set up vars	2055	* A: set up vars
2033	*/	2056	*/
2034	refresh_count = 0;	2057	refresh_count = 0;
2035		2058
2036	unsigned int old_screen_flags = screen.flags;	2059	unsigned int old_screen_flags = screen.flags;
2037	char have_bg = 0;	2060	bool have_bg = 0;
2038	#ifdef HAVE_BG_PIXMAP	2061	#ifdef HAVE_IMG
2039	have_bg = bg_pixmap != None;	2062	have_bg = bg_img != 0;
2040	#endif	2063	#endif
2041	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2064	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042		2065
2043	/*	2066	/*
2044	* B: reverse any characters which are selected	2067	* B: reverse any characters which are selected
…		…
2048	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2071	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049	#if ENABLE_OVERLAY	2072	#if ENABLE_OVERLAY
2050	scr_swap_overlay ();	2073	scr_swap_overlay ();
2051	#endif	2074	#endif
2052		2075
2053	char showcursor = screen.flags & Screen_VisibleCursor;	2076	bool showcursor = screen.flags & Screen_VisibleCursor;
2054		2077
2055	/*	2078	/*
2056	* C: set the cursor character (s)	2079	* C: set the cursor character (s)
2057	*/	2080	*/
2058	{	2081	{
2059	unsigned char setoldcursor;
2060
2061	#ifdef CURSOR_BLINK	2082	#ifdef CURSOR_BLINK
2062	if (hidden_cursor)	2083	if (hidden_cursor)
2063	showcursor = 0;	2084	showcursor = 0;
2064	#endif	2085	#endif
2065		2086
…		…
2068	int col = screen.cur.col;	2089	int col = screen.cur.col;
2069		2090
2070	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2091	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2071	col--;	2092	col--;
2072		2093
		2094	cursorwidth = 1;
		2095	while (col + cursorwidth < ncol
		2096	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2097	cursorwidth++;
		2098
2073	crp = &ROW(screen.cur.row).r[col];	2099	cur_rend = ROW(screen.cur.row).r[col];
		2100	cur_col = col;
2074		2101
2075	#ifndef NO_CURSORCOLOR	2102	#ifndef NO_CURSORCOLOR
2076	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2077	if (ISSET_PIXCOLOR (Color_cursor))	2103	if (ISSET_PIXCOLOR (Color_cursor))
2078	ccol1 = Color_cursor;	2104	ccol1 = Color_cursor;
2079	else	2105	else
2080	#endif	2106	#endif
2081	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2107	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2093	ccol2 = bgcolor_of (rstyle);	2119	ccol2 = bgcolor_of (rstyle);
2094	#else	2120	#else
2095	ccol2 = Color_bg;	2121	ccol2 = Color_bg;
2096	#endif	2122	#endif
2097		2123
2098	if (focus)	2124	if (focus && cursor_type == 0)
2099	{	2125	{
2100	if (option (Opt_cursorUnderline))	2126	rend_t rend = cur_rend;
2101	*crp ^= RS_Uline;	2127
2102	else
2103	{
2104	*crp ^= RS_RVid;	2128	rend ^= RS_RVid;
2105	crp = SET_FGCOLOR (crp, ccol1);	2129	rend = SET_FGCOLOR (rend, ccol1);
2106	crp = SET_BGCOLOR (crp, ccol2);	2130	rend = SET_BGCOLOR (rend, ccol2);
2107	}	2131
		2132	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2108	}	2133	}
2109	}	2134	}
2110		2135
2111	/* make sure no outline cursor is left around */	2136	/* make sure no outline cursor is left around */
2112	setoldcursor = 0;	2137	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2113	if (ocrow != -1)	2138	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
		2139
		2140	// save the current cursor coordinates if the cursor is visible
		2141	// and either the window is unfocused or the cursor style is
		2142	// underline or vertical bar, so as to clear the outline cursor in
		2143	// the next refresh if the cursor moves or becomes invisible
		2144	if (showcursor && (!focus \|\| cursor_type != 0) && screen.cur.row - view_start < nrow)
2114	{	2145	{
2115	if (screen.cur.row - view_start != ocrow	2146	oldcursor.row = screen.cur.row - view_start;
2116	\|\| screen.cur.col != oldcursor.col)	2147	oldcursor.col = screen.cur.col;
2117	{
2118	if (ocrow < nrow
2119	&& oldcursor.col < ncol)
2120	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2121
2122	if (focus \|\| !showcursor)
2123	oldcursor.row = -1;
2124	else
2125	setoldcursor = 1;
2126	}
2127	}	2148	}
2128	else if (!focus)	2149	else
2129	setoldcursor = 1;
2130
2131	if (setoldcursor)
2132	{
2133	if (screen.cur.row - view_start >= nrow)
2134	oldcursor.row = -1;	2150	oldcursor.row = -1;
2135	else
2136	{
2137	oldcursor.row = screen.cur.row - view_start;
2138	oldcursor.col = screen.cur.col;
2139	}
2140	}
2141	}	2151	}
2142		2152
2143	#ifndef NO_SLOW_LINK_SUPPORT	2153	#ifndef NO_SLOW_LINK_SUPPORT
2144	/*	2154	/*
2145	* D: CopyArea pass - very useful for slower links	2155	* D: CopyArea pass - very useful for slower links
…		…
2151	{	2161	{
2152	int16_t nits;	2162	int16_t nits;
2153	int i = num_scr;	2163	int i = num_scr;
2154	int j;	2164	int j;
2155	int len, wlen;	2165	int len, wlen;
2156	dLocal (int, num_scr);
2157		2166
2158	j = nrow;	2167	j = nrow;
2159	wlen = len = -1;	2168	wlen = len = -1;
2160	row = i > 0 ? 0 : j - 1;	2169	row = i > 0 ? 0 : j - 1;
2161		2170
…		…
2227	int ypixel = (int)Row2Pixel (row);	2236	int ypixel = (int)Row2Pixel (row);
2228		2237
2229	for (col = 0; col < ncol; col++)	2238	for (col = 0; col < ncol; col++)
2230	{	2239	{
2231	/* compare new text with old - if exactly the same then continue */	2240	/* compare new text with old - if exactly the same then continue */
2232	if (stp[col] == dtp[col] /* Must match characters to skip. */	2241	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2233	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2234	\|\| (stp[col] == ' ' /* space w/ no background change */
2235	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2236	continue;	2242	continue;
2237		2243
2238	// redraw one or more characters	2244	// redraw one or more characters
2239		2245
2240	// seek to the beginning of wide characters	2246	// seek to the beginning of wide characters
…		…
2412	else	2418	else
2413	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2419	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2414		2420
2415	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2421	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2416	{	2422	{
		2423	if (showcursor && focus && row == screen.cur.row
		2424	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2425	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2426	else
2417	#if ENABLE_FRILLS	2427	#if ENABLE_FRILLS
2418	if (ISSET_PIXCOLOR (Color_underline))	2428	if (ISSET_PIXCOLOR (Color_underline))
2419	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2429	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2420	else	2430	else
2421	#endif	2431	#endif
…		…
2433	*/	2443	*/
2434	if (showcursor)	2444	if (showcursor)
2435	{	2445	{
2436	if (focus)	2446	if (focus)
2437	{	2447	{
2438	if (option (Opt_cursorUnderline))	2448	if (cursor_type == 0)
2439	*crp ^= RS_Uline;	2449	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2440	else	2450	else if (oldcursor.row >= 0)
2441	{	2451	{
2442	*crp ^= RS_RVid;	2452	XSetForeground (dpy, gc, pix_colors[ccol1]);
2443	#ifndef NO_CURSORCOLOR	2453	if (cursor_type == 1)
2444	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2454	XFillRectangle (dpy, vt, gc,
2445	#endif	2455	Col2Pixel (cur_col),
		2456	Row2Pixel (oldcursor.row + 1) - 2,
		2457	Width2Pixel (1),
		2458	2);
		2459	else
		2460	XFillRectangle (dpy, vt, gc,
		2461	Col2Pixel (cur_col),
		2462	Row2Pixel (oldcursor.row),
		2463	2,
		2464	Height2Pixel (1));
2446	}	2465	}
2447	}	2466	}
2448	else if (oldcursor.row >= 0)	2467	else if (oldcursor.row >= 0)
2449	{	2468	{
2450	int cursorwidth = 1;
2451	int col = oldcursor.col;
2452
2453	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2454	col--;
2455
2456	while (col + cursorwidth < ncol
2457	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2458	cursorwidth++;
2459
2460	#ifndef NO_CURSORCOLOR
2461	if (ISSET_PIXCOLOR (Color_cursor))
2462	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2463	else
2464	#endif
2465	XSetForeground (dpy, gc, pix_colors[ccol1]);	2469	XSetForeground (dpy, gc, pix_colors[ccol1]);
2466		2470
2467	XDrawRectangle (dpy, vt, gc,	2471	XDrawRectangle (dpy, vt, gc,
2468	Col2Pixel (col),	2472	Col2Pixel (cur_col),
2469	Row2Pixel (oldcursor.row),	2473	Row2Pixel (oldcursor.row),
2470	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2474	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2471	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2475	(unsigned int) (Height2Pixel (1) - 1));
2472	}	2476	}
2473	}	2477	}
2474		2478
2475	/*	2479	/*
2476	* H: cleanup selection	2480	* H: cleanup selection
…		…
2485	screen.flags = old_screen_flags;	2489	screen.flags = old_screen_flags;
2486	num_scr = 0;	2490	num_scr = 0;
2487	num_scr_allow = 1;	2491	num_scr_allow = 1;
2488	}	2492	}
2489		2493
2490	void	2494	void ecb_cold
2491	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2495	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2492	{	2496	{
2493	if (!l.t)	2497	if (!l.valid ())
2494	return;	2498	return;
2495		2499
2496	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2500	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2497		2501
2498	for (int i = ncol; i--; )	2502	for (int i = ncol; i--; )
2499	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2503	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500	}	2504	}
2501		2505
2502	void	2506	void ecb_cold
2503	rxvt_term::scr_remap_chars () NOTHROW	2507	rxvt_term::scr_remap_chars () NOTHROW
2504	{	2508	{
2505	for (int i = total_rows; i--; )	2509	for (int i = total_rows; i--; )
2506	scr_remap_chars (row_buf [i]);	2510	scr_remap_chars (row_buf [i]);
2507		2511
…		…
2510	scr_remap_chars (drawn_buf [i]);	2514	scr_remap_chars (drawn_buf [i]);
2511	scr_remap_chars (swap_buf [i]);	2515	scr_remap_chars (swap_buf [i]);
2512	}	2516	}
2513	}	2517	}
2514		2518
2515	void	2519	void ecb_cold
2516	rxvt_term::scr_recolour (bool refresh) NOTHROW	2520	rxvt_term::scr_recolor (bool refresh) NOTHROW
2517	{	2521	{
2518	bool transparent = false;	2522	bool transparent = false;
2519		2523
2520	#ifdef HAVE_BG_PIXMAP	2524	#ifdef HAVE_IMG
2521	if (bg_pixmap != None)	2525	if (bg_img != 0)
2522	{	2526	{
2523	# ifdef ENABLE_TRANSPARENCY	2527	# if ENABLE_TRANSPARENCY
2524	if (bg_flags & BG_IS_TRANSPARENT)	2528	if (bg_flags & BG_IS_TRANSPARENT)
2525	{	2529	{
2526	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);	2530	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2527	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2531	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528		2532
2529	transparent = true;	2533	transparent = true;
2530	}	2534	}
2531	else	2535	else
2532	# endif	2536	# endif
2533	{	2537	{
2534	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2539	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2536	}	2540	}
2537	}	2541	}
2538	else	2542	else
2539	#endif	2543	#endif
2540	{	2544	{
…		…
2542	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2546	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2543	}	2547	}
2544		2548
2545	XClearWindow (dpy, parent);	2549	XClearWindow (dpy, parent);
2546		2550
2547	if (scrollBar.win)	2551	if (scrollBar.state && scrollBar.win)
2548	{	2552	{
2549	if (transparent)	2553	if (transparent)
2550	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2554	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551	else	2555	else
2552	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2556	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2553	scrollBar.state = STATE_IDLE;	2557	scrollBar.state = SB_STATE_IDLE;
2554	scrollBar.show (0);	2558	scrollBar.show (0);
2555	}	2559	}
2556		2560
2557	if (refresh)	2561	if (refresh)
2558	{	2562	{
…		…
2623	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2627	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624	srp[col] ^= rstyle;	2628	srp[col] ^= rstyle;
2625	}	2629	}
2626		2630
2627	/* ------------------------------------------------------------------------- */	2631	/* ------------------------------------------------------------------------- */
2628	void	2632	void ecb_hot
2629	rxvt_term::scr_reverse_selection () NOTHROW	2633	rxvt_term::scr_reverse_selection () NOTHROW
2630	{	2634	{
2631	if (selection.op	2635	if (selection.op
2632	&& current_screen == selection.screen	2636	&& current_screen == selection.screen
2633	&& selection.end.row >= view_start)	2637	&& selection.end.row >= view_start)
…		…
2652	*/	2656	*/
2653	#if 0	2657	#if 0
2654	void	2658	void
2655	rxvt_term::scr_dump (int fd) NOTHROW	2659	rxvt_term::scr_dump (int fd) NOTHROW
2656	{	2660	{
2657	int row, wrote;	2661	// if this method is needed, it can be implemented by factoring the
2658	unsigned int width, towrite;	2662	// relevant code in scr_printscreen
2659	const char r1[] = "\n";
2660
2661	for (row = saveLines + top_row;
2662	row < saveLines + nrow - 1; row++)
2663	{
2664	width = row_buf[row].l >= 0 ? row_buf[row].l
2665	: ncol;
2666	for (towrite = width; towrite; towrite -= wrote)
2667	{
2668	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2669	towrite);
2670	if (wrote < 0)
2671	return; /* XXX: death, no report */
2672	}
2673	if (row_buf[row].l >= 0)
2674	if (write (fd, r1, 1) <= 0)
2675	return; /* XXX: death, no report */
2676	}
2677	}	2663	}
2678	#endif	2664	#endif
2679		2665
2680	/* ------------------------------------------------------------------------- *	2666	/* ------------------------------------------------------------------------- *
2681	* CHARACTER SELECTION *	2667	* CHARACTER SELECTION *
2682	* ------------------------------------------------------------------------- */	2668	* ------------------------------------------------------------------------- */
2683	void	2669	void
2684	rxvt_term::selection_check (int check_more) NOTHROW	2670	rxvt_term::selection_check (int check_more) NOTHROW
2685	{	2671	{
2686	row_col_t pos;
2687
2688	if (!selection.op)	2672	if (!selection.op)
2689	return;	2673	return;
2690		2674
2691	pos.row = pos.col = 0;
2692	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2675	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693	\|\| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2676	\|\| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2677	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695	\|\| (check_more == 1	2678	\|\| (check_more == 1
2696	&& current_screen == selection.screen	2679	&& current_screen == selection.screen
2697	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2680	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2681	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699	\|\| (check_more == 2
2700	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2701	&& ROWCOL_IS_AFTER (selection.end, pos))
2702	\|\| (check_more == 3
2703	&& ROWCOL_IS_AFTER (selection.end, pos))
2704	\|\| (check_more == 4 /* screen width change */
2705	&& (selection.beg.row != selection.end.row
2706	\|\| selection.end.col > ncol)))
2707	CLEAR_SELECTION ();	2682	CLEAR_ALL_SELECTION ();
		2683	}
		2684
		2685	void
		2686	rxvt_term::selection_changed () NOTHROW
		2687	{
		2688	line_t &r1 = ROW (selection.beg.row);
		2689	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2690	++selection.beg.col;
		2691
		2692	line_t &r2 = ROW (selection.end.row);
		2693	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2694	++selection.end.col;
		2695
		2696	want_refresh = 1;
2708	}	2697	}
2709		2698
2710	/* ------------------------------------------------------------------------- */	2699	/* ------------------------------------------------------------------------- */
2711	/*	2700	/*
2712	* Paste a selection direct to the command fd	2701	* Paste a selection direct to the command fd
…		…
2718	for (unsigned int i = 0; i < len; i++)	2707	for (unsigned int i = 0; i < len; i++)
2719	if (data[i] == C0_LF)	2708	if (data[i] == C0_LF)
2720	data[i] = C0_CR;	2709	data[i] = C0_CR;
2721		2710
2722	if (priv_modes & PrivMode_BracketPaste)	2711	if (priv_modes & PrivMode_BracketPaste)
2723	tt_printf ("\e[200~");	2712	tt_printf ("\x1b[200~");
2724		2713
2725	tt_write (data, len);	2714	tt_write (data, len);
2726		2715
2727	if (priv_modes & PrivMode_BracketPaste)	2716	if (priv_modes & PrivMode_BracketPaste)
2728	tt_printf ("\e[201~");	2717	tt_printf ("\x1b[201~");
2729	}	2718	}
2730		2719
2731	void	2720	void
2732	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2721	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2733	{	2722	{
…		…
2953	/* ------------------------------------------------------------------------- */	2942	/* ------------------------------------------------------------------------- */
2954	/*	2943	/*
2955	* Mark or select text based upon number of clicks: 1, 2, or 3	2944	* Mark or select text based upon number of clicks: 1, 2, or 3
2956	* EXT: button 1 press	2945	* EXT: button 1 press
2957	*/	2946	*/
2958	void	2947	void ecb_cold
2959	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2948	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2960	{	2949	{
2961	clicks = ((clicks - 1) % 3) + 1;	2950	clicks = ((clicks - 1) % 3) + 1;
2962	selection.clicks = clicks; /* save clicks so extend will work */	2951	selection.clicks = clicks; /* save clicks so extend will work */
2963		2952
…		…
2982		2971
2983	/* ------------------------------------------------------------------------- */	2972	/* ------------------------------------------------------------------------- */
2984	/*	2973	/*
2985	* Mark a selection at the specified col/row	2974	* Mark a selection at the specified col/row
2986	*/	2975	*/
2987	void	2976	void ecb_cold
2988	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2977	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2989	{	2978	{
2990	want_refresh = 1;	2979	want_refresh = 1;
2991		2980
2992	selection.mark.row = row + view_start;	2981	selection.mark.row = row + view_start;
…		…
3015	* Word select: select text for 2 clicks	3004	* Word select: select text for 2 clicks
3016	* We now only find out the boundary in one direction	3005	* We now only find out the boundary in one direction
3017	*/	3006	*/
3018		3007
3019	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020	#define DELIMIT_TEXT(x) \	3009	#define DELIMIT_TEXT(x) \
3021	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022	#define DELIMIT_REND(x) 1	3011	#define DELIMIT_REND(x) 1
3023		3012
3024	void	3013	void ecb_cold
3025	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
3026	{	3015	{
3027	int col, row, dirnadd, tcol, trow, w1, w2;	3016	int col, row, dirnadd, tcol, trow, w1, w2;
3028	row_col_t bound;	3017	row_col_t bound;
3029	text_t *stp;	3018	text_t *stp;
…		…
3103	* EXT: button 3 press; button 1 or 3 drag	3092	* EXT: button 3 press; button 1 or 3 drag
3104	* flag == 0 ==> button 1	3093	* flag == 0 ==> button 1
3105	* flag == 1 ==> button 3 press	3094	* flag == 1 ==> button 3 press
3106	* flag == 2 ==> button 3 motion	3095	* flag == 2 ==> button 3 motion
3107	*/	3096	*/
3108	void	3097	void ecb_cold
3109	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3098	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3110	{	3099	{
3111	int col = clamp (Pixel2Col (x), 0, ncol);	3100	int col = clamp (Pixel2Col (x), 0, ncol);
3112	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3101	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113		3102
…		…
3139		3128
3140	/* ------------------------------------------------------------------------- */	3129	/* ------------------------------------------------------------------------- */
3141	/*	3130	/*
3142	* Extend the selection to the specified col/row	3131	* Extend the selection to the specified col/row
3143	*/	3132	*/
3144	void	3133	void ecb_cold
3145	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3134	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3146	{	3135	{
3147	row_col_t pos;	3136	row_col_t pos;
3148	enum {	3137	enum {
3149	LEFT, RIGHT	3138	LEFT, RIGHT
3150	} closeto = RIGHT;	3139	} closeto = RIGHT;
3151
3152	want_refresh = 1;
3153		3140
3154	switch (selection.op)	3141	switch (selection.op)
3155	{	3142	{
3156	case SELECTION_INIT:	3143	case SELECTION_INIT:
3157	CLEAR_SELECTION ();	3144	CLEAR_SELECTION ();
…		…
3337		3324
3338	#if !ENABLE_MINIMAL	3325	#if !ENABLE_MINIMAL
3339	if (selection.rect && selection.beg.col > selection.end.col)	3326	if (selection.rect && selection.beg.col > selection.end.col)
3340	::swap (selection.beg.col, selection.end.col);	3327	::swap (selection.beg.col, selection.end.col);
3341	#endif	3328	#endif
		3329
		3330	selection_changed ();
3342	}	3331	}
3343		3332
3344	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3345	void	3334	void ecb_cold
3346	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3347	{	3336	{
3348	int32_t end_col, end_row;	3337	int32_t end_col, end_row;
3349	text_t *stp;	3338	text_t *stp;
3350		3339
…		…
3388	/* ------------------------------------------------------------------------- */	3377	/* ------------------------------------------------------------------------- */
3389	/*	3378	/*
3390	* Double click on button 3 when already selected	3379	* Double click on button 3 when already selected
3391	* EXT: button 3 double click	3380	* EXT: button 3 double click
3392	*/	3381	*/
3393	void	3382	void ecb_cold
3394	rxvt_term::selection_rotate (int x, int y) NOTHROW	3383	rxvt_term::selection_rotate (int x, int y) NOTHROW
3395	{	3384	{
3396	selection.clicks = selection.clicks % 3 + 1;	3385	selection.clicks = selection.clicks % 3 + 1;
3397	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3386	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398	}	3387	}
…		…
3400	/* ------------------------------------------------------------------------- */	3389	/* ------------------------------------------------------------------------- */
3401	/*	3390	/*
3402	* Respond to a request for our current selection	3391	* Respond to a request for our current selection
3403	* EXT: SelectionRequest	3392	* EXT: SelectionRequest
3404	*/	3393	*/
3405	void	3394	void ecb_cold
3406	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3395	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3407	{	3396	{
3408	Atom property = rq.property == None ? rq.target : rq.property;	3397	Atom property = rq.property == None ? rq.target : rq.property;
3409	XSelectionEvent ev;	3398	XSelectionEvent ev;
3410		3399
…		…
3543		3532
3544	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3533	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545	}	3534	}
3546		3535
3547	/* ------------------------------------------------------------------------- */	3536	/* ------------------------------------------------------------------------- */
3548	#ifdef USE_XIM	3537	#if USE_XIM
3549	void	3538	void ecb_cold
3550	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3539	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3551	{	3540	{
3552	XWindowAttributes xwa;	3541	XWindowAttributes xwa;
3553		3542
3554	XGetWindowAttributes (dpy, vt, &xwa);	3543	XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC vs. Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC