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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.399 by sf-exg, Thu Nov 3 10:42:17 2011 UTC vs.
Revision 1.450 by mikachu, Sat Dec 6 09:20:13 2014 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.399 by sf-exg, Thu Nov 3 10:42:17 2011 UTC vs. Revision 1.450 by mikachu, Sat Dec 6 09:20:13 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.399 by sf-exg, Thu Nov 3 10:42:17 2011 UTC vs.
Revision 1.450 by mikachu, Sat Dec 6 09:20:13 2014 UTC