[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.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

…		…
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;
…		…
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	/*	259	/*
200	* first time called so just malloc everything: don't rely on realloc	260	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
201	*/	261	*/
202	top_row = 0;	262	top_row = 0;
203	term_start = 0;	263	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		264
219	memset (charsets, 'B', sizeof (charsets));	265	memset (charsets, 'B', sizeof (charsets));
220	rstyle = DEFAULT_RSTYLE;	266	rstyle = DEFAULT_RSTYLE;
221	screen.flags = Screen_DefaultFlags;	267	screen.flags = Screen_DefaultFlags;
222	screen.cur.row = screen.cur.col = 0;	268	screen.cur.row = screen.cur.col = 0;
…		…
245	{	291	{
246	/*	292	/*
247	* add or delete rows as appropriate	293	* add or delete rows as appropriate
248	*/	294	*/
249		295
250	rxvt_salloc old_ta = talloc; talloc = new rxvt_salloc (ncol sizeof (text_t));
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
267	for (int row = min (nrow, prev_nrow); row--; )	296	for (int row = min (nrow, prev_nrow); row--; )
268	{	297	{
269	lresize (drawn_buf[row]);	298	copy_line (drawn_buf [row], prev_drawn_buf [row]);
270	lresize (swap_buf [row]);	299	copy_line (swap_buf [row], prev_swap_buf [row]);
271	}
272
273	for (int row = prev_nrow; row < nrow; row++)
274	{	300	}
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		301
282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	302	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283	int pend = MOD (term_start + top_row , prev_total_rows);	303	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	304	int q = total_rows; // rewrapped row
285		305
…		…
293	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	313	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294		314
295	do	315	do
296	{	316	{
297	p = MOD (p - 1, prev_total_rows);	317	p = MOD (p - 1, prev_total_rows);
298	assert (old_buf [MOD (p, prev_total_rows)].t);	318	assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299	int plines = 1;	319	int plines = 1;
300	int llen = old_buf [MOD (p, prev_total_rows)].l;	320	int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301		321
302	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	322	while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303	{	323	{
304	p = MOD (p - 1, prev_total_rows);	324	p = MOD (p - 1, prev_total_rows);
305		325
306	plines++;	326	plines++;
307	llen += prev_ncol;	327	llen += prev_ncol;
…		…
320		340
321	// re-assemble the full line by destination lines	341	// re-assemble the full line by destination lines
322	for (int qrow = q; qlines--; qrow++)	342	for (int qrow = q; qlines--; qrow++)
323	{	343	{
324	qline = row_buf + qrow;	344	qline = row_buf + qrow;
325	lalloc (*qline);	345	qline->alloc (); // redundant with next line
326	qline->l = ncol;	346	qline->l = ncol;
327	qline->is_longer (1);	347	qline->is_longer (1);
328		348
329	int qcol = 0;	349	int qcol = 0;
330		350
…		…
345	// this seems to upset applications/shells/readline	365	// this seems to upset applications/shells/readline
346	// least.	366	// least.
347	if (prow == ocur.row)	367	if (prow == ocur.row)
348	screen.cur.row = q - (total_rows - nrow);	368	screen.cur.row = q - (total_rows - nrow);
349		369
350	line_t &pline = old_buf [prow];	370	line_t &pline = prev_row_buf [prow];
351		371
352	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	372	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353		373
354	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	374	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	375	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
…		…
376	{	396	{
377	// if no scrollback exists (yet), wing, instead of wrap	397	// if no scrollback exists (yet), wing, instead of wrap
378		398
379	for (int row = min (nrow, prev_nrow); row--; )	399	for (int row = min (nrow, prev_nrow); row--; )
380	{	400	{
381	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	401	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382	line_t &qline = row_buf [row];	402	line_t &dst = row_buf [row];
383		403
384	qline = pline;	404	copy_line (dst, src);
385	lresize (qline);
386	}	405	}
387		406
388	for (int row = prev_nrow; row < nrow; row++)	407	for (int row = prev_nrow; row < nrow; row++)
389	{
390	row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	408	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391	}
392		409
393	term_start = 0;	410	term_start = 0;
394	}	411	}
395
396	free (old_buf);
397	delete old_ta;
398	delete old_ra;
399		412
400	clamp_it (screen.cur.row, 0, nrow - 1);	413	clamp_it (screen.cur.row, 0, nrow - 1);
401	clamp_it (screen.cur.col, 0, ncol - 1);	414	clamp_it (screen.cur.col, 0, ncol - 1);
402	}	415	}
403		416
		417	for (int row = nrow; row--; )
		418	{
		419	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
		420	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
		421	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
		422	}
		423
		424	chunk_free (prev_chunk, prev_chunk_size);
		425
404	free (tabs);	426	free (tabs);
405	tabs = (char *)rxvt_malloc (ncol);	427	tabs = (char *)rxvt_malloc (ncol);
406		428
407	for (int col = ncol; col--; )	429	for (int col = ncol; col--; )
408	tabs [col] = col % TABSIZE == 0;	430	tabs [col] = col % TABSIZE == 0;
…		…
415	tt_winch ();	437	tt_winch ();
416		438
417	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	439	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418	}	440	}
419		441
420	/* ------------------------------------------------------------------------- */	442	void ecb_cold
421	/*
422	* Free everything. That way malloc debugging can find leakage.
423	*/
424	void
425	rxvt_term::scr_release () NOTHROW	443	rxvt_term::scr_release () NOTHROW
426	{	444	{
427	if (row_buf)	445	chunk_free (chunk, chunk_size);
428	{	446	chunk = 0;
429	delete talloc; talloc = 0;	447	row_buf = 0;
430	delete ralloc; ralloc = 0;
431		448
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);	449	free (tabs);
438	tabs = 0;	450	tabs = 0;
439	}
440	}	451	}
441		452
442	/* ------------------------------------------------------------------------- */	453	/* ------------------------------------------------------------------------- */
443	/*	454	/*
444	* Hard/Soft reset	455	* Hard/Soft reset
445	*/	456	*/
446	void	457	void ecb_cold
447	rxvt_term::scr_poweron ()	458	rxvt_term::scr_poweron ()
448	{	459	{
449	scr_release ();	460	scr_release ();
		461
450	prev_nrow = prev_ncol = 0;	462	prev_nrow = prev_ncol = 0;
451	rvideo_mode = false;	463	rvideo_mode = false;
452	scr_soft_reset ();	464	scr_soft_reset ();
453	scr_reset ();	465	scr_reset ();
454		466
455	scr_clear (true);	467	scr_clear (true);
456	scr_refresh ();	468	scr_refresh ();
457	}	469	}
458		470
459	void	471	void ecb_cold
460	rxvt_term::scr_soft_reset ()	472	rxvt_term::scr_soft_reset () NOTHROW
461	{	473	{
462	/* only affects modes, nothing drastic such as clearing the screen */	474	/* only affects modes, nothing drastic such as clearing the screen */
463	#if ENABLE_OVERLAY	475	#if ENABLE_OVERLAY
464	scr_overlay_off ();	476	scr_overlay_off ();
465	#endif	477	#endif
…		…
520	assert (s->cur.row >= 0);	532	assert (s->cur.row >= 0);
521	assert (s->cur.col >= 0);	533	assert (s->cur.col >= 0);
522	}	534	}
523		535
524	void	536	void
525	rxvt_term::scr_swap_screen ()	537	rxvt_term::scr_swap_screen () NOTHROW
526	{	538	{
527	if (!option (Opt_secondaryScreen))	539	if (!option (Opt_secondaryScreen))
528	return;	540	return;
529		541
530	for (int i = prev_nrow; i--; )	542	for (int i = prev_nrow; i--; )
…		…
549	return;	561	return;
550		562
551	want_refresh = 1;	563	want_refresh = 1;
552	view_start = 0;	564	view_start = 0;
553		565
554	selection_check (2); /* check for boundary cross */	566	/* check for boundary cross */
		567	row_col_t pos;
		568	pos.row = pos.col = 0;
		569	if (ROWCOL_IS_BEFORE (selection.beg, pos)
		570	&& ROWCOL_IS_AFTER (selection.end, pos))
		571	CLEAR_SELECTION ();
555		572
556	current_screen = scrn;	573	current_screen = scrn;
557		574
558	#if NSCREENS	575	#if NSCREENS
559	if (option (Opt_secondaryScreen))	576	if (option (Opt_secondaryScreen))
…		…
625	/*	642	/*
626	* Scroll text between <row1> and <row2> inclusive, by <count> lines	643	* Scroll text between <row1> and <row2> inclusive, by <count> lines
627	* count positive ==> scroll up	644	* count positive ==> scroll up
628	* count negative ==> scroll down	645	* count negative ==> scroll down
629	*/	646	*/
630	int	647	int ecb_hot
631	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW	648	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632	{	649	{
633	if (count == 0 \|\| (row1 > row2))	650	if (count == 0 \|\| (row1 > row2))
634	return 0;	651	return 0;
635		652
…		…
681	}	698	}
682	else	699	else
683	scr_blank_screen_mem (l, rstyle);	700	scr_blank_screen_mem (l, rstyle);
684	}	701	}
685		702
		703	// move and/or clear selection, if any
		704	if (selection.op && current_screen == selection.screen
		705	&& selection.beg.row <= row2)
		706	{
		707	selection.beg.row -= count;
		708	selection.end.row -= count;
		709	selection.mark.row -= count;
		710
		711	selection_check (0);
		712	}
		713
686	// finally move the view window, if desired	714	// finally move the view window, if desired
687	if (option (Opt_scrollWithBuffer)	715	if (option (Opt_scrollWithBuffer)
688	&& view_start != 0	716	&& view_start != 0
689	&& view_start != -saveLines)	717	&& view_start != -saveLines)
690	scr_page (UP, count);	718	scr_page (UP, count);
…		…
692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	720	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	721	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
694	}	722	}
695	else	723	else
696	{	724	{
		725	if (selection.op && current_screen == selection.screen)
		726	{
		727	if ((selection.beg.row < row1 && selection.end.row > row1)
		728	\|\| (selection.beg.row < row2 && selection.end.row > row2)
		729	\|\| (selection.beg.row - count < row1 && selection.beg.row >= row1)
		730	\|\| (selection.beg.row - count > row2 && selection.beg.row <= row2)
		731	\|\| (selection.end.row - count < row1 && selection.end.row >= row1)
		732	\|\| (selection.end.row - count > row2 && selection.end.row <= row2))
		733	{
		734	CLEAR_ALL_SELECTION ();
		735	selection.op = SELECTION_CLEAR;
		736	}
		737	else if (selection.end.row >= row1 && selection.end.row <= row2)
		738	{
		739	/* move selected region too */
		740	selection.beg.row -= count;
		741	selection.end.row -= count;
		742	selection.mark.row -= count;
		743
		744	selection_check (0);
		745	}
		746	}
		747
697	// use a simple and robust scrolling algorithm, this	748	// use a simple and robust scrolling algorithm, this
698	// part of scr_scroll_text is not time-critical.	749	// part of scr_scroll_text is not time-critical.
699		750
700	// sever line above scroll region	751	// sever line above scroll region
701	if (row1)	752	if (row1)
…		…
728	l.is_longer (0);	779	l.is_longer (0);
729	l.touch ();	780	l.touch ();
730	}	781	}
731	}	782	}
732		783
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;	784	return count;
755	}	785	}
756		786
757	/* ------------------------------------------------------------------------- */	787	/* ------------------------------------------------------------------------- */
758	/*	788	/*
759	* Add text given in <str> of length <len> to screen struct	789	* Add text given in <str> of length <len> to screen struct
760	*/	790	*/
761	void	791	void ecb_hot
762	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW	792	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
763	{	793	{
764	if (len <= 0) /* sanity */	794	if (len <= 0) /* sanity */
765	return;	795	return;
766		796
767	unsigned char checksel;	797	bool checksel;
768	unicode_t c;	798	unicode_t c;
769	int ncol = this->ncol;	799	int ncol = this->ncol;
770	const wchar_t *strend = str + len;	800	const wchar_t *strend = str + len;
771		801
772	want_refresh = 1;	802	want_refresh = 1;
…		…
1116	* XTERM_SEQ: ESC 6	1146	* XTERM_SEQ: ESC 6
1117	* Move cursor left in row. If we're at the left boundary, shift everything	1147	* Move cursor left in row. If we're at the left boundary, shift everything
1118	* in that row right. Clear left column.	1148	* in that row right. Clear left column.
1119	*/	1149	*/
1120	#if !ENABLE_MINIMAL	1150	#if !ENABLE_MINIMAL
1121	void	1151	void ecb_cold
1122	rxvt_term::scr_backindex () NOTHROW	1152	rxvt_term::scr_backindex () NOTHROW
1123	{	1153	{
1124	if (screen.cur.col > 0)	1154	if (screen.cur.col > 0)
1125	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);	1155	scr_gotorc (0, -1, R_RELATIVE \| C_RELATIVE);
1126	else	1156	else
…		…
1133	* XTERM_SEQ: ESC 9	1163	* XTERM_SEQ: ESC 9
1134	* Move cursor right in row. If we're at the right boundary, shift everything	1164	* Move cursor right in row. If we're at the right boundary, shift everything
1135	* in that row left. Clear right column.	1165	* in that row left. Clear right column.
1136	*/	1166	*/
1137	#if !ENABLE_MINIMAL	1167	#if !ENABLE_MINIMAL
1138	void	1168	void ecb_cold
1139	rxvt_term::scr_forwardindex () NOTHROW	1169	rxvt_term::scr_forwardindex () NOTHROW
1140	{	1170	{
1141	if (screen.cur.col < ncol - 1)	1171	if (screen.cur.col < ncol - 1)
1142	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);	1172	scr_gotorc (0, 1, R_RELATIVE \| C_RELATIVE);
1143	else	1173	else
…		…
1294	scr_blank_line (line, col, num, rstyle);	1324	scr_blank_line (line, col, num, rstyle);
1295	}	1325	}
1296		1326
1297	/* ------------------------------------------------------------------------- */	1327	/* ------------------------------------------------------------------------- */
1298	/*	1328	/*
1299	* Erase part of whole of the screen	1329	* Erase part or whole of the screen
1300	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1330	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1331	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1332	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303	*/	1333	*/
1304	void	1334	void
…		…
1313	ZERO_SCROLLBACK ();	1343	ZERO_SCROLLBACK ();
1314		1344
1315	switch (mode)	1345	switch (mode)
1316	{	1346	{
1317	case 0: /* erase to end of screen */	1347	case 0: /* erase to end of screen */
1318	selection_check (1);
1319	scr_erase_line (0);	1348	scr_erase_line (0);
1320	row = screen.cur.row + 1; /* possible OOB */	1349	row = screen.cur.row + 1; /* possible OOB */
1321	num = nrow - row;	1350	num = nrow - row;
1322	break;	1351	break;
1323	case 1: /* erase to beginning of screen */	1352	case 1: /* erase to beginning of screen */
1324	selection_check (3);
1325	scr_erase_line (1);	1353	scr_erase_line (1);
1326	row = 0;	1354	row = 0;
1327	num = screen.cur.row;	1355	num = screen.cur.row;
1328	break;	1356	break;
1329	case 2: /* erase whole screen */	1357	case 2: /* erase whole screen */
1330	selection_check (3);
1331	row = 0;	1358	row = 0;
1332	num = nrow;	1359	num = nrow;
1333	break;	1360	break;
1334	default:	1361	default:
1335	return;	1362	return;
…		…
1352	{	1379	{
1353	ren = DEFAULT_RSTYLE;	1380	ren = DEFAULT_RSTYLE;
1354		1381
1355	if (mapped)	1382	if (mapped)
1356	XClearArea (dpy, vt, 0,	1383	XClearArea (dpy, vt, 0,
1357	Row2Pixel (row - view_start), (unsigned int)width,	1384	Row2Pixel (row - view_start), (unsigned int)vt_width,
1358	(unsigned int)Height2Pixel (num), False);	1385	(unsigned int)Height2Pixel (num), False);
1359	}	1386	}
1360	else	1387	else
1361	{	1388	{
1362	ren = rstyle & (RS_fgMask \| RS_bgMask);	1389	ren = rstyle & (RS_fgMask \| RS_bgMask);
…		…
1365	{	1392	{
1366	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1393	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1394	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368	XFillRectangle (dpy, vt, gc,	1395	XFillRectangle (dpy, vt, gc,
1369	0, Row2Pixel (row - view_start),	1396	0, Row2Pixel (row - view_start),
1370	(unsigned int)width,	1397	(unsigned int)vt_width,
1371	(unsigned int)Height2Pixel (num));	1398	(unsigned int)Height2Pixel (num));
1372	gcvalue.foreground = pix_colors[Color_fg];	1399	gcvalue.foreground = pix_colors[Color_fg];
1373	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1400	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374	}	1401	}
1375	}	1402	}
…		…
1397	/* ------------------------------------------------------------------------- */	1424	/* ------------------------------------------------------------------------- */
1398	/*	1425	/*
1399	* Fill the screen with `E's	1426	* Fill the screen with `E's
1400	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1427	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1401	*/	1428	*/
1402	void	1429	void ecb_cold
1403	rxvt_term::scr_E () NOTHROW	1430	rxvt_term::scr_E () NOTHROW
1404	{	1431	{
1405	rend_t fs;	1432	rend_t fs;
1406		1433
1407	want_refresh = 1;	1434	want_refresh = 1;
1408	ZERO_SCROLLBACK ();	1435	ZERO_SCROLLBACK ();
1409		1436
1410	num_scr_allow = 0;	1437	num_scr_allow = 0;
1411	selection_check (3);	1438
		1439	row_col_t pos;
		1440	pos.row = pos.col = 0;
		1441	if (ROWCOL_IS_AFTER (selection.end, pos))
		1442	CLEAR_SELECTION ();
1412		1443
1413	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));	1444	fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414	for (int row = nrow; row--; )	1445	for (int row = nrow; row--; )
1415	{	1446	{
1416	line_t &line = ROW(row);	1447	line_t &line = ROW(row);
…		…
1567	/* ------------------------------------------------------------------------- */	1598	/* ------------------------------------------------------------------------- */
1568	/*	1599	/*
1569	* Set the scrolling region	1600	* Set the scrolling region
1570	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1601	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571	*/	1602	*/
1572	void	1603	void ecb_cold
1573	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW	1604	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574	{	1605	{
1575	max_it (top, 0);	1606	max_it (top, 0);
1576	min_it (bot, nrow - 1);	1607	min_it (bot, nrow - 1);
1577		1608
…		…
1587	/*	1618	/*
1588	* Make the cursor visible/invisible	1619	* Make the cursor visible/invisible
1589	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1620	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1621	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591	*/	1622	*/
1592	void	1623	void ecb_cold
1593	rxvt_term::scr_cursor_visible (int mode) NOTHROW	1624	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594	{	1625	{
1595	want_refresh = 1;	1626	want_refresh = 1;
1596		1627
1597	if (mode)	1628	if (mode)
…		…
1604	/*	1635	/*
1605	* Set/unset automatic wrapping	1636	* Set/unset automatic wrapping
1606	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1637	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1638	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608	*/	1639	*/
1609	void	1640	void ecb_cold
1610	rxvt_term::scr_autowrap (int mode) NOTHROW	1641	rxvt_term::scr_autowrap (int mode) NOTHROW
1611	{	1642	{
1612	if (mode)	1643	if (mode)
1613	screen.flags \|= Screen_Autowrap;	1644	screen.flags \|= Screen_Autowrap;
1614	else	1645	else
…		…
1623	* Relative mode: line numbers are relative to top margin of scrolling region	1654	* Relative mode: line numbers are relative to top margin of scrolling region
1624	* and the cursor cannot be moved outside.	1655	* and the cursor cannot be moved outside.
1625	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1656	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1657	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627	*/	1658	*/
1628	void	1659	void ecb_cold
1629	rxvt_term::scr_relative_origin (int mode) NOTHROW	1660	rxvt_term::scr_relative_origin (int mode) NOTHROW
1630	{	1661	{
1631	if (mode)	1662	if (mode)
1632	screen.flags \|= Screen_Relative;	1663	screen.flags \|= Screen_Relative;
1633	else	1664	else
…		…
1640	/*	1671	/*
1641	* Set insert/replace mode	1672	* Set insert/replace mode
1642	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1673	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1674	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644	*/	1675	*/
1645	void	1676	void ecb_cold
1646	rxvt_term::scr_insert_mode (int mode) NOTHROW	1677	rxvt_term::scr_insert_mode (int mode) NOTHROW
1647	{	1678	{
1648	if (mode)	1679	if (mode)
1649	screen.flags \|= Screen_Insert;	1680	screen.flags \|= Screen_Insert;
1650	else	1681	else
…		…
1656	* Set/Unset tabs	1687	* Set/Unset tabs
1657	* XTERM_SEQ: Set tab at current column : ESC H	1688	* XTERM_SEQ: Set tab at current column : ESC H
1658	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1689	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1690	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660	*/	1691	*/
1661	void	1692	void ecb_cold
1662	rxvt_term::scr_set_tab (int mode) NOTHROW	1693	rxvt_term::scr_set_tab (int mode) NOTHROW
1663	{	1694	{
1664	if (mode < 0)	1695	if (mode < 0)
1665	memset (tabs, 0, ncol);	1696	memset (tabs, 0, ncol);
1666	else if (screen.cur.col < ncol)	1697	else if (screen.cur.col < ncol)
…		…
1685	if (rvideo_state != on)	1716	if (rvideo_state != on)
1686	{	1717	{
1687	rvideo_state = on;	1718	rvideo_state = on;
1688		1719
1689	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1720	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690	#ifdef HAVE_BG_PIXMAP	1721	#ifdef HAVE_IMG
1691	if (bg_pixmap == None)	1722	if (bg_img == 0)
1692	#endif	1723	#endif
1693	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1724	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694		1725
1695	XGCValues gcvalue;	1726	XGCValues gcvalue;
1696	gcvalue.foreground = pix_colors[Color_fg];	1727	gcvalue.foreground = pix_colors[Color_fg];
…		…
1705	/* ------------------------------------------------------------------------- */	1736	/* ------------------------------------------------------------------------- */
1706	/*	1737	/*
1707	* Report current cursor position	1738	* Report current cursor position
1708	* XTERM_SEQ: Report position: ESC [ 6 n	1739	* XTERM_SEQ: Report position: ESC [ 6 n
1709	*/	1740	*/
1710	void	1741	void ecb_cold
1711	rxvt_term::scr_report_position () NOTHROW	1742	rxvt_term::scr_report_position () NOTHROW
1712	{	1743	{
1713	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1744	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714	}	1745	}
1715		1746
…		…
1718	* ------------------------------------------------------------------------- */	1749	* ------------------------------------------------------------------------- */
1719		1750
1720	/*	1751	/*
1721	* Set font style	1752	* Set font style
1722	*/	1753	*/
1723	void	1754	void ecb_cold
1724	rxvt_term::set_font_style () NOTHROW	1755	rxvt_term::set_font_style () NOTHROW
1725	{	1756	{
1726	#if 0	1757	#if 0
1727	switch (charsets [screen.charset])	1758	switch (charsets [screen.charset])
1728	{	1759	{
…		…
1750	* XTERM_SEQ: Invoke G0 character set: CTRL-O	1781	* XTERM_SEQ: Invoke G0 character set: CTRL-O
1751	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1782	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1752	* XTERM_SEQ: Invoke G2 character set: ESC N	1783	* XTERM_SEQ: Invoke G2 character set: ESC N
1753	* XTERM_SEQ: Invoke G3 character set: ESC O	1784	* XTERM_SEQ: Invoke G3 character set: ESC O
1754	*/	1785	*/
1755	void	1786	void ecb_cold
1756	rxvt_term::scr_charset_choose (int set) NOTHROW	1787	rxvt_term::scr_charset_choose (int set) NOTHROW
1757	{	1788	{
1758	screen.charset = set;	1789	screen.charset = set;
1759	set_font_style ();	1790	set_font_style ();
1760	}	1791	}
…		…
1781	* ------------------------------------------------------------------------- */	1812	* ------------------------------------------------------------------------- */
1782		1813
1783	/*	1814	/*
1784	* refresh matching text.	1815	* refresh matching text.
1785	*/	1816	*/
1786	bool	1817	bool ecb_cold
1787	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW	1818	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788	{	1819	{
1789	bool found = false;	1820	bool found = false;
1790		1821
1791	for (int i = 0; i < nrow; i++)	1822	for (int i = 0; i < nrow; i++)
…		…
1810	PART_BEG = 0,	1841	PART_BEG = 0,
1811	PART_END,	1842	PART_END,
1812	RC_COUNT	1843	RC_COUNT
1813	};	1844	};
1814		1845
1815	void	1846	void ecb_hot
1816	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW	1847	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817	{	1848	{
1818	int i;	1849	int i;
1819	row_col_t rc[RC_COUNT];	1850	row_col_t rc[RC_COUNT];
1820		1851
…		…
1857	* Refresh the entire screen	1888	* Refresh the entire screen
1858	*/	1889	*/
1859	void	1890	void
1860	rxvt_term::scr_touch (bool refresh) NOTHROW	1891	rxvt_term::scr_touch (bool refresh) NOTHROW
1861	{	1892	{
1862	scr_expose (0, 0, width, height, refresh);	1893	scr_expose (0, 0, vt_width, vt_height, refresh);
1863	}	1894	}
1864		1895
1865	/* ------------------------------------------------------------------------- */	1896	/* ------------------------------------------------------------------------- */
1866	/*	1897	/*
1867	* Move the display so that the line represented by scrollbar value Y is at	1898	* Move the display so that the line represented by scrollbar value Y is at
…		…
1946	HOOK_INVOKE ((this, HOOK_BELL, DT_END));	1977	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947	#endif	1978	#endif
1948	}	1979	}
1949		1980
1950	/* ------------------------------------------------------------------------- */	1981	/* ------------------------------------------------------------------------- */
1951	void	1982	void ecb_cold
1952	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1983	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953	{	1984	{
1954	#ifdef PRINTPIPE	1985	#ifdef PRINTPIPE
1955	int nrows, row_start;	1986	int nrows, row_start;
1956	FILE *fd = popen_printer ();	1987	FILE *fd = popen_printer ();
…		…
2005	/*	2036	/*
2006	* Refresh the screen	2037	* Refresh the screen
2007	* drawn_text/drawn_rend contain the screen information before the update.	2038	* drawn_text/drawn_rend contain the screen information before the update.
2008	* screen.text/screen.rend contain what the screen will change to.	2039	* screen.text/screen.rend contain what the screen will change to.
2009	*/	2040	*/
2010	void	2041	void ecb_hot
2011	rxvt_term::scr_refresh () NOTHROW	2042	rxvt_term::scr_refresh () NOTHROW
2012	{	2043	{
2013	int16_t col, row, /* column/row we're processing */	2044	int16_t col, row, /* column/row we're processing */
2014	ocrow; /* old cursor row */	2045	ocrow; /* old cursor row */
2015	int i; /* tmp */	2046	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 */	2047	rend_t ccol1, /* Cursor colour */
2021	ccol2; /* Cursor colour2 */	2048	ccol2; /* Cursor colour2 */
		2049	rend_t cur_rend;
		2050	int cur_col;
2022		2051
2023	want_refresh = 0; /* screen is current */	2052	want_refresh = 0; /* screen is current */
2024		2053
2025	if (refresh_type == NO_REFRESH \|\| !mapped)	2054	if (refresh_type == NO_REFRESH \|\| !mapped)
2026	return;	2055	return;
…		…
2029	* A: set up vars	2058	* A: set up vars
2030	*/	2059	*/
2031	refresh_count = 0;	2060	refresh_count = 0;
2032		2061
2033	unsigned int old_screen_flags = screen.flags;	2062	unsigned int old_screen_flags = screen.flags;
2034	char have_bg = 0;	2063	bool have_bg = 0;
2035	#ifdef HAVE_BG_PIXMAP	2064	#ifdef HAVE_IMG
2036	have_bg = bg_pixmap != None;	2065	have_bg = bg_img != 0;
2037	#endif	2066	#endif
2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2067	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039		2068
2040	/*	2069	/*
2041	* B: reverse any characters which are selected	2070	* B: reverse any characters which are selected
…		…
2045	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));	2074	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046	#if ENABLE_OVERLAY	2075	#if ENABLE_OVERLAY
2047	scr_swap_overlay ();	2076	scr_swap_overlay ();
2048	#endif	2077	#endif
2049		2078
2050	char showcursor = screen.flags & Screen_VisibleCursor;	2079	bool showcursor = screen.flags & Screen_VisibleCursor;
2051		2080
2052	/*	2081	/*
2053	* C: set the cursor character (s)	2082	* C: set the cursor character (s)
2054	*/	2083	*/
2055	{	2084	{
2056	unsigned char setoldcursor;	2085	bool setoldcursor;
2057		2086
2058	#ifdef CURSOR_BLINK	2087	#ifdef CURSOR_BLINK
2059	if (hidden_cursor)	2088	if (hidden_cursor)
2060	showcursor = 0;	2089	showcursor = 0;
2061	#endif	2090	#endif
…		…
2065	int col = screen.cur.col;	2094	int col = screen.cur.col;
2066		2095
2067	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2096	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068	col--;	2097	col--;
2069		2098
2070	crp = &ROW(screen.cur.row).r[col];	2099	cur_rend = ROW(screen.cur.row).r[col];
		2100	cur_col = col;
2071		2101
2072	#ifndef NO_CURSORCOLOR	2102	#ifndef NO_CURSORCOLOR
2073	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2074	if (ISSET_PIXCOLOR (Color_cursor))	2103	if (ISSET_PIXCOLOR (Color_cursor))
2075	ccol1 = Color_cursor;	2104	ccol1 = Color_cursor;
2076	else	2105	else
2077	#endif	2106	#endif
2078	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2107	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2092	ccol2 = Color_bg;	2121	ccol2 = Color_bg;
2093	#endif	2122	#endif
2094		2123
2095	if (focus)	2124	if (focus)
2096	{	2125	{
		2126	rend_t rend = cur_rend;
		2127
2097	if (option (Opt_cursorUnderline))	2128	if (option (Opt_cursorUnderline))
2098	*crp ^= RS_Uline;	2129	rend ^= RS_Uline;
2099	else	2130	else
2100	{	2131	{
2101	*crp ^= RS_RVid;	2132	rend ^= RS_RVid;
2102	crp = SET_FGCOLOR (crp, ccol1);	2133	rend = SET_FGCOLOR (rend, ccol1);
2103	crp = SET_BGCOLOR (crp, ccol2);	2134	rend = SET_BGCOLOR (rend, ccol2);
2104	}	2135	}
		2136
		2137	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105	}	2138	}
2106	}	2139	}
2107		2140
2108	/* make sure no outline cursor is left around */	2141	/* make sure no outline cursor is left around */
2109	setoldcursor = 0;	2142	setoldcursor = 0;
…		…
2148	{	2181	{
2149	int16_t nits;	2182	int16_t nits;
2150	int i = num_scr;	2183	int i = num_scr;
2151	int j;	2184	int j;
2152	int len, wlen;	2185	int len, wlen;
2153	dLocal (int, num_scr);
2154		2186
2155	j = nrow;	2187	j = nrow;
2156	wlen = len = -1;	2188	wlen = len = -1;
2157	row = i > 0 ? 0 : j - 1;	2189	row = i > 0 ? 0 : j - 1;
2158		2190
…		…
2429	* G: cleanup cursor and display outline cursor if necessary	2461	* G: cleanup cursor and display outline cursor if necessary
2430	*/	2462	*/
2431	if (showcursor)	2463	if (showcursor)
2432	{	2464	{
2433	if (focus)	2465	if (focus)
2434	{	2466	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435	if (option (Opt_cursorUnderline))
2436	*crp ^= RS_Uline;
2437	else
2438	{
2439	*crp ^= RS_RVid;
2440	#ifndef NO_CURSORCOLOR
2441	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2442	#endif
2443	}
2444	}
2445	else if (oldcursor.row >= 0)	2467	else if (oldcursor.row >= 0)
2446	{	2468	{
2447	int cursorwidth = 1;	2469	int cursorwidth = 1;
2448	int col = oldcursor.col;	2470	int col = oldcursor.col;
2449		2471
…		…
2463		2485
2464	XDrawRectangle (dpy, vt, gc,	2486	XDrawRectangle (dpy, vt, gc,
2465	Col2Pixel (col),	2487	Col2Pixel (col),
2466	Row2Pixel (oldcursor.row),	2488	Row2Pixel (oldcursor.row),
2467	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2489	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2468	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2490	(unsigned int) (Height2Pixel (1) - 1));
2469	}	2491	}
2470	}	2492	}
2471		2493
2472	/*	2494	/*
2473	* H: cleanup selection	2495	* H: cleanup selection
…		…
2482	screen.flags = old_screen_flags;	2504	screen.flags = old_screen_flags;
2483	num_scr = 0;	2505	num_scr = 0;
2484	num_scr_allow = 1;	2506	num_scr_allow = 1;
2485	}	2507	}
2486		2508
2487	void	2509	void ecb_cold
2488	rxvt_term::scr_remap_chars (line_t &l) NOTHROW	2510	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489	{	2511	{
2490	if (!l.t)	2512	if (!l.valid ())
2491	return;	2513	return;
2492		2514
2493	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2515	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494		2516
2495	for (int i = ncol; i--; )	2517	for (int i = ncol; i--; )
2496	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2518	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497	}	2519	}
2498		2520
2499	void	2521	void ecb_cold
2500	rxvt_term::scr_remap_chars () NOTHROW	2522	rxvt_term::scr_remap_chars () NOTHROW
2501	{	2523	{
2502	for (int i = total_rows; i--; )	2524	for (int i = total_rows; i--; )
2503	scr_remap_chars (row_buf [i]);	2525	scr_remap_chars (row_buf [i]);
2504		2526
…		…
2507	scr_remap_chars (drawn_buf [i]);	2529	scr_remap_chars (drawn_buf [i]);
2508	scr_remap_chars (swap_buf [i]);	2530	scr_remap_chars (swap_buf [i]);
2509	}	2531	}
2510	}	2532	}
2511		2533
2512	void	2534	void ecb_cold
2513	rxvt_term::scr_recolour (bool refresh) NOTHROW	2535	rxvt_term::scr_recolour (bool refresh) NOTHROW
2514	{	2536	{
2515	bool transparent = false;	2537	bool transparent = false;
2516		2538
2517	#ifdef HAVE_BG_PIXMAP	2539	#ifdef HAVE_IMG
2518	if (bg_pixmap != None)	2540	if (bg_img != 0)
2519	{	2541	{
2520	# ifdef ENABLE_TRANSPARENCY	2542	# if ENABLE_TRANSPARENCY
2521	if (bg_flags & BG_IS_TRANSPARENT)	2543	if (bg_flags & BG_IS_TRANSPARENT)
2522	{	2544	{
2523	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);	2545	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2546	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525		2547
2526	transparent = true;	2548	transparent = true;
2527	}	2549	}
2528	else	2550	else
2529	# endif	2551	# endif
2530	{	2552	{
2531	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);	2553	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2554	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533	}	2555	}
2534	}	2556	}
2535	else	2557	else
2536	#endif	2558	#endif
2537	{	2559	{
…		…
2544	if (scrollBar.win)	2566	if (scrollBar.win)
2545	{	2567	{
2546	if (transparent)	2568	if (transparent)
2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2569	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548	else	2570	else
2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2571	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550	scrollBar.state = SB_STATE_IDLE;	2572	scrollBar.state = SB_STATE_IDLE;
2551	scrollBar.show (0);	2573	scrollBar.show (0);
2552	}	2574	}
2553		2575
2554	if (refresh)	2576	if (refresh)
…		…
2620	for (rend_t *srp = ROW(row).r; col < end_col; col++)	2642	for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621	srp[col] ^= rstyle;	2643	srp[col] ^= rstyle;
2622	}	2644	}
2623		2645
2624	/* ------------------------------------------------------------------------- */	2646	/* ------------------------------------------------------------------------- */
2625	void	2647	void ecb_hot
2626	rxvt_term::scr_reverse_selection () NOTHROW	2648	rxvt_term::scr_reverse_selection () NOTHROW
2627	{	2649	{
2628	if (selection.op	2650	if (selection.op
2629	&& current_screen == selection.screen	2651	&& current_screen == selection.screen
2630	&& selection.end.row >= view_start)	2652	&& selection.end.row >= view_start)
…		…
2649	*/	2671	*/
2650	#if 0	2672	#if 0
2651	void	2673	void
2652	rxvt_term::scr_dump (int fd) NOTHROW	2674	rxvt_term::scr_dump (int fd) NOTHROW
2653	{	2675	{
2654	int row, wrote;	2676	// if this method is needed, it can be implemented by factoring the
2655	unsigned int width, towrite;	2677	// 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	}	2678	}
2675	#endif	2679	#endif
2676		2680
2677	/* ------------------------------------------------------------------------- *	2681	/* ------------------------------------------------------------------------- *
2678	* CHARACTER SELECTION *	2682	* CHARACTER SELECTION *
…		…
2680	void	2684	void
2681	rxvt_term::selection_check (int check_more) NOTHROW	2685	rxvt_term::selection_check (int check_more) NOTHROW
2682	{	2686	{
2683	if (!selection.op)	2687	if (!selection.op)
2684	return;	2688	return;
2685
2686	row_col_t pos;
2687	pos.row = pos.col = 0;
2688		2689
2689	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)	2690	if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690	\|\| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)	2691	\|\| !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)	2692	\|\| !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692	\|\| (check_more == 1	2693	\|\| (check_more == 1
2693	&& current_screen == selection.screen	2694	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2695	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	2696	&& 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 ();	2697	CLEAR_ALL_SELECTION ();
2702	}	2698	}
2703		2699
2704	/* ------------------------------------------------------------------------- */	2700	/* ------------------------------------------------------------------------- */
2705	/*	2701	/*
…		…
2712	for (unsigned int i = 0; i < len; i++)	2708	for (unsigned int i = 0; i < len; i++)
2713	if (data[i] == C0_LF)	2709	if (data[i] == C0_LF)
2714	data[i] = C0_CR;	2710	data[i] = C0_CR;
2715		2711
2716	if (priv_modes & PrivMode_BracketPaste)	2712	if (priv_modes & PrivMode_BracketPaste)
2717	tt_printf ("\e[200~");	2713	tt_printf ("\x1b[200~");
2718		2714
2719	tt_write (data, len);	2715	tt_write (data, len);
2720		2716
2721	if (priv_modes & PrivMode_BracketPaste)	2717	if (priv_modes & PrivMode_BracketPaste)
2722	tt_printf ("\e[201~");	2718	tt_printf ("\x1b[201~");
2723	}	2719	}
2724		2720
2725	void	2721	void
2726	rxvt_term::paste (char *data, unsigned int len) NOTHROW	2722	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2727	{	2723	{
…		…
2947	/* ------------------------------------------------------------------------- */	2943	/* ------------------------------------------------------------------------- */
2948	/*	2944	/*
2949	* Mark or select text based upon number of clicks: 1, 2, or 3	2945	* Mark or select text based upon number of clicks: 1, 2, or 3
2950	* EXT: button 1 press	2946	* EXT: button 1 press
2951	*/	2947	*/
2952	void	2948	void ecb_cold
2953	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW	2949	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2954	{	2950	{
2955	clicks = ((clicks - 1) % 3) + 1;	2951	clicks = ((clicks - 1) % 3) + 1;
2956	selection.clicks = clicks; /* save clicks so extend will work */	2952	selection.clicks = clicks; /* save clicks so extend will work */
2957		2953
…		…
2976		2972
2977	/* ------------------------------------------------------------------------- */	2973	/* ------------------------------------------------------------------------- */
2978	/*	2974	/*
2979	* Mark a selection at the specified col/row	2975	* Mark a selection at the specified col/row
2980	*/	2976	*/
2981	void	2977	void ecb_cold
2982	rxvt_term::selection_start_colrow (int col, int row) NOTHROW	2978	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2983	{	2979	{
2984	want_refresh = 1;	2980	want_refresh = 1;
2985		2981
2986	selection.mark.row = row + view_start;	2982	selection.mark.row = row + view_start;
…		…
3013	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3009	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3014	#define DELIMIT_TEXT(x) \	3010	#define DELIMIT_TEXT(x) \
3015	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3011	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3016	#define DELIMIT_REND(x) 1	3012	#define DELIMIT_REND(x) 1
3017		3013
3018	void	3014	void ecb_cold
3019	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3015	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
3020	{	3016	{
3021	int col, row, dirnadd, tcol, trow, w1, w2;	3017	int col, row, dirnadd, tcol, trow, w1, w2;
3022	row_col_t bound;	3018	row_col_t bound;
3023	text_t *stp;	3019	text_t *stp;
…		…
3097	* EXT: button 3 press; button 1 or 3 drag	3093	* EXT: button 3 press; button 1 or 3 drag
3098	* flag == 0 ==> button 1	3094	* flag == 0 ==> button 1
3099	* flag == 1 ==> button 3 press	3095	* flag == 1 ==> button 3 press
3100	* flag == 2 ==> button 3 motion	3096	* flag == 2 ==> button 3 motion
3101	*/	3097	*/
3102	void	3098	void ecb_cold
3103	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW	3099	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3104	{	3100	{
3105	int col = clamp (Pixel2Col (x), 0, ncol);	3101	int col = clamp (Pixel2Col (x), 0, ncol);
3106	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3102	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3107		3103
…		…
3133		3129
3134	/* ------------------------------------------------------------------------- */	3130	/* ------------------------------------------------------------------------- */
3135	/*	3131	/*
3136	* Extend the selection to the specified col/row	3132	* Extend the selection to the specified col/row
3137	*/	3133	*/
3138	void	3134	void ecb_cold
3139	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW	3135	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3140	{	3136	{
3141	row_col_t pos;	3137	row_col_t pos;
3142	enum {	3138	enum {
3143	LEFT, RIGHT	3139	LEFT, RIGHT
…		…
3334	::swap (selection.beg.col, selection.end.col);	3330	::swap (selection.beg.col, selection.end.col);
3335	#endif	3331	#endif
3336	}	3332	}
3337		3333
3338	#if !ENABLE_MINIMAL	3334	#if !ENABLE_MINIMAL
3339	void	3335	void ecb_cold
3340	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3336	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3341	{	3337	{
3342	int32_t end_col, end_row;	3338	int32_t end_col, end_row;
3343	text_t *stp;	3339	text_t *stp;
3344		3340
…		…
3382	/* ------------------------------------------------------------------------- */	3378	/* ------------------------------------------------------------------------- */
3383	/*	3379	/*
3384	* Double click on button 3 when already selected	3380	* Double click on button 3 when already selected
3385	* EXT: button 3 double click	3381	* EXT: button 3 double click
3386	*/	3382	*/
3387	void	3383	void ecb_cold
3388	rxvt_term::selection_rotate (int x, int y) NOTHROW	3384	rxvt_term::selection_rotate (int x, int y) NOTHROW
3389	{	3385	{
3390	selection.clicks = selection.clicks % 3 + 1;	3386	selection.clicks = selection.clicks % 3 + 1;
3391	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3387	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3392	}	3388	}
…		…
3394	/* ------------------------------------------------------------------------- */	3390	/* ------------------------------------------------------------------------- */
3395	/*	3391	/*
3396	* Respond to a request for our current selection	3392	* Respond to a request for our current selection
3397	* EXT: SelectionRequest	3393	* EXT: SelectionRequest
3398	*/	3394	*/
3399	void	3395	void ecb_cold
3400	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW	3396	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3401	{	3397	{
3402	Atom property = rq.property == None ? rq.target : rq.property;	3398	Atom property = rq.property == None ? rq.target : rq.property;
3403	XSelectionEvent ev;	3399	XSelectionEvent ev;
3404		3400
…		…
3537		3533
3538	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3534	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3539	}	3535	}
3540		3536
3541	/* ------------------------------------------------------------------------- */	3537	/* ------------------------------------------------------------------------- */
3542	#ifdef USE_XIM	3538	#if USE_XIM
3543	void	3539	void ecb_cold
3544	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3540	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3545	{	3541	{
3546	XWindowAttributes xwa;	3542	XWindowAttributes xwa;
3547		3543
3548	XGetWindowAttributes (dpy, vt, &xwa);	3544	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.433 by sf-exg, Thu Jan 31 08:07:14 2013 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.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC