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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs.
Revision 1.449 by sf-exg, Wed Nov 19 12:21:11 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
…		…
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		32
33	#include "salloc.C" // HACK, should be a separate compile!
34
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--)
39	*start++ = value;	37	*start++ = value;
…		…
49	if (option (Opt_scrollTtyOutput)) \	47	if (option (Opt_scrollTtyOutput)) \
50	view_start = 0	48	view_start = 0
51	#define CLEAR_SELECTION() \	49	#define CLEAR_SELECTION() \
52	selection.beg.row = selection.beg.col \	50	selection.beg.row = selection.beg.col \
53	= selection.end.row = selection.end.col = 0	51	= selection.end.row = selection.end.col = 0
54	#define CLEAR_SELECTION_MARK() \	52	#define CLEAR_ALL_SELECTION() \
		53	selection.beg.row = selection.beg.col \
		54	= selection.mark.row = selection.mark.col \
55	selection.mark.row = selection.mark.col = 0	55	= selection.end.row = selection.end.col = 0
56		56
57	#define ROW_AND_COL_IS_AFTER(A, B, C, D) \	57	#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
58	(((A) > (C)) \|\| (((A) == (C)) && ((B) > (D))))	58	(((A) > (C)) \|\| (((A) == (C)) && ((B) > (D))))
59	#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \	59	#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
60	(((A) < (C)) \|\| (((A) == (C)) && ((B) < (D))))	60	(((A) < (C)) \|\| (((A) == (C)) && ((B) < (D))))
…		…
96		96
97	/* Fill part/all of a line with blanks. */	97	/* Fill part/all of a line with blanks. */
98	void	98	void
99	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
100	{	100	{
101	if (!l.t)	101	if (!l.valid ())
102	{	102	{
103	lalloc (l);	103	l.alloc ();
104	col = 0;	104	col = 0;
105	width = ncol;	105	width = ncol;
106	}	106	}
107		107
108	l.touch ();	108	l.touch ();
…		…
150	l.r[col] = rend;	150	l.r[col] = rend;
151	col++;	151	col++;
152	} while (col < ncol && l.t[col] == NOCHAR);	152	} while (col < ncol && l.t[col] == NOCHAR);
153	}	153	}
154		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
155	/* ------------------------------------------------------------------------- *	165	/* ------------------------------------------------------------------------- *
156	* SCREEN INITIALISATION *	166	* SCREEN INITIALISATION *
157	* ------------------------------------------------------------------------- */	167	* ------------------------------------------------------------------------- */
158		168
159	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
160	rxvt_term::scr_reset ()	214	rxvt_term::scr_reset ()
161	{	215	{
162	#if ENABLE_OVERLAY	216	#if ENABLE_OVERLAY
163	scr_overlay_off ();	217	scr_overlay_off ();
164	#endif	218	#endif
…		…
190	total_rows = nrow + saveLines;	244	total_rows = nrow + saveLines;
191		245
192	screen.tscroll = 0;	246	screen.tscroll = 0;
193	screen.bscroll = nrow - 1;	247	screen.bscroll = nrow - 1;
194		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
195	if (!row_buf)	257	if (!prev_row_buf)
196	{	258	{
197	/*
198	* first time called so just malloc everything: don't rely on realloc
199	*/
200	top_row = 0;	259	top_row = 0;
201	term_start = 0;	260	term_start = 0;
202
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206	row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207	drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208	swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210	for (int row = nrow; row--; )
211	{
212	scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214	scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215	}
216		261
217	memset (charsets, 'B', sizeof (charsets));	262	memset (charsets, 'B', sizeof (charsets));
218	rstyle = DEFAULT_RSTYLE;	263	rstyle = DEFAULT_RSTYLE;
219	screen.flags = Screen_DefaultFlags;	264	screen.flags = Screen_DefaultFlags;
220	screen.cur.row = screen.cur.col = 0;	265	screen.cur.row = screen.cur.col = 0;
…		…
243	{	288	{
244	/*	289	/*
245	* add or delete rows as appropriate	290	* add or delete rows as appropriate
246	*/	291	*/
247		292
248	rxvt_salloc old_ta = talloc; talloc = new rxvt_salloc (ncol sizeof (text_t));	293	int common_col = min (prev_ncol, ncol);
249	rxvt_salloc old_ra = ralloc; ralloc = new rxvt_salloc (ncol sizeof (rend_t));
250
251	#if 0
252	if (nrow < prev_nrow)
253	{
254	for (int row = nrow; row < prev_nrow; row++)
255	{
256	lfree (swap_buf [row]);
257	lfree (drawn_buf[row]);
258	}
259	}
260	#endif
261
262	drawn_buf = (line_t )rxvt_realloc (drawn_buf, nrow sizeof (line_t));
263	swap_buf = (line_t )rxvt_realloc (swap_buf , nrow sizeof (line_t));
264		294
265	for (int row = min (nrow, prev_nrow); row--; )	295	for (int row = min (nrow, prev_nrow); row--; )
266	{	296	{
267	lresize (drawn_buf[row]);	297	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268	lresize (swap_buf [row]);	298	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269	}	299	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270		300
271	for (int row = prev_nrow; row < nrow; row++)	301	copy_line (swap_buf [row], prev_swap_buf [row]);
272	{	302	}
273	swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}
276
277	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279		303
280	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
281	int pend = MOD (term_start + top_row , prev_total_rows);	305	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	306	int q = total_rows; // rewrapped row
283		307
…		…
291	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	315	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292		316
293	do	317	do
294	{	318	{
295	p = MOD (p - 1, prev_total_rows);	319	p = MOD (p - 1, prev_total_rows);
296	assert (old_buf [MOD (p, prev_total_rows)].t);	320	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297	int plines = 1;	321	int plines = 1;
298	int llen = old_buf [MOD (p, prev_total_rows)].l;	322	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299		323
300	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 ())
301	{	325	{
302	p = MOD (p - 1, prev_total_rows);	326	p = MOD (p - 1, prev_total_rows);
303		327
304	plines++;	328	plines++;
305	llen += prev_ncol;	329	llen += prev_ncol;
…		…
318		342
319	// re-assemble the full line by destination lines	343	// re-assemble the full line by destination lines
320	for (int qrow = q; qlines--; qrow++)	344	for (int qrow = q; qlines--; qrow++)
321	{	345	{
322	qline = row_buf + qrow;	346	qline = row_buf + qrow;
323	lalloc (*qline);	347	qline->alloc (); // redundant with next line
324	qline->l = ncol;	348	qline->l = ncol;
325	qline->is_longer (1);	349	qline->is_longer (1);
326		350
327	int qcol = 0;	351	int qcol = 0;
328		352
…		…
343	// this seems to upset applications/shells/readline	367	// this seems to upset applications/shells/readline
344	// least.	368	// least.
345	if (prow == ocur.row)	369	if (prow == ocur.row)
346	screen.cur.row = q - (total_rows - nrow);	370	screen.cur.row = q - (total_rows - nrow);
347		371
348	line_t &pline = old_buf [prow];	372	line_t &pline = prev_row_buf [prow];
349		373
350	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	374	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351		375
352	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	376	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	377	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
374	{	398	{
375	// if no scrollback exists (yet), wing, instead of wrap	399	// if no scrollback exists (yet), wing, instead of wrap
376		400
377	for (int row = min (nrow, prev_nrow); row--; )	401	for (int row = min (nrow, prev_nrow); row--; )
378	{	402	{
379	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)];
380	line_t &qline = row_buf [row];	404	line_t &dst = row_buf [row];
381		405
382	qline = pline;	406	copy_line (dst, src);
383	lresize (qline);
384	}	407	}
385		408
386	for (int row = prev_nrow; row < nrow; row++)	409	for (int row = prev_nrow; row < nrow; row++)
387	{
388	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	410	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389	}
390		411
391	term_start = 0;	412	term_start = 0;
392	}	413	}
393
394	free (old_buf);
395	delete old_ta;
396	delete old_ra;
397		414
398	clamp_it (screen.cur.row, 0, nrow - 1);	415	clamp_it (screen.cur.row, 0, nrow - 1);
399	clamp_it (screen.cur.col, 0, ncol - 1);	416	clamp_it (screen.cur.col, 0, ncol - 1);
400	}	417	}
401		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
402	free (tabs);	428	free (tabs);
403	tabs = (char *)rxvt_malloc (ncol);	429	tabs = (char *)rxvt_malloc (ncol);
404		430
405	for (int col = ncol; col--; )	431	for (int col = ncol; col--; )
406	tabs [col] = col % TABSIZE == 0;	432	tabs [col] = col % TABSIZE == 0;
407		433
408	CLEAR_SELECTION ();	434	CLEAR_ALL_SELECTION ();
409	CLEAR_SELECTION_MARK ();
410		435
411	prev_nrow = nrow;	436	prev_nrow = nrow;
412	prev_ncol = ncol;	437	prev_ncol = ncol;
413		438
414	tt_winch ();	439	tt_winch ();
415		440
416	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	441	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
417	}	442	}
418		443
419	/* ------------------------------------------------------------------------- */	444	void ecb_cold
420	/*
421	* Free everything. That way malloc debugging can find leakage.
422	*/
423	void
424	rxvt_term::scr_release () NOTHROW	445	rxvt_term::scr_release () NOTHROW
425	{	446	{
426	if (row_buf)	447	chunk_free (chunk, chunk_size);
427	{	448	chunk = 0;
428	delete talloc; talloc = 0;	449	row_buf = 0;
429	delete ralloc; ralloc = 0;
430		450
431	free (row_buf);
432	free (swap_buf);
433	free (drawn_buf);
434	row_buf = 0; // signal that we freed all the arrays above
435
436	free (tabs);	451	free (tabs);
437	tabs = 0;	452	tabs = 0;
438	}
439	}	453	}
440		454
441	/* ------------------------------------------------------------------------- */	455	/* ------------------------------------------------------------------------- */
442	/*	456	/*
443	* Hard/Soft reset	457	* Hard/Soft reset
444	*/	458	*/
445	void	459	void ecb_cold
446	rxvt_term::scr_poweron ()	460	rxvt_term::scr_poweron ()
447	{	461	{
448	scr_release ();	462	scr_release ();
		463
449	prev_nrow = prev_ncol = 0;	464	prev_nrow = prev_ncol = 0;
450	rvideo_mode = false;	465	rvideo_mode = false;
451	scr_soft_reset ();	466	scr_soft_reset ();
452	scr_reset ();	467	scr_reset ();
453		468
454	scr_clear (true);	469	scr_clear (true);
455	scr_refresh ();	470	scr_refresh ();
456	}	471	}
457		472
458	void	473	void ecb_cold
459	rxvt_term::scr_soft_reset ()	474	rxvt_term::scr_soft_reset () NOTHROW
460	{	475	{
461	/* only affects modes, nothing drastic such as clearing the screen */	476	/* only affects modes, nothing drastic such as clearing the screen */
462	#if ENABLE_OVERLAY	477	#if ENABLE_OVERLAY
463	scr_overlay_off ();	478	scr_overlay_off ();
464	#endif	479	#endif
…		…
519	assert (s->cur.row >= 0);	534	assert (s->cur.row >= 0);
520	assert (s->cur.col >= 0);	535	assert (s->cur.col >= 0);
521	}	536	}
522		537
523	void	538	void
524	rxvt_term::scr_swap_screen ()	539	rxvt_term::scr_swap_screen () NOTHROW
525	{	540	{
526	if (!option (Opt_secondaryScreen))	541	if (!option (Opt_secondaryScreen))
527	return;	542	return;
528		543
529	for (int i = prev_nrow; i--; )	544	for (int i = prev_nrow; i--; )
…		…
548	return;	563	return;
549		564
550	want_refresh = 1;	565	want_refresh = 1;
551	view_start = 0;	566	view_start = 0;
552		567
553	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 ();
554		574
555	current_screen = scrn;	575	current_screen = scrn;
556		576
557	#if NSCREENS	577	#if NSCREENS
558	if (option (Opt_secondaryScreen))	578	if (option (Opt_secondaryScreen))
…		…
624	/*	644	/*
625	* Scroll text between <row1> and <row2> inclusive, by <count> lines	645	* Scroll text between <row1> and <row2> inclusive, by <count> lines
626	* count positive ==> scroll up	646	* count positive ==> scroll up
627	* count negative ==> scroll down	647	* count negative ==> scroll down
628	*/	648	*/
629	int	649	int ecb_hot
630	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
631	{	651	{
632	if (count == 0 \|\| (row1 > row2))	652	if (count == 0 \|\| (row1 > row2))
633	return 0;	653	return 0;
634		654
…		…
695		715
696	// finally move the view window, if desired	716	// finally move the view window, if desired
697	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
698	&& view_start != 0	718	&& view_start != 0
699	&& view_start != -saveLines)	719	&& view_start != -saveLines)
700	scr_page (UP, count);	720	scr_page (count);
701		721
702	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703	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));
704	}	724	}
705	else	725	else
…		…
711	\|\| (selection.beg.row - count < row1 && selection.beg.row >= row1)	731	\|\| (selection.beg.row - count < row1 && selection.beg.row >= row1)
712	\|\| (selection.beg.row - count > row2 && selection.beg.row <= row2)	732	\|\| (selection.beg.row - count > row2 && selection.beg.row <= row2)
713	\|\| (selection.end.row - count < row1 && selection.end.row >= row1)	733	\|\| (selection.end.row - count < row1 && selection.end.row >= row1)
714	\|\| (selection.end.row - count > row2 && selection.end.row <= row2))	734	\|\| (selection.end.row - count > row2 && selection.end.row <= row2))
715	{	735	{
716	CLEAR_SELECTION ();	736	CLEAR_ALL_SELECTION ();
717	if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))	737	selection.op = SELECTION_CLEAR;
718	CLEAR_SELECTION_MARK ();
719	}	738	}
720	else if (selection.end.row >= row1 && selection.end.row <= row2)	739	else if (selection.end.row >= row1 && selection.end.row <= row2)
721	{	740	{
722	/* move selected region too */	741	/* move selected region too */
723	selection.beg.row -= count;	742	selection.beg.row -= count;
…		…
769		788
770	/* ------------------------------------------------------------------------- */	789	/* ------------------------------------------------------------------------- */
771	/*	790	/*
772	* Add text given in <str> of length <len> to screen struct	791	* Add text given in <str> of length <len> to screen struct
773	*/	792	*/
774	void	793	void ecb_hot
775	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
776	{	795	{
777	if (len <= 0) /* sanity */	796	if (len <= 0) /* sanity */
778	return;	797	return;
779		798
…		…
1129	* XTERM_SEQ: ESC 6	1148	* XTERM_SEQ: ESC 6
1130	* 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
1131	* in that row right. Clear left column.	1150	* in that row right. Clear left column.
1132	*/	1151	*/
1133	#if !ENABLE_MINIMAL	1152	#if !ENABLE_MINIMAL
1134	void	1153	void ecb_cold
1135	rxvt_term::scr_backindex () NOTHROW	1154	rxvt_term::scr_backindex () NOTHROW
1136	{	1155	{
1137	if (screen.cur.col > 0)	1156	if (screen.cur.col > 0)
1138	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);	1157	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);
1139	else	1158	else
…		…
1146	* XTERM_SEQ: ESC 9	1165	* XTERM_SEQ: ESC 9
1147	* 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
1148	* in that row left. Clear right column.	1167	* in that row left. Clear right column.
1149	*/	1168	*/
1150	#if !ENABLE_MINIMAL	1169	#if !ENABLE_MINIMAL
1151	void	1170	void ecb_cold
1152	rxvt_term::scr_forwardindex () NOTHROW	1171	rxvt_term::scr_forwardindex () NOTHROW
1153	{	1172	{
1154	if (screen.cur.col < ncol - 1)	1173	if (screen.cur.col < ncol - 1)
1155	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1174	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1156	else	1175	else
…		…
1221	* direction should be UP or DN	1240	* direction should be UP or DN
1222	*/	1241	*/
1223	void	1242	void
1224	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1243	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1225	{	1244	{
1226	int dirn;
1227
1228	want_refresh = 1;	1245	want_refresh = 1;
1229	ZERO_SCROLLBACK ();	1246	ZERO_SCROLLBACK ();
1230		1247
1231	dirn = ((direction == UP) ? 1 : -1);
1232
1233	screen.flags &= ~Screen_WrapNext;	1248	screen.flags &= ~Screen_WrapNext;
1234		1249
1235	if ((screen.cur.row == screen.bscroll && direction == UP)	1250	if ((screen.cur.row == screen.bscroll && direction == UP)
1236	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1251	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1237	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1252	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1238	else	1253	else
1239	screen.cur.row += dirn;	1254	screen.cur.row += direction;
1240		1255
1241	clamp_it (screen.cur.row, 0, nrow - 1);	1256	clamp_it (screen.cur.row, 0, nrow - 1);
1242	selection_check (0);	1257	selection_check (0);
1243	}	1258	}
1244		1259
…		…
1307	scr_blank_line (line, col, num, rstyle);	1322	scr_blank_line (line, col, num, rstyle);
1308	}	1323	}
1309		1324
1310	/* ------------------------------------------------------------------------- */	1325	/* ------------------------------------------------------------------------- */
1311	/*	1326	/*
1312	* Erase part of whole of the screen	1327	* Erase part or whole of the screen
1313	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1328	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1329	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1330	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316	*/	1331	*/
1317	void	1332	void
…		…
1326	ZERO_SCROLLBACK ();	1341	ZERO_SCROLLBACK ();
1327		1342
1328	switch (mode)	1343	switch (mode)
1329	{	1344	{
1330	case 0: /* erase to end of screen */	1345	case 0: /* erase to end of screen */
1331	selection_check (1);
1332	scr_erase_line (0);	1346	scr_erase_line (0);
1333	row = screen.cur.row + 1; /* possible OOB */	1347	row = screen.cur.row + 1; /* possible OOB */
1334	num = nrow - row;	1348	num = nrow - row;
1335	break;	1349	break;
1336	case 1: /* erase to beginning of screen */	1350	case 1: /* erase to beginning of screen */
1337	selection_check (3);
1338	scr_erase_line (1);	1351	scr_erase_line (1);
1339	row = 0;	1352	row = 0;
1340	num = screen.cur.row;	1353	num = screen.cur.row;
1341	break;	1354	break;
1342	case 2: /* erase whole screen */	1355	case 2: /* erase whole screen */
1343	selection_check (3);
1344	row = 0;	1356	row = 0;
1345	num = nrow;	1357	num = nrow;
1346	break;	1358	break;
1347	default:	1359	default:
1348	return;	1360	return;
…		…
1365	{	1377	{
1366	ren = DEFAULT_RSTYLE;	1378	ren = DEFAULT_RSTYLE;
1367		1379
1368	if (mapped)	1380	if (mapped)
1369	XClearArea (dpy, vt, 0,	1381	XClearArea (dpy, vt, 0,
1370	Row2Pixel (row - view_start), (unsigned int)width,	1382	Row2Pixel (row - view_start), (unsigned int)vt_width,
1371	(unsigned int)Height2Pixel (num), False);	1383	(unsigned int)Height2Pixel (num), False);
1372	}	1384	}
1373	else	1385	else
1374	{	1386	{
1375	ren = rstyle & (RS_fgMask \| RS_bgMask);	1387	ren = rstyle & (RS_fgMask \| RS_bgMask);
…		…
1378	{	1390	{
1379	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1391	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1380	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1392	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1381	XFillRectangle (dpy, vt, gc,	1393	XFillRectangle (dpy, vt, gc,
1382	0, Row2Pixel (row - view_start),	1394	0, Row2Pixel (row - view_start),
1383	(unsigned int)width,	1395	(unsigned int)vt_width,
1384	(unsigned int)Height2Pixel (num));	1396	(unsigned int)Height2Pixel (num));
1385	gcvalue.foreground = pix_colors[Color_fg];	1397	gcvalue.foreground = pix_colors[Color_fg];
1386	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1398	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387	}	1399	}
1388	}	1400	}
…		…
1410	/* ------------------------------------------------------------------------- */	1422	/* ------------------------------------------------------------------------- */
1411	/*	1423	/*
1412	* Fill the screen with `E's	1424	* Fill the screen with `E's
1413	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1425	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1414	*/	1426	*/
1415	void	1427	void ecb_cold
1416	rxvt_term::scr_E () NOTHROW	1428	rxvt_term::scr_E () NOTHROW
1417	{	1429	{
1418	rend_t fs;	1430	rend_t fs;
1419		1431
1420	want_refresh = 1;	1432	want_refresh = 1;
1421	ZERO_SCROLLBACK ();	1433	ZERO_SCROLLBACK ();
1422		1434
1423	num_scr_allow = 0;	1435	num_scr_allow = 0;
1424	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 ();
1425		1441
1426	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1442	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427	for (int row = nrow; row--; )	1443	for (int row = nrow; row--; )
1428	{	1444	{
1429	line_t &line = ROW(row);	1445	line_t &line = ROW(row);
…		…
1580	/* ------------------------------------------------------------------------- */	1596	/* ------------------------------------------------------------------------- */
1581	/*	1597	/*
1582	* Set the scrolling region	1598	* Set the scrolling region
1583	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1599	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1584	*/	1600	*/
1585	void	1601	void ecb_cold
1586	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1602	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1587	{	1603	{
1588	max_it (top, 0);	1604	max_it (top, 0);
1589	min_it (bot, nrow - 1);	1605	min_it (bot, nrow - 1);
1590		1606
…		…
1600	/*	1616	/*
1601	* Make the cursor visible/invisible	1617	* Make the cursor visible/invisible
1602	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1618	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1603	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1619	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1604	*/	1620	*/
1605	void	1621	void ecb_cold
1606	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1622	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1607	{	1623	{
1608	want_refresh = 1;	1624	want_refresh = 1;
1609		1625
1610	if (mode)	1626	if (mode)
…		…
1617	/*	1633	/*
1618	* Set/unset automatic wrapping	1634	* Set/unset automatic wrapping
1619	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1635	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1620	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1636	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1621	*/	1637	*/
1622	void	1638	void ecb_cold
1623	rxvt_term::scr_autowrap (int mode) NOTHROW	1639	rxvt_term::scr_autowrap (int mode) NOTHROW
1624	{	1640	{
1625	if (mode)	1641	if (mode)
1626	screen.flags \|= Screen_Autowrap;	1642	screen.flags \|= Screen_Autowrap;
1627	else	1643	else
…		…
1636	* 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
1637	* and the cursor cannot be moved outside.	1653	* and the cursor cannot be moved outside.
1638	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1654	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1639	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1655	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1640	*/	1656	*/
1641	void	1657	void ecb_cold
1642	rxvt_term::scr_relative_origin (int mode) NOTHROW	1658	rxvt_term::scr_relative_origin (int mode) NOTHROW
1643	{	1659	{
1644	if (mode)	1660	if (mode)
1645	screen.flags \|= Screen_Relative;	1661	screen.flags \|= Screen_Relative;
1646	else	1662	else
…		…
1653	/*	1669	/*
1654	* Set insert/replace mode	1670	* Set insert/replace mode
1655	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1671	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1656	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1672	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1657	*/	1673	*/
1658	void	1674	void ecb_cold
1659	rxvt_term::scr_insert_mode (int mode) NOTHROW	1675	rxvt_term::scr_insert_mode (int mode) NOTHROW
1660	{	1676	{
1661	if (mode)	1677	if (mode)
1662	screen.flags \|= Screen_Insert;	1678	screen.flags \|= Screen_Insert;
1663	else	1679	else
…		…
1669	* Set/Unset tabs	1685	* Set/Unset tabs
1670	* XTERM_SEQ: Set tab at current column : ESC H	1686	* XTERM_SEQ: Set tab at current column : ESC H
1671	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1687	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1672	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1688	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1673	*/	1689	*/
1674	void	1690	void ecb_cold
1675	rxvt_term::scr_set_tab (int mode) NOTHROW	1691	rxvt_term::scr_set_tab (int mode) NOTHROW
1676	{	1692	{
1677	if (mode < 0)	1693	if (mode < 0)
1678	memset (tabs, 0, ncol);	1694	memset (tabs, 0, ncol);
1679	else if (screen.cur.col < ncol)	1695	else if (screen.cur.col < ncol)
…		…
1698	if (rvideo_state != on)	1714	if (rvideo_state != on)
1699	{	1715	{
1700	rvideo_state = on;	1716	rvideo_state = on;
1701		1717
1702	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1718	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1703	#ifdef HAVE_BG_PIXMAP	1719	#ifdef HAVE_IMG
1704	if (bg_pixmap == None)	1720	if (bg_img == 0)
1705	#endif	1721	#endif
1706	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1722	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1707		1723
1708	XGCValues gcvalue;	1724	XGCValues gcvalue;
1709	gcvalue.foreground = pix_colors[Color_fg];	1725	gcvalue.foreground = pix_colors[Color_fg];
…		…
1718	/* ------------------------------------------------------------------------- */	1734	/* ------------------------------------------------------------------------- */
1719	/*	1735	/*
1720	* Report current cursor position	1736	* Report current cursor position
1721	* XTERM_SEQ: Report position: ESC [ 6 n	1737	* XTERM_SEQ: Report position: ESC [ 6 n
1722	*/	1738	*/
1723	void	1739	void ecb_cold
1724	rxvt_term::scr_report_position () NOTHROW	1740	rxvt_term::scr_report_position () NOTHROW
1725	{	1741	{
1726	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);
1727	}	1743	}
1728		1744
…		…
1731	* ------------------------------------------------------------------------- */	1747	* ------------------------------------------------------------------------- */
1732		1748
1733	/*	1749	/*
1734	* Set font style	1750	* Set font style
1735	*/	1751	*/
1736	void	1752	void ecb_cold
1737	rxvt_term::set_font_style () NOTHROW	1753	rxvt_term::set_font_style () NOTHROW
1738	{	1754	{
1739	#if 0	1755	#if 0
1740	switch (charsets [screen.charset])	1756	switch (charsets [screen.charset])
1741	{	1757	{
…		…
1763	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1779	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1764	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1780	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1765	* XTERM_SEQ: Invoke G2 character set: ESC N	1781	* XTERM_SEQ: Invoke G2 character set: ESC N
1766	* XTERM_SEQ: Invoke G3 character set: ESC O	1782	* XTERM_SEQ: Invoke G3 character set: ESC O
1767	*/	1783	*/
1768	void	1784	void ecb_cold
1769	rxvt_term::scr_charset_choose (int set) NOTHROW	1785	rxvt_term::scr_charset_choose (int set) NOTHROW
1770	{	1786	{
1771	screen.charset = set;	1787	screen.charset = set;
1772	set_font_style ();	1788	set_font_style ();
1773	}	1789	}
…		…
1794	* ------------------------------------------------------------------------- */	1810	* ------------------------------------------------------------------------- */
1795		1811
1796	/*	1812	/*
1797	* refresh matching text.	1813	* refresh matching text.
1798	*/	1814	*/
1799	bool	1815	bool ecb_cold
1800	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
1801	{	1817	{
1802	bool found = false;	1818	bool found = false;
1803		1819
1804	for (int i = 0; i < nrow; i++)	1820	for (int i = 0; i < nrow; i++)
…		…
1823	PART_BEG = 0,	1839	PART_BEG = 0,
1824	PART_END,	1840	PART_END,
1825	RC_COUNT	1841	RC_COUNT
1826	};	1842	};
1827		1843
1828	void	1844	void ecb_hot
1829	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
1830	{	1846	{
1831	int i;	1847	int i;
1832	row_col_t rc[RC_COUNT];	1848	row_col_t rc[RC_COUNT];
1833		1849
…		…
1870	* Refresh the entire screen	1886	* Refresh the entire screen
1871	*/	1887	*/
1872	void	1888	void
1873	rxvt_term::scr_touch (bool refresh) NOTHROW	1889	rxvt_term::scr_touch (bool refresh) NOTHROW
1874	{	1890	{
1875	scr_expose (0, 0, width, height, refresh);	1891	scr_expose (0, 0, vt_width, vt_height, refresh);
1876	}	1892	}
1877		1893
1878	/* ------------------------------------------------------------------------- */	1894	/* ------------------------------------------------------------------------- */
1879	/*	1895	/*
1880	* 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
1881	* the top of the screen	1897	* the top of the screen
1882	*/	1898	*/
1883	void	1899	void
1884	rxvt_term::scr_move_to (int y, int len) NOTHROW	1900	rxvt_term::scr_move_to (int y, int len) NOTHROW
1885	{	1901	{
1886	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);
1887	}	1904	}
1888		1905
1889	/* ------------------------------------------------------------------------- */	1906	/* ------------------------------------------------------------------------- */
1890	/*	1907	/*
1891	* Page the screen up/down nlines	1908	* Page the screen up/down nlines
1892	* direction should be UP or DN	1909	* direction should be UP or DN
1893	*/	1910	*/
1894	bool	1911	bool
1895	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1912	rxvt_term::scr_page (int nlines) NOTHROW
1896	{	1913	{
1897	int new_view_start =
1898	direction == UP ? view_start - nlines
1899	: view_start + nlines;
1900
1901	return scr_changeview (new_view_start);	1914	return scr_changeview (view_start - nlines);
1902	}	1915	}
1903		1916
1904	bool	1917	bool
1905	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1918	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1906	{	1919	{
…		…
1959	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1972	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1960	#endif	1973	#endif
1961	}	1974	}
1962		1975
1963	/* ------------------------------------------------------------------------- */	1976	/* ------------------------------------------------------------------------- */
1964	void	1977	void ecb_cold
1965	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1978	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1966	{	1979	{
1967	#ifdef PRINTPIPE	1980	#ifdef PRINTPIPE
1968	int nrows, row_start;	1981	int nrows, row_start;
1969	FILE *fd = popen_printer ();	1982	FILE *fd = popen_printer ();
…		…
2018	/*	2031	/*
2019	* Refresh the screen	2032	* Refresh the screen
2020	* drawn_text/drawn_rend contain the screen information before the update.	2033	* drawn_text/drawn_rend contain the screen information before the update.
2021	* screen.text/screen.rend contain what the screen will change to.	2034	* screen.text/screen.rend contain what the screen will change to.
2022	*/	2035	*/
2023	void	2036	void ecb_hot
2024	rxvt_term::scr_refresh () NOTHROW	2037	rxvt_term::scr_refresh () NOTHROW
2025	{	2038	{
2026	int16_t col, row, /* column/row we're processing */	2039	int16_t col, row, /* column/row we're processing */
2027	ocrow; /* old cursor row */	2040	ocrow; /* old cursor row */
2028	int i; /* tmp */	2041	int i; /* tmp */
2029	#ifndef NO_CURSORCOLOR
2030	rend_t cc1; /* store colours at cursor position (s) */
2031	#endif
2032	rend_t *crp; // cursor rendition pointer
2033	rend_t ccol1, /* Cursor colour */	2042	rend_t ccol1, /* Cursor colour */
2034	ccol2; /* Cursor colour2 */	2043	ccol2; /* Cursor colour2 */
		2044	rend_t cur_rend;
		2045	int cur_col;
		2046	int cursorwidth;
2035		2047
2036	want_refresh = 0; /* screen is current */	2048	want_refresh = 0; /* screen is current */
2037		2049
2038	if (refresh_type == NO_REFRESH \|\| !mapped)	2050	if (refresh_type == NO_REFRESH \|\| !mapped)
2039	return;	2051	return;
…		…
2043	*/	2055	*/
2044	refresh_count = 0;	2056	refresh_count = 0;
2045		2057
2046	unsigned int old_screen_flags = screen.flags;	2058	unsigned int old_screen_flags = screen.flags;
2047	bool have_bg = 0;	2059	bool have_bg = 0;
2048	#ifdef HAVE_BG_PIXMAP	2060	#ifdef HAVE_IMG
2049	have_bg = bg_pixmap != None;	2061	have_bg = bg_img != 0;
2050	#endif	2062	#endif
2051	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2063	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2052		2064
2053	/*	2065	/*
2054	* B: reverse any characters which are selected	2066	* B: reverse any characters which are selected
…		…
2064		2076
2065	/*	2077	/*
2066	* C: set the cursor character (s)	2078	* C: set the cursor character (s)
2067	*/	2079	*/
2068	{	2080	{
2069	bool setoldcursor;
2070
2071	#ifdef CURSOR_BLINK	2081	#ifdef CURSOR_BLINK
2072	if (hidden_cursor)	2082	if (hidden_cursor)
2073	showcursor = 0;	2083	showcursor = 0;
2074	#endif	2084	#endif
2075		2085
…		…
2078	int col = screen.cur.col;	2088	int col = screen.cur.col;
2079		2089
2080	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2090	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2081	col--;	2091	col--;
2082		2092
		2093	cursorwidth = 1;
		2094	while (col + cursorwidth < ncol
		2095	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2096	cursorwidth++;
		2097
2083	crp = &ROW(screen.cur.row).r[col];	2098	cur_rend = ROW(screen.cur.row).r[col];
		2099	cur_col = col;
2084		2100
2085	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2086	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2087	if (ISSET_PIXCOLOR (Color_cursor))	2102	if (ISSET_PIXCOLOR (Color_cursor))
2088	ccol1 = Color_cursor;	2103	ccol1 = Color_cursor;
2089	else	2104	else
2090	#endif	2105	#endif
2091	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2103	ccol2 = bgcolor_of (rstyle);	2118	ccol2 = bgcolor_of (rstyle);
2104	#else	2119	#else
2105	ccol2 = Color_bg;	2120	ccol2 = Color_bg;
2106	#endif	2121	#endif
2107		2122
2108	if (focus)	2123	if (focus && cursor_type != 2)
2109	{	2124	{
2110	if (option (Opt_cursorUnderline))	2125	rend_t rend = cur_rend;
		2126
		2127	if (cursor_type == 1)
2111	*crp ^= RS_Uline;	2128	rend ^= RS_Uline;
2112	else	2129	else
2113	{	2130	{
2114	*crp ^= RS_RVid;	2131	rend ^= RS_RVid;
2115	crp = SET_FGCOLOR (crp, ccol1);	2132	rend = SET_FGCOLOR (rend, ccol1);
2116	crp = SET_BGCOLOR (crp, ccol2);	2133	rend = SET_BGCOLOR (rend, ccol2);
2117	}	2134	}
		2135
		2136	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2118	}	2137	}
2119	}	2138	}
2120		2139
2121	/* make sure no outline cursor is left around */	2140	/* make sure no outline cursor is left around */
2122	setoldcursor = 0;
2123	if (ocrow != -1)	2141	if (ocrow != -1)
2124	{	2142	{
2125	if (screen.cur.row - view_start != ocrow	2143	if (screen.cur.row - view_start != ocrow
2126	\|\| screen.cur.col != oldcursor.col)	2144	\|\| screen.cur.col != oldcursor.col \|\| !showcursor)
2127	{	2145	{
2128	if (ocrow < nrow	2146	if (ocrow < nrow
2129	&& oldcursor.col < ncol)	2147	&& oldcursor.col < ncol)
2130	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);	2148	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2131
2132	if (focus \|\| !showcursor)
2133	oldcursor.row = -1;
2134	else
2135	setoldcursor = 1;
2136	}	2149	}
2137	}	2150	}
2138	else if (!focus)
2139	setoldcursor = 1;
2140		2151
2141	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)
2142	{	2157	{
2143	if (screen.cur.row - view_start >= nrow)
2144	oldcursor.row = -1;
2145	else
2146	{
2147	oldcursor.row = screen.cur.row - view_start;	2158	oldcursor.row = screen.cur.row - view_start;
2148	oldcursor.col = screen.cur.col;	2159	oldcursor.col = screen.cur.col;
2149	}
2150	}	2160	}
		2161	else
		2162	oldcursor.row = -1;
2151	}	2163	}
2152		2164
2153	#ifndef NO_SLOW_LINK_SUPPORT	2165	#ifndef NO_SLOW_LINK_SUPPORT
2154	/*	2166	/*
2155	* D: CopyArea pass - very useful for slower links	2167	* D: CopyArea pass - very useful for slower links
…		…
2161	{	2173	{
2162	int16_t nits;	2174	int16_t nits;
2163	int i = num_scr;	2175	int i = num_scr;
2164	int j;	2176	int j;
2165	int len, wlen;	2177	int len, wlen;
2166	dLocal (int, num_scr);
2167		2178
2168	j = nrow;	2179	j = nrow;
2169	wlen = len = -1;	2180	wlen = len = -1;
2170	row = i > 0 ? 0 : j - 1;	2181	row = i > 0 ? 0 : j - 1;
2171		2182
…		…
2237	int ypixel = (int)Row2Pixel (row);	2248	int ypixel = (int)Row2Pixel (row);
2238		2249
2239	for (col = 0; col < ncol; col++)	2250	for (col = 0; col < ncol; col++)
2240	{	2251	{
2241	/* compare new text with old - if exactly the same then continue */	2252	/* compare new text with old - if exactly the same then continue */
2242	if (stp[col] == dtp[col] /* Must match characters to skip. */	2253	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2243	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244	\|\| (stp[col] == ' ' /* space w/ no background change */
2245	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2246	continue;	2254	continue;
2247		2255
2248	// redraw one or more characters	2256	// redraw one or more characters
2249		2257
2250	// seek to the beginning of wide characters	2258	// seek to the beginning of wide characters
…		…
2422	else	2430	else
2423	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2424		2432
2425	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2426	{	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
2427	#if ENABLE_FRILLS	2439	#if ENABLE_FRILLS
2428	if (ISSET_PIXCOLOR (Color_underline))	2440	if (ISSET_PIXCOLOR (Color_underline))
2429	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2441	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2430	else	2442	else
2431	#endif	2443	#endif
…		…
2443	*/	2455	*/
2444	if (showcursor)	2456	if (showcursor)
2445	{	2457	{
2446	if (focus)	2458	if (focus)
2447	{	2459	{
2448	if (option (Opt_cursorUnderline))	2460	if (cursor_type != 2)
2449	*crp ^= RS_Uline;	2461	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2450	else	2462	else if (oldcursor.row >= 0)
2451	{	2463	{
2452	*crp ^= RS_RVid;	2464	XSetForeground (dpy, gc, pix_colors[ccol1]);
2453	#ifndef NO_CURSORCOLOR	2465	XFillRectangle (dpy, vt, gc,
2454	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2466	Col2Pixel (cur_col),
2455	#endif	2467	Row2Pixel (oldcursor.row),
		2468	1,
		2469	Height2Pixel (1));
2456	}	2470	}
2457	}	2471	}
2458	else if (oldcursor.row >= 0)	2472	else if (oldcursor.row >= 0)
2459	{	2473	{
2460	int cursorwidth = 1;
2461	int col = oldcursor.col;
2462
2463	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2464	col--;
2465
2466	while (col + cursorwidth < ncol
2467	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2468	cursorwidth++;
2469
2470	#ifndef NO_CURSORCOLOR
2471	if (ISSET_PIXCOLOR (Color_cursor))
2472	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473	else
2474	#endif
2475	XSetForeground (dpy, gc, pix_colors[ccol1]);	2474	XSetForeground (dpy, gc, pix_colors[ccol1]);
2476		2475
2477	XDrawRectangle (dpy, vt, gc,	2476	XDrawRectangle (dpy, vt, gc,
2478	Col2Pixel (col),	2477	Col2Pixel (cur_col),
2479	Row2Pixel (oldcursor.row),	2478	Row2Pixel (oldcursor.row),
2480	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2479	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2481	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2480	(unsigned int) (Height2Pixel (1) - 1));
2482	}	2481	}
2483	}	2482	}
2484		2483
2485	/*	2484	/*
2486	* H: cleanup selection	2485	* H: cleanup selection
…		…
2495	screen.flags = old_screen_flags;	2494	screen.flags = old_screen_flags;
2496	num_scr = 0;	2495	num_scr = 0;
2497	num_scr_allow = 1;	2496	num_scr_allow = 1;
2498	}	2497	}
2499		2498
2500	void	2499	void ecb_cold
2501	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2500	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2502	{	2501	{
2503	if (!l.t)	2502	if (!l.valid ())
2504	return;	2503	return;
2505		2504
2506	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
2507		2506
2508	for (int i = ncol; i--; )	2507	for (int i = ncol; i--; )
2509	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]));
2510	}	2509	}
2511		2510
2512	void	2511	void ecb_cold
2513	rxvt_term::scr_remap_chars () NOTHROW	2512	rxvt_term::scr_remap_chars () NOTHROW
2514	{	2513	{
2515	for (int i = total_rows; i--; )	2514	for (int i = total_rows; i--; )
2516	scr_remap_chars (row_buf [i]);	2515	scr_remap_chars (row_buf [i]);
2517		2516
…		…
2520	scr_remap_chars (drawn_buf [i]);	2519	scr_remap_chars (drawn_buf [i]);
2521	scr_remap_chars (swap_buf [i]);	2520	scr_remap_chars (swap_buf [i]);
2522	}	2521	}
2523	}	2522	}
2524		2523
2525	void	2524	void ecb_cold
2526	rxvt_term::scr_recolour (bool refresh) NOTHROW	2525	rxvt_term::scr_recolour (bool refresh) NOTHROW
2527	{	2526	{
2528	bool transparent = false;	2527	bool transparent = false;
2529		2528
2530	#ifdef HAVE_BG_PIXMAP	2529	#ifdef HAVE_IMG
2531	if (bg_pixmap != None)	2530	if (bg_img != 0)
2532	{	2531	{
2533	# ifdef ENABLE_TRANSPARENCY	2532	# if ENABLE_TRANSPARENCY
2534	if (bg_flags & BG_IS_TRANSPARENT)	2533	if (bg_flags & BG_IS_TRANSPARENT)
2535	{	2534	{
2536	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);	2535	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2537	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2536	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2538		2537
2539	transparent = true;	2538	transparent = true;
2540	}	2539	}
2541	else	2540	else
2542	# endif	2541	# endif
2543	{	2542	{
2544	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);	2543	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2544	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2546	}	2545	}
2547	}	2546	}
2548	else	2547	else
2549	#endif	2548	#endif
2550	{	2549	{
…		…
2557	if (scrollBar.win)	2556	if (scrollBar.win)
2558	{	2557	{
2559	if (transparent)	2558	if (transparent)
2560	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2559	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561	else	2560	else
2562	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2561	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2563	scrollBar.state = SB_STATE_IDLE;	2562	scrollBar.state = SB_STATE_IDLE;
2564	scrollBar.show (0);	2563	scrollBar.show (0);
2565	}	2564	}
2566		2565
2567	if (refresh)	2566	if (refresh)
…		…
2633	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2632	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2634	srp[col] ^= rstyle;	2633	srp[col] ^= rstyle;
2635	}	2634	}
2636		2635
2637	/* ------------------------------------------------------------------------- */	2636	/* ------------------------------------------------------------------------- */
2638	void	2637	void ecb_hot
2639	rxvt_term::scr_reverse_selection () NOTHROW	2638	rxvt_term::scr_reverse_selection () NOTHROW
2640	{	2639	{
2641	if (selection.op	2640	if (selection.op
2642	&& current_screen == selection.screen	2641	&& current_screen == selection.screen
2643	&& selection.end.row >= view_start)	2642	&& selection.end.row >= view_start)
…		…
2662	*/	2661	*/
2663	#if 0	2662	#if 0
2664	void	2663	void
2665	rxvt_term::scr_dump (int fd) NOTHROW	2664	rxvt_term::scr_dump (int fd) NOTHROW
2666	{	2665	{
2667	int row, wrote;	2666	// if this method is needed, it can be implemented by factoring the
2668	unsigned int width, towrite;	2667	// relevant code in scr_printscreen
2669	const char r1[] = "\n";
2670
2671	for (row = saveLines + top_row;
2672	row < saveLines + nrow - 1; row++)
2673	{
2674	width = row_buf[row].l >= 0 ? row_buf[row].l
2675	: ncol;
2676	for (towrite = width; towrite; towrite -= wrote)
2677	{
2678	wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679	towrite);
2680	if (wrote < 0)
2681	return; /* XXX: death, no report */
2682	}
2683	if (row_buf[row].l >= 0)
2684	if (write (fd, r1, 1) <= 0)
2685	return; /* XXX: death, no report */
2686	}
2687	}	2668	}
2688	#endif	2669	#endif
2689		2670
2690	/* ------------------------------------------------------------------------- *	2671	/* ------------------------------------------------------------------------- *
2691	* CHARACTER SELECTION *	2672	* CHARACTER SELECTION *
…		…
2694	rxvt_term::selection_check (int check_more) NOTHROW	2675	rxvt_term::selection_check (int check_more) NOTHROW
2695	{	2676	{
2696	if (!selection.op)	2677	if (!selection.op)
2697	return;	2678	return;
2698		2679
2699	row_col_t pos;
2700	pos.row = pos.col = 0;
2701
2702	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2680	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
		2681	\|\| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2703	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2682	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2704	\|\| (check_more == 1	2683	\|\| (check_more == 1
2705	&& current_screen == selection.screen	2684	&& current_screen == selection.screen
2706	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2685	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2707	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2686	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2708	\|\| (check_more == 2
2709	&& ROWCOL_IS_BEFORE (selection.beg, pos)
2710	&& ROWCOL_IS_AFTER (selection.end, pos))
2711	\|\| (check_more == 3
2712	&& ROWCOL_IS_AFTER (selection.end, pos)))
2713	CLEAR_SELECTION ();	2687	CLEAR_ALL_SELECTION ();
		2688	}
2714		2689
2715	if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))	2690	void
2716	CLEAR_SELECTION_MARK ();	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;
2717	}	2702	}
2718		2703
2719	/* ------------------------------------------------------------------------- */	2704	/* ------------------------------------------------------------------------- */
2720	/*	2705	/*
2721	* Paste a selection direct to the command fd	2706	* Paste a selection direct to the command fd
…		…
2727	for (unsigned int i = 0; i < len; i++)	2712	for (unsigned int i = 0; i < len; i++)
2728	if (data[i] == C0_LF)	2713	if (data[i] == C0_LF)
2729	data[i] = C0_CR;	2714	data[i] = C0_CR;
2730		2715
2731	if (priv_modes & PrivMode_BracketPaste)	2716	if (priv_modes & PrivMode_BracketPaste)
2732	tt_printf ("\e[200~");	2717	tt_printf ("\x1b[200~");
2733		2718
2734	tt_write (data, len);	2719	tt_write (data, len);
2735		2720
2736	if (priv_modes & PrivMode_BracketPaste)	2721	if (priv_modes & PrivMode_BracketPaste)
2737	tt_printf ("\e[201~");	2722	tt_printf ("\x1b[201~");
2738	}	2723	}
2739		2724
2740	void	2725	void
2741	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2726	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2742	{	2727	{
…		…
2962	/* ------------------------------------------------------------------------- */	2947	/* ------------------------------------------------------------------------- */
2963	/*	2948	/*
2964	* 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
2965	* EXT: button 1 press	2950	* EXT: button 1 press
2966	*/	2951	*/
2967	void	2952	void ecb_cold
2968	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2953	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2969	{	2954	{
2970	clicks = ((clicks - 1) % 3) + 1;	2955	clicks = ((clicks - 1) % 3) + 1;
2971	selection.clicks = clicks; /* save clicks so extend will work */	2956	selection.clicks = clicks; /* save clicks so extend will work */
2972		2957
…		…
2991		2976
2992	/* ------------------------------------------------------------------------- */	2977	/* ------------------------------------------------------------------------- */
2993	/*	2978	/*
2994	* Mark a selection at the specified col/row	2979	* Mark a selection at the specified col/row
2995	*/	2980	*/
2996	void	2981	void ecb_cold
2997	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2982	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2998	{	2983	{
2999	want_refresh = 1;	2984	want_refresh = 1;
3000		2985
3001	selection.mark.row = row + view_start;	2986	selection.mark.row = row + view_start;
…		…
3024	* Word select: select text for 2 clicks	3009	* Word select: select text for 2 clicks
3025	* We now only find out the boundary in one direction	3010	* We now only find out the boundary in one direction
3026	*/	3011	*/
3027		3012
3028	/* 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 */
3029	#define DELIMIT_TEXT(x) \	3014	#define DELIMIT_TEXT(x) \
3030	(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)))
3031	#define DELIMIT_REND(x) 1	3016	#define DELIMIT_REND(x) 1
3032		3017
3033	void	3018	void ecb_cold
3034	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
3035	{	3020	{
3036	int col, row, dirnadd, tcol, trow, w1, w2;	3021	int col, row, dirnadd, tcol, trow, w1, w2;
3037	row_col_t bound;	3022	row_col_t bound;
3038	text_t *stp;	3023	text_t *stp;
…		…
3112	* EXT: button 3 press; button 1 or 3 drag	3097	* EXT: button 3 press; button 1 or 3 drag
3113	* flag == 0 ==> button 1	3098	* flag == 0 ==> button 1
3114	* flag == 1 ==> button 3 press	3099	* flag == 1 ==> button 3 press
3115	* flag == 2 ==> button 3 motion	3100	* flag == 2 ==> button 3 motion
3116	*/	3101	*/
3117	void	3102	void ecb_cold
3118	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3103	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3119	{	3104	{
3120	int col = clamp (Pixel2Col (x), 0, ncol);	3105	int col = clamp (Pixel2Col (x), 0, ncol);
3121	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3106	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3122		3107
…		…
3148		3133
3149	/* ------------------------------------------------------------------------- */	3134	/* ------------------------------------------------------------------------- */
3150	/*	3135	/*
3151	* Extend the selection to the specified col/row	3136	* Extend the selection to the specified col/row
3152	*/	3137	*/
3153	void	3138	void ecb_cold
3154	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
3155	{	3140	{
3156	row_col_t pos;	3141	row_col_t pos;
3157	enum {	3142	enum {
3158	LEFT, RIGHT	3143	LEFT, RIGHT
3159	} closeto = RIGHT;	3144	} closeto = RIGHT;
3160
3161	want_refresh = 1;
3162		3145
3163	switch (selection.op)	3146	switch (selection.op)
3164	{	3147	{
3165	case SELECTION_INIT:	3148	case SELECTION_INIT:
3166	CLEAR_SELECTION ();	3149	CLEAR_SELECTION ();
…		…
3346		3329
3347	#if !ENABLE_MINIMAL	3330	#if !ENABLE_MINIMAL
3348	if (selection.rect && selection.beg.col > selection.end.col)	3331	if (selection.rect && selection.beg.col > selection.end.col)
3349	::swap (selection.beg.col, selection.end.col);	3332	::swap (selection.beg.col, selection.end.col);
3350	#endif	3333	#endif
		3334
		3335	selection_changed ();
3351	}	3336	}
3352		3337
3353	#if !ENABLE_MINIMAL	3338	#if !ENABLE_MINIMAL
3354	void	3339	void ecb_cold
3355	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3340	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3356	{	3341	{
3357	int32_t end_col, end_row;	3342	int32_t end_col, end_row;
3358	text_t *stp;	3343	text_t *stp;
3359		3344
…		…
3397	/* ------------------------------------------------------------------------- */	3382	/* ------------------------------------------------------------------------- */
3398	/*	3383	/*
3399	* Double click on button 3 when already selected	3384	* Double click on button 3 when already selected
3400	* EXT: button 3 double click	3385	* EXT: button 3 double click
3401	*/	3386	*/
3402	void	3387	void ecb_cold
3403	rxvt_term::selection_rotate (int x, int y) NOTHROW	3388	rxvt_term::selection_rotate (int x, int y) NOTHROW
3404	{	3389	{
3405	selection.clicks = selection.clicks % 3 + 1;	3390	selection.clicks = selection.clicks % 3 + 1;
3406	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3391	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3407	}	3392	}
…		…
3409	/* ------------------------------------------------------------------------- */	3394	/* ------------------------------------------------------------------------- */
3410	/*	3395	/*
3411	* Respond to a request for our current selection	3396	* Respond to a request for our current selection
3412	* EXT: SelectionRequest	3397	* EXT: SelectionRequest
3413	*/	3398	*/
3414	void	3399	void ecb_cold
3415	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3400	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3416	{	3401	{
3417	Atom property = rq.property == None ? rq.target : rq.property;	3402	Atom property = rq.property == None ? rq.target : rq.property;
3418	XSelectionEvent ev;	3403	XSelectionEvent ev;
3419		3404
…		…
3552		3537
3553	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3538	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3554	}	3539	}
3555		3540
3556	/* ------------------------------------------------------------------------- */	3541	/* ------------------------------------------------------------------------- */
3557	#ifdef USE_XIM	3542	#if USE_XIM
3558	void	3543	void ecb_cold
3559	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3544	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3560	{	3545	{
3561	XWindowAttributes xwa;	3546	XWindowAttributes xwa;
3562		3547
3563	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.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs. Revision 1.449 by sf-exg, Wed Nov 19 12:21:11 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC vs.
Revision 1.449 by sf-exg, Wed Nov 19 12:21:11 2014 UTC