ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.261 by root, Sat Feb 18 15:44:26 2006 UTC vs.
Revision 1.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
26		26
27	#include "../config.h" /* NECESSARY */	27	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33	#include <inttypes.h>	31	#include <inttypes.h>
34		32
35	#include "salloc.C" // HACK, should be a seperate compile!	33	#include "salloc.C" // HACK, should be a seperate compile!
36		34
37	inline void fill_text (text_t *start, text_t value, int len)	35	static inline void fill_text (text_t *start, text_t value, int len)
38	{	36	{
39	while (len--)	37	while (len--)
40	*start++ = value;	38	*start++ = value;
41	}	39	}
42		40
…		…
47		45
48	/* ------------------------------------------------------------------------- *	46	/* ------------------------------------------------------------------------- *
49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	47	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50	* ------------------------------------------------------------------------- */	48	* ------------------------------------------------------------------------- */
51	#define ZERO_SCROLLBACK() \	49	#define ZERO_SCROLLBACK() \
52	if (OPTION (Opt_scrollTtyOutput)) \	50	if (option (Opt_scrollTtyOutput)) \
53	view_start = 0	51	view_start = 0
54	#define CLEAR_SELECTION() \	52	#define CLEAR_SELECTION() \
55	selection.beg.row = selection.beg.col \	53	selection.beg.row = selection.beg.col \
56	= selection.end.row = selection.end.col = 0	54	= selection.end.row = selection.end.col = 0
57	#define CLEAR_ALL_SELECTION() \	55	#define CLEAR_ALL_SELECTION() \
…		…
85	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88		86
89	/*	87	/*
90	* CLEAR_ROWS : clear <num> rows starting from row <row>
91	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	88	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93	*/	89	*/
94	#define drawBuffer vt
95
96	#define CLEAR_ROWS(row, num) \
97	if (mapped) \
98	XClearArea (dpy, drawBuffer, 0, \
99	Row2Pixel (row), (unsigned int)width, \
100	(unsigned int)Height2Pixel (num), False)
101
102	#define CLEAR_CHARS(x, y, num) \	90	#define CLEAR_CHARS(x, y, num) \
103	if (mapped) \	91	if (mapped) \
104	XClearArea (dpy, drawBuffer, x, y, \	92	XClearArea (dpy, vt, x, y, \
105	(unsigned int)Width2Pixel (num), \	93	(unsigned int)Width2Pixel (num), \
106	(unsigned int)Height2Pixel (1), False)	94	(unsigned int)Height2Pixel (1), False)
107
108	#define ERASE_ROWS(row, num) \
109	XFillRectangle (dpy, drawBuffer, gc, \
110	0, Row2Pixel (row), \
111	(unsigned int)width, \
112	(unsigned int)Height2Pixel (num))
113		95
114	/* ------------------------------------------------------------------------- *	96	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	97	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	98	* ------------------------------------------------------------------------- */
117		99
…		…
150		132
151	l.l = 0;	133	l.l = 0;
152	l.f = 0;	134	l.f = 0;
153	}	135	}
154		136
		137	// nuke a single wide character at the given column
		138	void
		139	rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
		140	{
		141	// find begin
		142	while (col > 0 && l.t[col] == NOCHAR)
		143	col--;
		144
		145	rend_t rend = l.r[col] & ~RS_baseattrMask;
		146	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
		147
		148	// found start, nuke
		149	do {
		150	l.t[col] = ' ';
		151	l.r[col] = rend;
		152	col++;
		153	} while (col < ncol && l.t[col] == NOCHAR);
		154	}
		155
155	/* ------------------------------------------------------------------------- *	156	/* ------------------------------------------------------------------------- *
156	* SCREEN INITIALISATION *	157	* SCREEN INITIALISATION *
157	* ------------------------------------------------------------------------- */	158	* ------------------------------------------------------------------------- */
158		159
159	void	160	void
160	rxvt_term::scr_reset ()	161	rxvt_term::scr_reset ()
161	{	162	{
162	#if ENABLE_OVERLAY
163	scr_overlay_off ();
164	#endif
165
166	view_start = 0;	163	view_start = 0;
167	num_scr = 0;	164	num_scr = 0;
168		165
169	if (ncol == 0)	166	if (ncol == 0)
170	ncol = 80;	167	ncol = 80;
…		…
172	if (nrow == 0)	169	if (nrow == 0)
173	nrow = 24;	170	nrow = 24;
174		171
175	if (ncol == prev_ncol && nrow == prev_nrow)	172	if (ncol == prev_ncol && nrow == prev_nrow)
176	return;	173	return;
177
178	if (current_screen != PRIMARY)
179	scr_swap_screen ();
180		174
181	// we need at least two lines for wrapping to work correctly	175	// we need at least two lines for wrapping to work correctly
182	while (nrow + saveLines < 2)	176	while (nrow + saveLines < 2)
183	{	177	{
184	//TODO//FIXME	178	//TODO//FIXME
…		…
237	selection.text = NULL;	231	selection.text = NULL;
238	selection.len = 0;	232	selection.len = 0;
239	selection.op = SELECTION_CLEAR;	233	selection.op = SELECTION_CLEAR;
240	selection.screen = PRIMARY;	234	selection.screen = PRIMARY;
241	selection.clicks = 0;	235	selection.clicks = 0;
242	rvideo_state = rvideo_mode = false;
243	}	236	}
244	else	237	else
245	{	238	{
246	/*	239	/*
247	* add or delete rows as appropriate	240	* add or delete rows as appropriate
…		…
276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	269	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277	}	270	}
278		271
279	line_t *old_buf = row_buf;	272	line_t *old_buf = row_buf;
280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	273	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281		274
282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	275	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283	int pend = MOD (term_start + top_row , prev_total_rows);	276	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	277	int q = total_rows; // rewrapped row
285		278
286	if (top_row)	279	if (top_row)
287	{	280	{
288	// Re-wrap lines. This is rather ugly, possibly because I am too dumb	281	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
289	// to come up with a lean and mean algorithm.	282	// to come up with a lean and mean algorithm.
		283	// TODO: maybe optimise when width didn't change
290		284
291	row_col_t ocur = screen.cur;	285	row_col_t ocur = screen.cur;
292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	286	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293		287
294	do	288	do
295	{	289	{
296	p = MOD (p - 1, prev_total_rows);	290	p = MOD (p - 1, prev_total_rows);
297	#ifdef DEBUG_STRICT
298	assert (old_buf [MOD (p, prev_total_rows)].t);	291	assert (old_buf [MOD (p, prev_total_rows)].t);
299	#endif
300	int plines = 1;	292	int plines = 1;
301	int llen = old_buf [MOD (p, prev_total_rows)].l;	293	int llen = old_buf [MOD (p, prev_total_rows)].l;
302		294
303	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())	295	while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304	{	296	{
…		…
330	int qcol = 0;	322	int qcol = 0;
331		323
332	// see below for cursor adjustment rationale	324	// see below for cursor adjustment rationale
333	if (p == ocur.row)	325	if (p == ocur.row)
334	screen.cur.row = q - (total_rows - nrow);	326	screen.cur.row = q - (total_rows - nrow);
335		327
336	// fill a single destination line	328	// fill a single destination line
337	while (lofs < llen && qcol < ncol)	329	while (lofs < llen && qcol < ncol)
338	{	330	{
339	int prow = lofs / prev_ncol;	331	int prow = lofs / prev_ncol;
340	int pcol = lofs % prev_ncol;	332	int pcol = lofs % prev_ncol;
…		…
366	}	358	}
367	while (p != pend && q > 0);	359	while (p != pend && q > 0);
368		360
369	term_start = total_rows - nrow;	361	term_start = total_rows - nrow;
370	top_row = q - term_start;	362	top_row = q - term_start;
371		363
372	// make sure all terminal lines exist	364	// make sure all terminal lines exist
373	while (top_row > 0)	365	while (top_row > 0)
374	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);	366	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375	}	367	}
376	else	368	else
377	{	369	{
378	// if no scrollback exists (yet), wing, instead of wrap	370	// if no scrollback exists (yet), wing, instead of wrap
379		371
380	for (int row = min (nrow, prev_nrow); row--; )	372	for (int row = min (nrow, prev_nrow); row--; )
381	{	373	{
382	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	374	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383	line_t &qline = row_buf [row];	375	line_t &qline = row_buf [row];
384		376
…		…
398	delete old_ta;	390	delete old_ta;
399	delete old_ra;	391	delete old_ra;
400		392
401	clamp_it (screen.cur.row, 0, nrow - 1);	393	clamp_it (screen.cur.row, 0, nrow - 1);
402	clamp_it (screen.cur.col, 0, ncol - 1);	394	clamp_it (screen.cur.col, 0, ncol - 1);
		395	}
403		396
404	free (tabs);	397	free (tabs);
405	}	398	tabs = (char *)rxvt_malloc (ncol);
		399
		400	for (int col = ncol; --col; )
		401	tabs [col] = col % TABSIZE == 0;
406		402
407	CLEAR_ALL_SELECTION ();	403	CLEAR_ALL_SELECTION ();
408		404
409	prev_nrow = nrow;	405	prev_nrow = nrow;
410	prev_ncol = ncol;	406	prev_ncol = ncol;
411
412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414	for (int col = ncol; col--; )
415	tabs [col] = col % TABSIZE == 0;
416
417	if (current_screen != PRIMARY)
418	scr_swap_screen ();
419		407
420	tt_winch ();	408	tt_winch ();
421		409
422	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	410	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423	}	411	}
…		…
435	delete ralloc; ralloc = 0;	423	delete ralloc; ralloc = 0;
436		424
437	free (row_buf);	425	free (row_buf);
438	free (swap_buf);	426	free (swap_buf);
439	free (drawn_buf);	427	free (drawn_buf);
		428	row_buf = 0; // signal that we freed all the arrays above
		429
440	free (tabs);	430	free (tabs);
441		431	tabs = 0;
442	row_buf = 0; // signal that we freed all the arrays
443	}	432	}
444	}	433	}
445		434
446	/* ------------------------------------------------------------------------- */	435	/* ------------------------------------------------------------------------- */
447	/*	436	/*
448	* Hard reset	437	* Hard/Soft reset
449	*/	438	*/
450	void	439	void
451	rxvt_term::scr_poweron ()	440	rxvt_term::scr_poweron ()
452	{	441	{
453	scr_release ();	442	scr_release ();
454	prev_nrow = prev_ncol = 0;	443	prev_nrow = prev_ncol = 0;
		444	rvideo_mode = false;
		445	scr_soft_reset ();
455	scr_reset ();	446	scr_reset ();
456		447
457	scr_clear (true);	448	scr_clear (true);
458	scr_refresh ();	449	scr_refresh ();
		450	}
		451
		452	void
		453	rxvt_term::scr_soft_reset ()
		454	{
		455	/* only affects modes, nothing drastic such as clearing the screen */
		456	#if ENABLE_OVERLAY
		457	scr_overlay_off ();
		458	#endif
		459
		460	if (current_screen != PRIMARY)
		461	scr_swap_screen ();
		462
		463	scr_scroll_region (0, MAX_ROWS - 1);
		464	scr_rendition (0, ~RS_None);
		465	scr_insert_mode (0);
459	}	466	}
460		467
461	/* ------------------------------------------------------------------------- *	468	/* ------------------------------------------------------------------------- *
462	* PROCESS SCREEN COMMANDS *	469	* PROCESS SCREEN COMMANDS *
463	* ------------------------------------------------------------------------- */	470	* ------------------------------------------------------------------------- */
…		…
501	}	508	}
502		509
503	/* boundary check in case screen size changed between SAVE and RESTORE */	510	/* boundary check in case screen size changed between SAVE and RESTORE */
504	min_it (s->cur.row, nrow - 1);	511	min_it (s->cur.row, nrow - 1);
505	min_it (s->cur.col, ncol - 1);	512	min_it (s->cur.col, ncol - 1);
506	#ifdef DEBUG_STRICT
507	assert (s->cur.row >= 0);	513	assert (s->cur.row >= 0);
508	assert (s->cur.col >= 0);	514	assert (s->cur.col >= 0);
509	#endif
510	}	515	}
511		516
512	void	517	void
513	rxvt_term::scr_swap_screen ()	518	rxvt_term::scr_swap_screen ()
514	{	519	{
515	if (!OPTION (Opt_secondaryScreen))	520	if (!option (Opt_secondaryScreen))
516	return;	521	return;
517		522
518	for (int i = prev_nrow; i--; )	523	for (int i = prev_nrow; i--; )
519	::swap (ROW(i), swap_buf [i]);	524	::swap (ROW(i), swap_buf [i]);
520		525
…		…
539	want_refresh = 1;	544	want_refresh = 1;
540	view_start = 0;	545	view_start = 0;
541		546
542	selection_check (2); /* check for boundary cross */	547	selection_check (2); /* check for boundary cross */
543		548
544	int i = current_screen; current_screen = scrn; scrn = i;	549	current_screen = scrn;
545		550
546	#if NSCREENS	551	#if NSCREENS
547	if (OPTION (Opt_secondaryScreen))	552	if (option (Opt_secondaryScreen))
548	{	553	{
549	num_scr = 0;	554	num_scr = 0;
550		555
551	scr_swap_screen ();	556	scr_swap_screen ();
552		557
…		…
555	screen.flags |= Screen_VisibleCursor;	560	screen.flags |= Screen_VisibleCursor;
556	swap.flags |= Screen_VisibleCursor;	561	swap.flags |= Screen_VisibleCursor;
557	}	562	}
558	else	563	else
559	#endif	564	#endif
560	if (OPTION (Opt_secondaryScroll))	565	if (option (Opt_secondaryScroll))
561	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	566	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562	}	567	}
563		568
564	// clear WrapNext indicator, solidifying position on next line	569	// clear WrapNext indicator, solidifying position on next line
565	void	570	void
…		…
598	/*	603	/*
599	* Change the rendition style for following text	604	* Change the rendition style for following text
600	*/	605	*/
601	void	606	void
602	rxvt_term::scr_rendition (int set, int style) NOTHROW	607	rxvt_term::scr_rendition (int set, int style) NOTHROW
603	{	608	{
604	if (set)	609	if (set)
605	rstyle |= style;	610	rstyle |= style;
606	else if (style == ~RS_None)	611	else if (style == ~RS_None)
607	rstyle = DEFAULT_RSTYLE;	612	rstyle = DEFAULT_RSTYLE;
608	else	613	else
609	rstyle &= ~style;	614	rstyle &= ~style;
610	}	615	}
611		616
612	/* ------------------------------------------------------------------------- */	617	/* ------------------------------------------------------------------------- */
613	/*	618	/*
614	* Scroll text between <row1> and <row2> inclusive, by <count> lines	619	* Scroll text between <row1> and <row2> inclusive, by <count> lines
615	* count positive ==> scroll up	620	* count positive ==> scroll up
…		…
624	want_refresh = 1;	629	want_refresh = 1;
625	num_scr += count;	630	num_scr += count;
626		631
627	if (count > 0	632	if (count > 0
628	&& row1 == 0	633	&& row1 == 0
629	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	634	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630	{	635	{
631	top_row = max (top_row - count, -saveLines);	636	top_row = max (top_row - count, -saveLines);
632		637
633	// scroll everything up 'count' lines	638	// scroll everything up 'count' lines
634	term_start = (term_start + count) % total_rows;	639	term_start = (term_start + count) % total_rows;
…		…
666	line_t &l2 = ROW(i);	671	line_t &l2 = ROW(i);
667		672
668	::swap (l1, l2);	673	::swap (l1, l2);
669	l2.touch ();	674	l2.touch ();
670	}	675	}
671		676
672	// move and/or clear selection, if any	677	// move and/or clear selection, if any
673	if (selection.op && current_screen == selection.screen)	678	if (selection.op && current_screen == selection.screen)
674	{	679	{
675	selection.beg.row -= count;	680	selection.beg.row -= count;
676	selection.end.row -= count;	681	selection.end.row -= count;
…		…
684	selection.op = SELECTION_CLEAR;	689	selection.op = SELECTION_CLEAR;
685	}	690	}
686	}	691	}
687		692
688	// finally move the view window, if desired	693	// finally move the view window, if desired
689	if (OPTION (Opt_scrollWithBuffer)	694	if (option (Opt_scrollWithBuffer)
690	&& view_start != 0	695	&& view_start != 0
691	&& view_start != -saveLines)	696	&& view_start != -saveLines)
692	scr_page (UP, count);	697	scr_page (UP, count);
693		698
694	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	699	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
…		…
712	{	717	{
713	/* move selected region too */	718	/* move selected region too */
714	selection.beg.row -= count;	719	selection.beg.row -= count;
715	selection.end.row -= count;	720	selection.end.row -= count;
716	selection.mark.row -= count;	721	selection.mark.row -= count;
717		722
718	selection_check (0);	723	selection_check (0);
719	}	724	}
720	}	725	}
721		726
722	// use a simple and robust scrolling algorithm, this	727	// use a simple and robust scrolling algorithm, this
…		…
774	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);	779	scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775	screen.cur.row -= minlines;	780	screen.cur.row -= minlines;
776	}	781	}
777	}	782	}
778		783
779	#ifdef DEBUG_STRICT
780	assert (screen.cur.col < ncol);	784	assert (screen.cur.col < ncol);
781	assert (screen.cur.row < nrow	785	assert (screen.cur.row < nrow
782	&& screen.cur.row >= top_row);	786	&& screen.cur.row >= top_row);
783	#endif
784	int row = screen.cur.row;	787	int row = screen.cur.row;
785		788
786	checksel = selection.op && current_screen == selection.screen ? 1 : 0;	789	checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787		790
788	line_t *line = &ROW(row);	791	line_t *line = &ROW(row);
789		792
790	while (str < strend)	793	while (str < strend)
791	{	794	{
792	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	795	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793		796
794	if (c < 0x20)	797	if (expect_false (c < 0x20))
795	if (c == C0_LF)	798	if (c == C0_LF)
796	{	799	{
797	max_it (line->l, screen.cur.col);	800	max_it (line->l, screen.cur.col);
798		801
799	screen.flags &= ~Screen_WrapNext;	802	screen.flags &= ~Screen_WrapNext;
…		…
818	{	821	{
819	scr_tab (1, true);	822	scr_tab (1, true);
820	continue;	823	continue;
821	}	824	}
822		825
		826	if (expect_false (
823	if (checksel /* see if we're writing within selection */	827	checksel /* see if we're writing within selection */
824	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	828	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	829	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		830	))
826	{	831	{
827	checksel = 0;	832	checksel = 0;
828	/*	833	/*
829	* If we wrote anywhere in the selected area, kill the selection	834	* If we wrote anywhere in the selected area, kill the selection
830	* XXX: should we kill the mark too? Possibly, but maybe that	835	* XXX: should we kill the mark too? Possibly, but maybe that
831	* should be a similar check.	836	* should be a similar check.
832	*/	837	*/
833	CLEAR_SELECTION ();	838	CLEAR_SELECTION ();
834	}	839	}
835		840
836	if (screen.flags & Screen_WrapNext)	841	if (expect_false (screen.flags & Screen_WrapNext))
837	{	842	{
838	scr_do_wrap ();	843	scr_do_wrap ();
839		844
840	line->l = ncol;	845	line->l = ncol;
841	line->is_longer (1);	846	line->is_longer (1);
842		847
843	row = screen.cur.row;	848	row = screen.cur.row;
844	line = &ROW(row); /* _must_ refresh */	849	line = &ROW(row); /* _must_ refresh */
845	}	850	}
846		851
847	// some utf-8 decoders "decode" surrogate characters: let's fix this.	852	// some utf-8 decoders "decode" surrogate characters: let's fix this.
848	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	853	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849	c = 0xfffd;	854	c = 0xfffd;
850		855
851	// rely on wcwidth to tell us the character width, do wcwidth before	856	// rely on wcwidth to tell us the character width, do wcwidth before
852	// further replacements, as wcwidth might return -1 for the line	857	// further replacements, as wcwidth might return -1 for the line
853	// drawing characters below as they might be invalid in the current	858	// drawing characters below as they might be invalid in the current
854	// locale.	859	// locale.
855	int width = WCWIDTH (c);	860	int width = WCWIDTH (c);
856		861
857	if (charsets [screen.charset] == '0') // DEC SPECIAL	862	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858	{	863	{
859	// vt100 special graphics and line drawing	864	// vt100 special graphics and line drawing
860	// 5f-7e standard vt100	865	// 5f-7e standard vt100
861	// 40-5e rxvt extension for extra curses acs chars	866	// 40-5e rxvt extension for extra curses acs chars
862	static uint16_t vt100_0[62] = { // 41 .. 7e	867	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
875	c = vt100_0[c - 0x41];	880	c = vt100_0[c - 0x41];
876	width = 1; // vt100 line drawing characters are always single-width	881	width = 1; // vt100 line drawing characters are always single-width
877	}	882	}
878	}	883	}
879		884
880	if (screen.flags & Screen_Insert)	885	if (expect_false (screen.flags & Screen_Insert))
881	scr_insdel_chars (width, INSERT);	886	scr_insdel_chars (width, INSERT);
882		887
883	if (width != 0)	888	if (width != 0)
884	{	889	{
885	#if !UNICODE_3	890	#if !UNICODE_3
…		…
891	c = 0xfffd;	896	c = 0xfffd;
892	# endif	897	# endif
893	#endif	898	#endif
894		899
895	// nuke the character at this position, if required	900	// nuke the character at this position, if required
		901	if (expect_false (
896	if (line->t[screen.cur.col] == NOCHAR	902	line->t[screen.cur.col] == NOCHAR
897	|| (screen.cur.col < ncol - 1	903	|| (screen.cur.col < ncol - 1
898	&& line->t[screen.cur.col + 1] == NOCHAR))	904	&& line->t[screen.cur.col + 1] == NOCHAR)
		905	))
		906	scr_kill_char (*line, screen.cur.col);
		907
		908	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
		909
		910	// if the character doesn't fit into the remaining columns...
		911	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899	{	912	{
900	int col = screen.cur.col;	913	// ... artificially enlargen the previous one
901
902	// find begin
903	while (col > 0 && line->t[col] == NOCHAR)
904	col--;
905
906	rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908	// found begin, nuke
909	do {
910	line->t[col] = ' ';
911	line->r[col] = rend;
912	col++;
913	} while (col < ncol && line->t[col] == NOCHAR);
914	}
915
916	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918	// if the character doesn't fit into the remaining columns...
919	if (screen.cur.col > ncol - width && ncol >= width)
920	{
921	// ...output spaces
922	c = ' ';	914	c = NOCHAR;
923	// and try the same character next loop iteration	915	// and try the same character next loop iteration
924	--str;	916	--str;
925	}	917	}
926		918
927	line->touch ();	919	line->touch ();
…		…
929	do	921	do
930	{	922	{
931	line->t[screen.cur.col] = c;	923	line->t[screen.cur.col] = c;
932	line->r[screen.cur.col] = rend;	924	line->r[screen.cur.col] = rend;
933		925
934	if (screen.cur.col < ncol - 1)	926	if (expect_true (screen.cur.col < ncol - 1))
935	screen.cur.col++;	927	screen.cur.col++;
936	else	928	else
937	{	929	{
938	line->l = ncol;	930	line->l = ncol;
939	if (screen.flags & Screen_Autowrap)	931	if (screen.flags & Screen_Autowrap)
…		…
941	break;	933	break;
942	}	934	}
943		935
944	c = NOCHAR;	936	c = NOCHAR;
945	}	937	}
946	while (--width > 0);	938	while (expect_false (--width > 0));
947		939
948	// pad with spaces when overwriting wide character with smaller one	940	// pad with spaces when overwriting wide character with smaller one
949	if (!width)	941	if (expect_false (!width))
950	{	942	{
951	line->touch ();	943	line->touch ();
952		944
953	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	945	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954	{	946	{
955	line->t[c] = ' ';	947	line->t[c] = ' ';
956	line->r[c] = rend;	948	line->r[c] = rend;
957	}	949	}
958	}	950	}
959	}	951	}
		952	#if ENABLE_COMBINING
960	else // width == 0	953	else // width == 0
961	{	954	{
962	#if ENABLE_COMBINING	955	if (c != 0xfeff) // ignore BOM
963	// handle combining characters
964	// we just tag the accent on the previous on-screen character.
965	// this is arguably not correct, but also arguably not wrong.
966	// we don't handle double-width characters nicely yet.
967	line_t *linep;
968	text_t *tp;
969	rend_t *rp;
970
971	if (screen.cur.col > 0)
972	{	956	{
		957	// handle combining characters
		958	// we just tag the accent on the previous on-screen character.
		959	// this is arguably not correct, but also arguably not wrong.
		960	// we don't handle double-width characters nicely yet.
		961	line_t *linep;
		962	text_t *tp;
		963	rend_t *rp;
		964
		965	if (screen.cur.col > 0)
		966	{
973	linep = line;	967	linep = line;
974	tp = line->t + screen.cur.col - 1;	968	tp = line->t + screen.cur.col - 1;
975	rp = line->r + screen.cur.col - 1;	969	rp = line->r + screen.cur.col - 1;
		970	}
		971	else if (screen.cur.row > 0
		972	&& ROW(screen.cur.row - 1).is_longer ())
		973	{
		974	linep = &ROW(screen.cur.row - 1);
		975	tp = line->t + ncol - 1;
		976	rp = line->r + ncol - 1;
		977	}
		978	else
		979	continue;
		980
		981	linep->touch ();
		982
		983	while (*tp == NOCHAR && tp > linep->t)
		984	tp--, rp--;
		985
		986	// first try to find a precomposed character
		987	unicode_t n = rxvt_compose (*tp, c);
		988	if (n == NOCHAR)
		989	n = rxvt_composite.compose (*tp, c);
		990
		991	*tp = n;
		992	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976	}	993	}
977	else if (screen.cur.row > 0
978	&& ROW(screen.cur.row - 1).is_longer ())
979	{
980	linep = &ROW(screen.cur.row - 1);
981	tp = line->t + ncol - 1;
982	rp = line->r + ncol - 1;
983	}	994	}
984	else
985	continue;
986
987	linep->touch ();
988
989	while (*tp == NOCHAR && tp > linep->t)
990	tp--, rp--;
991
992	// first try to find a precomposed character
993	unicode_t n = rxvt_compose (*tp, c);
994	if (n == NOCHAR)
995	n = rxvt_composite.compose (*tp, c);
996
997	*tp = n;
998	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999	#endif	995	#endif
1000	}
1001	}	996	}
1002		997
1003	max_it (line->l, screen.cur.col);	998	max_it (line->l, screen.cur.col);
1004		999
1005	#ifdef DEBUG_STRICT
1006	assert (screen.cur.row >= 0);	1000	assert (screen.cur.row >= 0);
1007	#endif
1008	}	1001	}
1009		1002
1010	/* ------------------------------------------------------------------------- */	1003	/* ------------------------------------------------------------------------- */
1011	/*	1004	/*
1012	* Process Backspace. Move back the cursor back a position, wrap if have to	1005	* Process Backspace. Move back the cursor back a position, wrap if have to
1013	* XTERM_SEQ: CTRL-H	1006	* XTERM_SEQ: CTRL-H
1014	*/	1007	*/
1015	void	1008	void
1016	rxvt_term::scr_backspace () NOTHROW	1009	rxvt_term::scr_backspace () NOTHROW
1017	{	1010	{
1018	want_refresh = 1;
1019
1020	if (screen.cur.col == 0)	1011	if (screen.cur.col == 0)
1021	{	1012	{
1022	if (screen.cur.row > 0)	1013	if (screen.cur.row > 0)
1023	{	1014	{
1024	#ifdef TERMCAP_HAS_BW	1015	#ifdef TERMCAP_HAS_BW
1025	screen.cur.col = ncol - 1;	1016	screen.cur.col = ncol - 1;
1026	screen.cur.row--;	1017	--screen.cur.row;
1027	return;	1018
		1019	want_refresh = 1;
1028	#endif	1020	#endif
1029	}	1021	}
1030	}	1022	}
1031	else if (!(screen.flags & Screen_WrapNext))	1023	else
1032	scr_gotorc (0, -1, RELATIVE);	1024	scr_gotorc (0, -1, RELATIVE);
1033
1034	screen.flags &= ~Screen_WrapNext;
1035	}	1025	}
1036		1026
1037	/* ------------------------------------------------------------------------- */	1027	/* ------------------------------------------------------------------------- */
1038	/*	1028	/*
1039	* Process Horizontal Tab	1029	* Process Horizontal Tab
…		…
1062	x = i;	1052	x = i;
1063		1053
1064	if (!--count)	1054	if (!--count)
1065	break;	1055	break;
1066	}	1056	}
1067	else	1057	else
1068	ht &= l.t[i] == ' '	1058	ht &= l.t[i] == ' '
1069	&& RS_SAME (l.r[i], base_rend);	1059	&& RS_SAME (l.r[i], base_rend);
1070		1060
1071	if (count)	1061	if (count)
1072	x = ncol - 1;	1062	x = ncol - 1;
1073		1063
1074	// store horizontal tab commands as characters inside the text	1064	// store horizontal tab commands as characters inside the text
1075	// buffer so they can be selected and pasted.	1065	// buffer so they can be selected and pasted.
1076	if (ht && OPTION (Opt_pastableTabs))	1066	if (ht && option (Opt_pastableTabs))
1077	{	1067	{
1078	base_rend = SET_FONT (base_rend, 0);	1068	base_rend = SET_FONT (base_rend, 0);
1079		1069
1080	l.touch (x);	1070	l.touch (x);
1081		1071
…		…
1188	}	1178	}
1189	}	1179	}
1190	else	1180	else
1191	{	1181	{
1192	if (screen.flags & Screen_Relative)	1182	if (screen.flags & Screen_Relative)
		1183	{
1193	{ /* relative origin mode */	1184	/* relative origin mode */
1194	screen.cur.row = row + screen.tscroll;	1185	screen.cur.row = row + screen.tscroll;
1195	min_it (screen.cur.row, screen.bscroll);	1186	min_it (screen.cur.row, screen.bscroll);
1196	}	1187	}
1197	else	1188	else
1198	screen.cur.row = row;	1189	screen.cur.row = row;
…		…
1231	/*	1222	/*
1232	* Erase part or whole of a line	1223	* Erase part or whole of a line
1233	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1224	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1234	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1225	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1235	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1226	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1227	* extension: clear to right unless wrapped: ESC [ 3 K
1236	*/	1228	*/
1237	void	1229	void
1238	rxvt_term::scr_erase_line (int mode) NOTHROW	1230	rxvt_term::scr_erase_line (int mode) NOTHROW
1239	{	1231	{
1240	unsigned int col, num;	1232	unsigned int col, num;
…		…
1249	line.touch ();	1241	line.touch ();
1250	line.is_longer (0);	1242	line.is_longer (0);
1251		1243
1252	switch (mode)	1244	switch (mode)
1253	{	1245	{
		1246	case 3:
		1247	if (screen.flags & Screen_WrapNext)
		1248	return;
		1249
		1250	/* fall through */
		1251
1254	case 0: /* erase to end of line */	1252	case 0: /* erase to end of line */
1255	col = screen.cur.col;	1253	col = screen.cur.col;
1256	num = ncol - col;	1254	num = ncol - col;
1257	min_it (line.l, col);	1255	min_it (line.l, col);
		1256
1258	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1257	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1258	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260	CLEAR_SELECTION ();	1259	CLEAR_SELECTION ();
1261	break;	1260	break;
		1261
1262	case 1: /* erase to beginning of line */	1262	case 1: /* erase to beginning of line */
1263	col = 0;	1263	col = 0;
1264	num = screen.cur.col + 1;	1264	num = screen.cur.col + 1;
		1265
1265	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1266	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1267	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267	CLEAR_SELECTION ();	1268	CLEAR_SELECTION ();
1268	break;	1269	break;
		1270
1269	case 2: /* erase whole line */	1271	case 2: /* erase whole line */
1270	col = 0;	1272	col = 0;
1271	num = ncol;	1273	num = ncol;
1272	line.l = 0;	1274	line.l = 0;
1273	if (selection.beg.row <= screen.cur.row	1275	if (selection.beg.row <= screen.cur.row
…		…
1331	if (row >= nrow) /* Out Of Bounds */	1333	if (row >= nrow) /* Out Of Bounds */
1332	return;	1334	return;
1333		1335
1334	min_it (num, nrow - row);	1336	min_it (num, nrow - row);
1335		1337
		1338	// TODO: the code below does not work when view_start != 0
		1339	// the workaround is to disable the clear and use a normal refresh
		1340	// when view_start != 0. mysterious.
1336	if (rstyle & (RS_RVid | RS_Uline))	1341	if (rstyle & (RS_RVid | RS_Uline))
1337	ren = (rend_t) ~RS_None;	1342	ren = (rend_t) ~RS_None;
1338	else if (GET_BASEBG (rstyle) == Color_bg)	1343	else if (GET_BASEBG (rstyle) == Color_bg)
1339	{	1344	{
1340	ren = DEFAULT_RSTYLE;	1345	ren = DEFAULT_RSTYLE;
1341	CLEAR_ROWS (row, num);	1346
		1347	if (mapped && !view_start)
		1348	XClearArea (dpy, vt, 0,
		1349	Row2Pixel (row - view_start), (unsigned int)width,
		1350	(unsigned int)Height2Pixel (num), False);
1342	}	1351	}
1343	else	1352	else
1344	{	1353	{
1345	ren = rstyle & (RS_fgMask | RS_bgMask);	1354	ren = rstyle & (RS_fgMask | RS_bgMask);
		1355
		1356	if (mapped && !view_start)
		1357	{
1346	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1358	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1359	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348	ERASE_ROWS (row, num);	1360	XFillRectangle (dpy, vt, gc,
		1361	0, Row2Pixel (row - view_start),
		1362	(unsigned int)width,
		1363	(unsigned int)Height2Pixel (num));
1349	gcvalue.foreground = pix_colors[Color_fg];	1364	gcvalue.foreground = pix_colors[Color_fg];
1350	XChangeGC (dpy, gc, GCForeground, &gcvalue);	1365	XChangeGC (dpy, gc, GCForeground, &gcvalue);
		1366	}
1351	}	1367	}
1352		1368
1353	for (; num--; row++)	1369	for (; num--; row++)
1354	{	1370	{
1355	scr_blank_screen_mem (ROW(row), rstyle);	1371	scr_blank_screen_mem (ROW(row), rstyle);
		1372
		1373	if (!view_start)
1356	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1374	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357	}	1375	}
1358	}	1376	}
1359		1377
1360	#if !ENABLE_MINIMAL	1378	#if !ENABLE_MINIMAL
1361	void	1379	void
…		…
1435	* Insert/Delete <count> characters from the current position	1453	* Insert/Delete <count> characters from the current position
1436	*/	1454	*/
1437	void	1455	void
1438	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW	1456	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439	{	1457	{
1440	int col, row;
1441	rend_t tr;
1442
1443	want_refresh = 1;	1458	want_refresh = 1;
1444	ZERO_SCROLLBACK ();	1459	ZERO_SCROLLBACK ();
1445		1460
1446	if (count <= 0)	1461	if (count <= 0)
1447	return;	1462	return;
…		…
1449	scr_do_wrap ();	1464	scr_do_wrap ();
1450		1465
1451	selection_check (1);	1466	selection_check (1);
1452	min_it (count, ncol - screen.cur.col);	1467	min_it (count, ncol - screen.cur.col);
1453		1468
1454	row = screen.cur.row;	1469	int row = screen.cur.row;
1455		1470
1456	line_t *line = &ROW(row);	1471	line_t *line = &ROW(row);
1457		1472
1458	line->touch ();	1473	line->touch ();
1459	line->is_longer (0);	1474	line->is_longer (0);
1460		1475
		1476	// nuke wide spanning the start
		1477	if (line->t[screen.cur.col] == NOCHAR)
		1478	scr_kill_char (*line, screen.cur.col);
		1479
1461	switch (insdel)	1480	switch (insdel)
1462	{	1481	{
1463	case INSERT:	1482	case INSERT:
1464	for (col = ncol - 1; (col - count) >= screen.cur.col; col--)	1483	line->l = min (line->l + count, ncol);
		1484
		1485	if (line->t[screen.cur.col] == NOCHAR)
		1486	scr_kill_char (*line, screen.cur.col);
		1487
		1488	for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465	{	1489	{
1466	line->t[col] = line->t[col - count];	1490	line->t[col] = line->t[col - count];
1467	line->r[col] = line->r[col - count];	1491	line->r[col] = line->r[col - count];
1468	}	1492	}
1469
1470	line->l = min (line->l + count, ncol);
1471		1493
1472	if (selection.op && current_screen == selection.screen	1494	if (selection.op && current_screen == selection.screen
1473	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1495	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474	{	1496	{
1475	if (selection.end.row != screen.cur.row	1497	if (selection.end.row != screen.cur.row
1476	|| (selection.end.col + count >= ncol))	1498	|| (selection.end.col + count >= ncol))
1477	CLEAR_SELECTION ();	1499	CLEAR_SELECTION ();
1478	else	1500	else
		1501	{
1479	{ /* shift selection */	1502	/* shift selection */
1480	selection.beg.col += count;	1503	selection.beg.col += count;
1481	selection.mark.col += count; /* XXX: yes? */	1504	selection.mark.col += count; /* XXX: yes? */
1482	selection.end.col += count;	1505	selection.end.col += count;
1483	}	1506	}
1484	}	1507	}
…		…
1489	case ERASE:	1512	case ERASE:
1490	screen.cur.col += count; /* don't worry if > ncol */	1513	screen.cur.col += count; /* don't worry if > ncol */
1491	selection_check (1);	1514	selection_check (1);
1492	screen.cur.col -= count;	1515	screen.cur.col -= count;
1493		1516
1494	line->l = max (line->l - count, 0);	1517	// nuke wide char after the end
		1518	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1519	scr_kill_char (*line, screen.cur.col + count);
		1520
1495	scr_blank_line (*line, screen.cur.col, count, rstyle);	1521	scr_blank_line (*line, screen.cur.col, count, rstyle);
1496	break;	1522	break;
1497		1523
1498	case DELETE:	1524	case DELETE:
1499	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1525	line->l = max (line->l - count, 0);
1500		1526
		1527	// nuke wide char spanning the end
		1528	if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
		1529	scr_kill_char (*line, screen.cur.col + count);
		1530
1501	for (col = screen.cur.col; (col + count) < ncol; col++)	1531	for (int col = screen.cur.col; (col + count) < ncol; col++)
1502	{	1532	{
1503	line->t[col] = line->t[col + count];	1533	line->t[col] = line->t[col + count];
1504	line->r[col] = line->r[col + count];	1534	line->r[col] = line->r[col + count];
1505	}	1535	}
1506		1536
1507	line->l = max (line->l - count, 0);
1508	scr_blank_line (*line, ncol - count, count, tr);	1537	scr_blank_line (*line, ncol - count, count, rstyle);
1509		1538
1510	if (selection.op && current_screen == selection.screen	1539	if (selection.op && current_screen == selection.screen
1511	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))	1540	&& ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512	{	1541	{
1513	if (selection.end.row != screen.cur.row	1542	if (selection.end.row != screen.cur.row
…		…
1623	*/	1652	*/
1624	void	1653	void
1625	rxvt_term::scr_set_tab (int mode) NOTHROW	1654	rxvt_term::scr_set_tab (int mode) NOTHROW
1626	{	1655	{
1627	if (mode < 0)	1656	if (mode < 0)
1628	memset (tabs, 0, ncol * sizeof (char));	1657	memset (tabs, 0, ncol);
1629	else if (screen.cur.col < ncol)	1658	else if (screen.cur.col < ncol)
1630	tabs [screen.cur.col] = !!mode;	1659	tabs [screen.cur.col] = !!mode;
1631	}	1660	}
1632		1661
1633	/* ------------------------------------------------------------------------- */	1662	/* ------------------------------------------------------------------------- */
…		…
1648	if (rvideo_state != on)	1677	if (rvideo_state != on)
1649	{	1678	{
1650	rvideo_state = on;	1679	rvideo_state = on;
1651		1680
1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1681	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653	#if XPM_BACKGROUND	1682	#ifdef HAVE_BG_PIXMAP
1654	if (bgPixmap.pixmap == None)	1683	if (bgPixmap.pixmap == None)
1655	#endif
1656	#if TRANSPARENT
1657	if (!OPTION (Opt_transparent) || am_transparent == 0)
1658	#endif	1684	#endif
1659	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1685	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660		1686
1661	XGCValues gcvalue;	1687	XGCValues gcvalue;
1662	gcvalue.foreground = pix_colors[Color_fg];	1688	gcvalue.foreground = pix_colors[Color_fg];
…		…
1806	for (i = PART_BEG; i < RC_COUNT; i++)	1832	for (i = PART_BEG; i < RC_COUNT; i++)
1807	{	1833	{
1808	min_it (rc[i].col, ncol - 1);	1834	min_it (rc[i].col, ncol - 1);
1809	min_it (rc[i].row, nrow - 1);	1835	min_it (rc[i].row, nrow - 1);
1810	}	1836	}
1811		1837	// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1838	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1839	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814		1840
1815	num_scr_allow = 0;	1841	num_scr_allow = 0;
1816		1842
…		…
1871	return true;	1897	return true;
1872	}	1898	}
1873		1899
1874	#ifndef NO_BELL	1900	#ifndef NO_BELL
1875	void	1901	void
1876	rxvt_term::bell_cb (time_watcher &w)	1902	rxvt_term::bell_cb (ev::timer &w, int revents)
1877	{	1903	{
1878	rvideo_bell = false;	1904	rvideo_bell = false;
1879	scr_rvideo_mode (rvideo_mode);	1905	scr_rvideo_mode (rvideo_mode);
		1906	refresh_check ();
1880	}	1907	}
1881	#endif	1908	#endif
1882		1909
1883	/* ------------------------------------------------------------------------- */	1910	/* ------------------------------------------------------------------------- */
1884	void	1911	void
…		…
1886	{	1913	{
1887	#ifndef NO_BELL	1914	#ifndef NO_BELL
1888		1915
1889	# ifndef NO_MAPALERT	1916	# ifndef NO_MAPALERT
1890	# ifdef MAPALERT_OPTION	1917	# ifdef MAPALERT_OPTION
1891	if (OPTION (Opt_mapAlert))	1918	if (option (Opt_mapAlert))
1892	# endif	1919	# endif
1893	XMapWindow (dpy, parent[0]);	1920	XMapWindow (dpy, parent[0]);
1894	# endif	1921	# endif
1895		1922
		1923	# if ENABLE_FRILLS
		1924	if (option (Opt_urgentOnBell))
		1925	set_urgency (1);
		1926	# endif
		1927
1896	if (OPTION (Opt_visualBell))	1928	if (option (Opt_visualBell))
1897	{	1929	{
1898	rvideo_bell = true;	1930	rvideo_bell = true;
1899	scr_rvideo_mode (rvideo_mode);	1931	scr_rvideo_mode (rvideo_mode);
1900	display->flush ();	1932	flush ();
1901		1933
1902	bell_ev.start (NOW + VISUAL_BELL_DURATION);	1934	bell_ev.start (VISUAL_BELL_DURATION);
1903	}	1935	}
1904	else	1936	else
1905	XBell (dpy, 0);	1937	XBell (dpy, 0);
1906		1938	HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907	#endif	1939	#endif
1908	}	1940	}
1909		1941
1910	/* ------------------------------------------------------------------------- */	1942	/* ------------------------------------------------------------------------- */
1911	/* ARGSUSED */	1943	/* ARGSUSED */
1912	void	1944	void
1913	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1945	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914	{	1946	{
1915	#ifdef PRINTPIPE	1947	#ifdef PRINTPIPE
1916	int nrows, row_start;	1948	int nrows, row_start;
1917	FILE *fd;	1949	FILE *fd = popen_printer ();
1918		1950
1919	if ((fd = popen_printer ()) == NULL)	1951	if (!fd)
1920	return;	1952	return;
1921		1953
1922	if (fullhist)	1954	if (fullhist)
1923	{	1955	{
1924	nrows = nrow - top_row;	1956	nrows = nrow - top_row;
…		…
1930	row_start = view_start;	1962	row_start = view_start;
1931	}	1963	}
1932		1964
1933	wctomb (0, 0);	1965	wctomb (0, 0);
1934		1966
1935	for (int r1 = 0; r1 < nrows; r1++)	1967	for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936	{	1968	{
1937	text_t *tp = ROW(r1).t;	1969	text_t *tp = ROW(r1).t;
1938	int len = ROW(r1).l;	1970	int len = ROW(r1).l;
1939		1971
1940	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN	1972	for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
…		…
1969	* screen.text/screen.rend contain what the screen will change to.	2001	* screen.text/screen.rend contain what the screen will change to.
1970	*/	2002	*/
1971	void	2003	void
1972	rxvt_term::scr_refresh () NOTHROW	2004	rxvt_term::scr_refresh () NOTHROW
1973	{	2005	{
1974	unsigned char have_bg,
1975	showcursor; /* show the cursor */
1976	int16_t col, row, /* column/row we're processing */	2006	int16_t col, row, /* column/row we're processing */
1977	ocrow; /* old cursor row */	2007	ocrow; /* old cursor row */
1978	int i; /* tmp */	2008	int i; /* tmp */
1979	#ifndef NO_CURSORCOLOR	2009	#ifndef NO_CURSORCOLOR
1980	rend_t cc1; /* store colours at cursor position (s) */	2010	rend_t cc1; /* store colours at cursor position (s) */
1981	#endif	2011	#endif
1982	rend_t *crp; // cursor rendition pointer	2012	rend_t *crp; // cursor rendition pointer
		2013	rend_t ccol1, /* Cursor colour */
		2014	ccol2; /* Cursor colour2 */
1983		2015
1984	want_refresh = 0; /* screen is current */	2016	want_refresh = 0; /* screen is current */
1985		2017
1986	if (refresh_type == NO_REFRESH || !mapped)	2018	if (refresh_type == NO_REFRESH || !mapped)
1987	return;	2019	return;
1988		2020
1989	/*	2021	/*
1990	* A: set up vars	2022	* A: set up vars
1991	*/	2023	*/
1992	have_bg = 0;
1993	refresh_count = 0;	2024	refresh_count = 0;
1994		2025
1995	#if XPM_BACKGROUND	2026	unsigned int old_screen_flags = screen.flags;
		2027	char have_bg = 0;
		2028	#ifdef HAVE_BG_PIXMAP
1996	have_bg |= bgPixmap.pixmap != None;	2029	have_bg = bgPixmap.pixmap != None;
1997	#endif
1998	#if TRANSPARENT
1999	have_bg |= OPTION (Opt_transparent) && am_transparent;
2000	#endif	2030	#endif
2001	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2031	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002		2032
2003	/*	2033	/*
2004	* B: reverse any characters which are selected	2034	* B: reverse any characters which are selected
2005	*/	2035	*/
2006	scr_reverse_selection ();	2036	scr_reverse_selection ();
		2037
		2038	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
		2039	#if ENABLE_OVERLAY
		2040	scr_swap_overlay ();
		2041	#endif
		2042
		2043	char showcursor = screen.flags & Screen_VisibleCursor;
2007		2044
2008	/*	2045	/*
2009	* C: set the cursor character (s)	2046	* C: set the cursor character (s)
2010	*/	2047	*/
2011	{	2048	{
2012	unsigned char setoldcursor;	2049	unsigned char setoldcursor;
2013	rend_t ccol1, /* Cursor colour */
2014	ccol2; /* Cursor colour2 */
2015		2050
2016	showcursor = (screen.flags & Screen_VisibleCursor);
2017	#ifdef CURSOR_BLINK	2051	#ifdef CURSOR_BLINK
2018	if (hidden_cursor)	2052	if (hidden_cursor)
2019	showcursor = 0;	2053	showcursor = 0;
2020	#endif	2054	#endif
2021		2055
…		…
2026	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2060	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027	col--;	2061	col--;
2028		2062
2029	crp = &ROW(screen.cur.row).r[col];	2063	crp = &ROW(screen.cur.row).r[col];
2030		2064
		2065	#ifndef NO_CURSORCOLOR
		2066	cc1 = *crp & (RS_fgMask | RS_bgMask);
		2067	if (ISSET_PIXCOLOR (Color_cursor))
		2068	ccol1 = Color_cursor;
		2069	else
		2070	#endif
		2071	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2072	ccol1 = fgcolor_of (rstyle);
		2073	#else
		2074	ccol1 = Color_fg;
		2075	#endif
		2076
		2077	#ifndef NO_CURSORCOLOR
		2078	if (ISSET_PIXCOLOR (Color_cursor2))
		2079	ccol2 = Color_cursor2;
		2080	else
		2081	#endif
		2082	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2083	ccol2 = bgcolor_of (rstyle);
		2084	#else
		2085	ccol2 = Color_bg;
		2086	#endif
		2087
2031	if (showcursor && focus)	2088	if (showcursor && focus)
2032	{	2089	{
2033	if (OPTION (Opt_cursorUnderline))	2090	if (option (Opt_cursorUnderline))
2034	*crp ^= RS_Uline;	2091	*crp ^= RS_Uline;
2035	else	2092	else
2036	{	2093	{
2037	*crp ^= RS_RVid;	2094	*crp ^= RS_RVid;
2038
2039	#ifndef NO_CURSORCOLOR
2040	cc1 = *crp & (RS_fgMask | RS_bgMask);
2041	if (ISSET_PIXCOLOR (Color_cursor))
2042	ccol1 = Color_cursor;
2043	else
2044	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045	ccol1 = fgcolor_of (rstyle);
2046	#else
2047	ccol1 = Color_fg;
2048	#endif
2049	if (ISSET_PIXCOLOR (Color_cursor2))
2050	ccol2 = Color_cursor2;
2051	else
2052	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053	ccol2 = bgcolor_of (rstyle);
2054	#else
2055	ccol2 = Color_bg;
2056	#endif
2057	*crp = SET_FGCOLOR (*crp, ccol1);	2095	*crp = SET_FGCOLOR (*crp, ccol1);
2058	*crp = SET_BGCOLOR (*crp, ccol2);	2096	*crp = SET_BGCOLOR (*crp, ccol2);
2059	#endif
2060	}	2097	}
2061	}	2098	}
2062	}	2099	}
2063		2100
2064	/* make sure no outline cursor is left around */	2101	/* make sure no outline cursor is left around */
…		…
2091	oldcursor.col = screen.cur.col;	2128	oldcursor.col = screen.cur.col;
2092	}	2129	}
2093	}	2130	}
2094	}	2131	}
2095		2132
2096	HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097	#if ENABLE_OVERLAY
2098	scr_swap_overlay ();
2099	#endif
2100
2101	#ifndef NO_SLOW_LINK_SUPPORT	2133	#ifndef NO_SLOW_LINK_SUPPORT
2102	/*	2134	/*
2103	* D: CopyArea pass - very useful for slower links	2135	* D: CopyArea pass - very useful for slower links
2104	* This has been deliberately kept simple.	2136	* This has been deliberately kept simple.
2105	*/	2137	*/
…		…
2194	continue;	2226	continue;
2195		2227
2196	// redraw one or more characters	2228	// redraw one or more characters
2197		2229
2198	// seek to the beginning of wide characters	2230	// seek to the beginning of wide characters
2199	while (stp[col] == NOCHAR && col > 0)	2231	while (expect_false (stp[col] == NOCHAR && col > 0))
2200	--col;	2232	--col;
2201		2233
2202	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2234	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2203	text_t *text = stp + col;	2235	text_t *text = stp + col;
2204	int count = 1;	2236	int count = 1;
…		…
2211	for (i = 0; ++col < ncol; )	2243	for (i = 0; ++col < ncol; )
2212	{	2244	{
2213	if (stp[col] == NOCHAR)	2245	if (stp[col] == NOCHAR)
2214	{	2246	{
2215	dtp[col] = stp[col];	2247	dtp[col] = stp[col];
2216	drp[col] = rend;	2248	drp[col] = srp[col];
		2249
2217	count++;	2250	count++;
2218	i++;	2251	i++;
2219		2252
2220	continue;	2253	continue;
2221	}	2254	}
…		…
2241		2274
2242	col--; /* went one too far. move back */	2275	col--; /* went one too far. move back */
2243	count -= i; /* dump any matching trailing chars */	2276	count -= i; /* dump any matching trailing chars */
2244		2277
2245	// sometimes we optimize away the trailing NOCHAR's, add them back	2278	// sometimes we optimize away the trailing NOCHAR's, add them back
2246	while (i && text[count] == NOCHAR)	2279	while (expect_false (i && text[count] == NOCHAR))
2247	count++, i--;	2280	count++, i--;
2248		2281
2249	/*	2282	/*
2250	* Determine the attributes for the string	2283	* Determine the attributes for the string
2251	*/	2284	*/
2252	int fore = fgcolor_of (rend); // desired foreground	2285	int fore = fgcolor_of (rend); // desired foreground
2253	int back = bgcolor_of (rend); // desired background	2286	int back = bgcolor_of (rend); // desired background
2254		2287
2255	// only do special processing if any attributes are set, which is unlikely	2288	// only do special processing if any attributes are set, which is unlikely
2256	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2289	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2257	{	2290	{
2258	#if ENABLE_STYLES
2259	// "careful" (too wide) character handling
2260
2261	// include previous careful character(s) if possible, looks nicer (best effort...)
2262	while (text > stp
2263	&& srp[text - stp - 1] & RS_Careful
2264	&& RS_SAME (rend, srp[text - stp - 1]))
2265	text--, count++, xpixel -= fwidth;
2266
2267	// force redraw after "careful" characters to avoid pixel droppings
2268	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271	// force redraw before "careful" characters to avoid pixel droppings
2272	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274	#endif
2275
2276	bool invert = rend & RS_RVid;	2291	bool invert = rend & RS_RVid;
2277		2292
2278	#ifndef NO_BOLD_UNDERLINE_REVERSE	2293	#ifndef NO_BOLD_UNDERLINE_REVERSE
2279	if (rend & RS_Bold
2280	&& fore == Color_fg)	2294	if (rend & RS_Bold && fore == Color_fg)
2281	{	2295	{
2282	if (ISSET_PIXCOLOR (Color_BD))	2296	if (ISSET_PIXCOLOR (Color_BD))
2283	fore = Color_BD;	2297	fore = Color_BD;
2284	# if !ENABLE_STYLES	2298	# if !ENABLE_STYLES
2285	else	2299	else
2286	invert = !invert;	2300	invert = !invert;
2287	# endif	2301	# endif
2288	}	2302	}
2289		2303
2290	if (rend & RS_Italic	2304	if (rend & RS_Italic && fore == Color_fg)
2291	&& fore == Color_fg)
2292	{	2305	{
2293	if (ISSET_PIXCOLOR (Color_IT))	2306	if (ISSET_PIXCOLOR (Color_IT))
2294	fore = Color_IT;	2307	fore = Color_IT;
2295	# if !ENABLE_STYLES	2308	# if !ENABLE_STYLES
2296	else	2309	else
2297	invert = !invert;	2310	invert = !invert;
2298	# endif	2311	# endif
2299	}	2312	}
2300		2313
2301	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))	2314	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302	fore = Color_UL;	2315	fore = Color_UL;
2303	#endif	2316	#endif
2304		2317
2305	if (invert)	2318	if (invert)
2306	{	2319	{
		2320	#ifdef OPTION_HC
		2321	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2322	|| !ISSET_PIXCOLOR (Color_HC))
		2323	#endif
		2324	/* invert the column if no highlightColor is set or it is the
		2325	* current cursor column */
2307	::swap (fore, back);	2326	::swap (fore, back);
		2327	#ifdef OPTION_HC
		2328	else if (ISSET_PIXCOLOR (Color_HC))
		2329	back = Color_HC;
		2330	#endif
2308		2331
2309	#ifndef NO_BOLD_UNDERLINE_REVERSE	2332	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2333	# ifndef OPTION_HC
2310	if (ISSET_PIXCOLOR (Color_RV))	2334	if (ISSET_PIXCOLOR (Color_RV))
2311	back = Color_RV;	2335	back = Color_RV;
2312		2336	# endif
2313	if (fore == back)	2337	if (fore == back)
2314	{	2338	{
2315	fore = Color_bg;	2339	fore = Color_bg;
2316	back = Color_fg;	2340	back = Color_fg;
2317	}	2341	}
…		…
2319	}	2343	}
2320		2344
2321	#ifdef TEXT_BLINK	2345	#ifdef TEXT_BLINK
2322	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2346	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323	{	2347	{
2324	if (!text_blink_ev.active)	2348	if (!text_blink_ev.is_active ())
2325	{	2349	{
2326	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	2350	text_blink_ev.again ();
2327	hidden_text = 0;	2351	hidden_text = 0;
2328	}	2352	}
2329	else if (hidden_text)	2353	else if (hidden_text)
2330	fore = back;	2354	fore = back;
2331	}	2355	}
2332	#endif	2356	#endif
		2357
		2358	#if ENABLE_STYLES
		2359	// "careful" (too wide) character handling
		2360
		2361	// include previous careful character(s) if possible, looks nicer (best effort...)
		2362	while (text > stp
		2363	&& srp[text - stp - 1] & RS_Careful
		2364	&& RS_SAME (rend, srp[text - stp - 1]))
		2365	text--, count++, xpixel -= fwidth;
		2366
		2367	// force redraw after "careful" characters to avoid pixel droppings
		2368	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2369	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2370
		2371	// force redraw before "careful" characters to avoid pixel droppings
		2372	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2373	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
		2374	#endif
2333	}	2375	}
2334		2376
2335	/*	2377	/*
2336	* Actually do the drawing of the string here	2378	* Actually do the drawing of the string here
2337	*/	2379	*/
2338	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2380	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339		2381
2340	if (back == fore)	2382	if (expect_true (have_bg && back == Color_bg))
2341	font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342	else if (back == Color_bg && have_bg)
2343	{	2383	{
2344	// this is very ugly, maybe push it into ->draw?	2384	// this is very ugly, maybe push it into ->draw?
2345		2385
2346	for (i = 0; i < count; i++) /* don't draw empty strings */	2386	for (i = 0; i < count; i++) /* don't draw empty strings */
2347	if (text[i] != ' ')	2387	if (text[i] != ' ')
2348	{	2388	{
2349	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2389	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350	goto did_clear;	2390	goto did_clear;
2351	}	2391	}
2352		2392
2353	CLEAR_CHARS (xpixel, ypixel, count);	2393	CLEAR_CHARS (xpixel, ypixel, count);
2354	did_clear: ;	2394	did_clear: ;
2355	}	2395	}
2356	else	2396	else
2357	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2397	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358		2398
2359	if (rend & RS_Uline && font->descent > 1 && fore != back)	2399	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2360	{	2400	{
2361	#if ENABLE_FRILLS	2401	#if ENABLE_FRILLS
2362	if (ISSET_PIXCOLOR (Color_underline))	2402	if (ISSET_PIXCOLOR (Color_underline))
2363	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2403	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364	else	2404	else
2365	#endif	2405	#endif
2366	XSetForeground (dpy, gc, pix_colors[fore]);	2406	XSetForeground (dpy, gc, pix_colors[fore]);
2367		2407
2368	XDrawLine (dpy, drawBuffer, gc,	2408	XDrawLine (dpy, vt, gc,
2369	xpixel, ypixel + font->ascent + 1,	2409	xpixel, ypixel + font->ascent + 1,
2370	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2410	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371	}	2411	}
2372	} /* for (col....) */	2412	} /* for (col....) */
2373	} /* for (row....) */	2413	} /* for (row....) */
2374		2414
2375	#if ENABLE_OVERLAY
2376	scr_swap_overlay ();
2377	#endif
2378	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2379
2380	/*	2415	/*
2381	* G: cleanup cursor and display outline cursor if necessary	2416	* G: cleanup cursor and display outline cursor if necessary
2382	*/	2417	*/
2383	if (showcursor)	2418	if (showcursor)
2384	{	2419	{
2385	if (focus)	2420	if (focus)
2386	{	2421	{
2387	if (OPTION (Opt_cursorUnderline))	2422	if (option (Opt_cursorUnderline))
2388	*crp ^= RS_Uline;	2423	*crp ^= RS_Uline;
2389	else	2424	else
2390	{	2425	{
2391	*crp ^= RS_RVid;	2426	*crp ^= RS_RVid;
2392	#ifndef NO_CURSORCOLOR	2427	#ifndef NO_CURSORCOLOR
…		…
2407	cursorwidth++;	2442	cursorwidth++;
2408		2443
2409	#ifndef NO_CURSORCOLOR	2444	#ifndef NO_CURSORCOLOR
2410	if (ISSET_PIXCOLOR (Color_cursor))	2445	if (ISSET_PIXCOLOR (Color_cursor))
2411	XSetForeground (dpy, gc, pix_colors[Color_cursor]);	2446	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
		2447	else
2412	#endif	2448	#endif
		2449	XSetForeground (dpy, gc, pix_colors[ccol1]);
2413		2450
2414	XDrawRectangle (dpy, drawBuffer, gc,	2451	XDrawRectangle (dpy, vt, gc,
2415	Col2Pixel (col),	2452	Col2Pixel (col),
2416	Row2Pixel (oldcursor.row),	2453	Row2Pixel (oldcursor.row),
2417	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2454	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2418	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2455	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419	}	2456	}
2420	}	2457	}
2421		2458
2422	/*	2459	/*
2423	* H: cleanup selection	2460	* H: cleanup selection
2424	*/	2461	*/
		2462	#if ENABLE_OVERLAY
		2463	scr_swap_overlay ();
		2464	#endif
		2465	HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
		2466
2425	scr_reverse_selection ();	2467	scr_reverse_selection ();
2426		2468
		2469	screen.flags = old_screen_flags;
2427	num_scr = 0;	2470	num_scr = 0;
2428	num_scr_allow = 1;	2471	num_scr_allow = 1;
2429	}	2472	}
2430		2473
2431	void	2474	void
…		…
2454	}	2497	}
2455		2498
2456	void	2499	void
2457	rxvt_term::scr_recolour () NOTHROW	2500	rxvt_term::scr_recolour () NOTHROW
2458	{	2501	{
2459	if (1	2502	#ifdef HAVE_BG_PIXMAP
2460	#if TRANSPARENT	2503	bgPixmap.apply ();
2461	&& !am_transparent	2504	#else
2462	#endif	2505
2463	#if XPM_BACKGROUND
2464	&& !bgPixmap.pixmap
2465	#endif
2466	)
2467	{
2468	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2506	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469	XClearWindow (dpy, parent[0]);	2507	XClearWindow (dpy, parent[0]);
2470	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2508	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471	#if HAVE_SCROLLBARS	2509
2472	if (scrollBar.win)	2510	if (scrollBar.win)
2473	{	2511	{
2474	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2512	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475	scrollBar.setIdle ();	2513	scrollBar.state = STATE_IDLE;
2476	scrollbar_show (0);	2514	scrollBar.show (0);
2477	}
2478	#endif
2479	}	2515	}
2480		2516
		2517	#endif
		2518
		2519	/* bgPixmap.apply () does not do the following : */
2481	scr_clear ();	2520	scr_clear ();
2482	scr_touch (true);	2521	scr_touch (true);
2483	want_refresh = 1;	2522	want_refresh = 1;
2484	}	2523	}
2485		2524
…		…
2577	{	2616	{
2578	int row, wrote;	2617	int row, wrote;
2579	unsigned int width, towrite;	2618	unsigned int width, towrite;
2580	char r1[] = "\n";	2619	char r1[] = "\n";
2581		2620
2582	for (row = saveLines - nsaved;	2621	for (row = saveLines + top_row;
2583	row < saveLines + nrow - 1; row++)	2622	row < saveLines + nrow - 1; row++)
2584	{	2623	{
2585	width = row_buf[row].l >= 0 ? row_buf[row].l	2624	width = row_buf[row].l >= 0 ? row_buf[row].l
2586	: ncol;	2625	: ncol;
2587	for (towrite = width; towrite; towrite -= wrote)	2626	for (towrite = width; towrite; towrite -= wrote)
…		…
2638	/* convert normal newline chars into common keyboard Return key sequence */	2677	/* convert normal newline chars into common keyboard Return key sequence */
2639	for (unsigned int i = 0; i < len; i++)	2678	for (unsigned int i = 0; i < len; i++)
2640	if (data[i] == C0_LF)	2679	if (data[i] == C0_LF)
2641	data[i] = C0_CR;	2680	data[i] = C0_CR;
2642		2681
		2682	if (priv_modes & PrivMode_BracketPaste)
		2683	tt_printf ("\e[200~");
		2684
2643	tt_write (data, len);	2685	tt_write (data, len);
		2686
		2687	if (priv_modes & PrivMode_BracketPaste)
		2688	tt_printf ("\e[201~");
2644	}	2689	}
2645		2690
2646	/* ------------------------------------------------------------------------- */	2691	/* ------------------------------------------------------------------------- */
2647	/*	2692	/*
2648	* Respond to a notification that a primary selection has been sent	2693	* Respond to a notification that a primary selection has been sent
…		…
2723	if (!delete_prop)	2768	if (!delete_prop)
2724	XDeleteProperty (dpy, win, prop);	2769	XDeleteProperty (dpy, win, prop);
2725		2770
2726	selection_wait = Sel_incr;	2771	selection_wait = Sel_incr;
2727	incr_buf_fill = 0;	2772	incr_buf_fill = 0;
2728	incr_ev.start (NOW + 10);	2773	incr_ev.start (10);
2729		2774
2730	goto bailout;	2775	goto bailout;
2731	}	2776	}
2732		2777
2733	if (ct.nitems == 0)	2778	if (ct.nitems == 0)
…		…
2742	ct.nitems = incr_buf_fill;	2787	ct.nitems = incr_buf_fill;
2743	incr_buf = 0;	2788	incr_buf = 0;
2744	incr_buf_size = 0;	2789	incr_buf_size = 0;
2745	incr_ev.stop ();	2790	incr_ev.stop ();
2746	}	2791	}
2747	else	2792	else
2748	{	2793	{
2749	if (selection_wait == Sel_normal	2794	if (selection_wait == Sel_normal
2750	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2795	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751	{	2796	{
2752	/*	2797	/*
…		…
2759	goto bailout;	2804	goto bailout;
2760	}	2805	}
2761	}	2806	}
2762	else if (selection_wait == Sel_incr)	2807	else if (selection_wait == Sel_incr)
2763	{	2808	{
2764	incr_ev.start (NOW + 10);	2809	incr_ev.start (10);
2765		2810
2766	while (incr_buf_fill + ct.nitems > incr_buf_size)	2811	while (incr_buf_fill + ct.nitems > incr_buf_size)
2767	{	2812	{
2768	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2813	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2814	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
…		…
2809	if (selection_wait == Sel_normal)	2854	if (selection_wait == Sel_normal)
2810	selection_wait = Sel_none;	2855	selection_wait = Sel_none;
2811	}	2856	}
2812		2857
2813	void	2858	void
2814	rxvt_term::incr_cb (time_watcher &w) NOTHROW	2859	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815	{	2860	{
2816	selection_wait = Sel_none;	2861	selection_wait = Sel_none;
2817		2862
2818	incr_buf_size = 0;	2863	incr_buf_size = 0;
2819	free (incr_buf);	2864	free (incr_buf);
…		…
2830	selection_paste (win, prop, true);	2875	selection_paste (win, prop, true);
2831	}	2876	}
2832		2877
2833	/* ------------------------------------------------------------------------- */	2878	/* ------------------------------------------------------------------------- */
2834	/*	2879	/*
2835	* Request the current selection:	2880	* Request the current selection:
2836	* Order: > internal selection if available	2881	* Order: > internal selection if available
2837	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2882	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838	* > CUT_BUFFER0	2883	* > CUT_BUFFER0
2839	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2884	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840	* will auto fallback to CUT_BUFFER0	2885	* will auto fallback to CUT_BUFFER0
…		…
2842	*/	2887	*/
2843	void	2888	void
2844	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2889	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845	{	2890	{
2846	if (selection.text && selnum == Sel_Primary)	2891	if (selection.text && selnum == Sel_Primary)
		2892	{
2847	{ /* internal selection */	2893	/* internal selection */
2848	char *str = rxvt_wcstombs (selection.text, selection.len);	2894	char *str = rxvt_wcstombs (selection.text, selection.len);
2849	paste (str, strlen (str));	2895	paste (str, strlen (str));
2850	free (str);	2896	free (str);
2851	return;	2897	return;
2852	}	2898	}
…		…
3118	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3164	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119		3165
3120	while (selection.mark.col > 0	3166	while (selection.mark.col > 0
3121	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3167	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122	--selection.mark.col;	3168	--selection.mark.col;
3123		3169
3124	if (selection.op)	3170	if (selection.op)
		3171	{
3125	{ /* clear the old selection */	3172	/* clear the old selection */
3126	selection.beg.row = selection.end.row = selection.mark.row;	3173	selection.beg.row = selection.end.row = selection.mark.row;
3127	selection.beg.col = selection.end.col = selection.mark.col;	3174	selection.beg.col = selection.end.col = selection.mark.col;
3128	}	3175	}
3129		3176
3130	selection.op = SELECTION_INIT;	3177	selection.op = SELECTION_INIT;
…		…
3319	* a point/word/line which is either the start or end of the selection	3366	* a point/word/line which is either the start or end of the selection
3320	* and it was decided by whichever point/word/line was `fixed' at the	3367	* and it was decided by whichever point/word/line was `fixed' at the
3321	* time of the most recent button3 press	3368	* time of the most recent button3 press
3322	*/	3369	*/
3323	if (button3 && buttonpress)	3370	if (button3 && buttonpress)
		3371	{
3324	{ /* button3 press */	3372	/* button3 press */
3325	/*	3373	/*
3326	* first determine which edge of the selection we are closest to	3374	* first determine which edge of the selection we are closest to
3327	*/	3375	*/
3328	if (ROWCOL_IS_BEFORE (pos, selection.beg)	3376	if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329	|| (!ROWCOL_IS_AFTER (pos, selection.end)	3377	|| (!ROWCOL_IS_AFTER (pos, selection.end)
…		…
3347	selection.mark.row = selection.beg.row;	3395	selection.mark.row = selection.beg.row;
3348	selection.mark.col = selection.beg.col;	3396	selection.mark.col = selection.beg.col;
3349	}	3397	}
3350	}	3398	}
3351	else	3399	else
		3400	{
3352	{ /* button1 drag or button3 drag */	3401	/* button1 drag or button3 drag */
3353	if (ROWCOL_IS_AFTER (selection.mark, pos))	3402	if (ROWCOL_IS_AFTER (selection.mark, pos))
3354	{	3403	{
3355	if (selection.mark.row == selection.end.row	3404	if (selection.mark.row == selection.end.row
3356	&& selection.mark.col == selection.end.col	3405	&& selection.mark.col == selection.end.col
3357	&& clickchange	3406	&& clickchange
…		…
3400	selection_delimit_word (DN, &selection.end, &selection.end);	3449	selection_delimit_word (DN, &selection.end, &selection.end);
3401	}	3450	}
3402	else if (selection.clicks == 3)	3451	else if (selection.clicks == 3)
3403	{	3452	{
3404	#if ENABLE_FRILLS	3453	#if ENABLE_FRILLS
3405	if (OPTION (Opt_tripleclickwords))	3454	if (option (Opt_tripleclickwords))
3406	{	3455	{
3407	selection_delimit_word (UP, &selection.beg, &selection.beg);	3456	selection_delimit_word (UP, &selection.beg, &selection.beg);
3408		3457
3409	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3458	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410	{	3459	{
…		…
3438	selection.end.row++;	3487	selection.end.row++;
3439	}	3488	}
3440	}	3489	}
3441		3490
3442	if (button3 && buttonpress)	3491	if (button3 && buttonpress)
		3492	{
3443	{ /* mark may need to be changed */	3493	/* mark may need to be changed */
3444	if (closeto == LEFT)	3494	if (closeto == LEFT)
3445	{	3495	{
3446	selection.mark.row = selection.end.row;	3496	selection.mark.row = selection.end.row;
3447	selection.mark.col = selection.end.col - (selection.clicks == 2);	3497	selection.mark.col = selection.end.col - (selection.clicks == 2);
3448	}	3498	}
…		…
3647	XFree (ct.value);	3697	XFree (ct.value);
3648	}	3698	}
3649		3699
3650	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3700	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651	}	3701	}
3652
3653	/* ------------------------------------------------------------------------- *
3654	* MOUSE ROUTINES *
3655	* ------------------------------------------------------------------------- */
3656
3657	/*
3658	* return col/row values corresponding to x/y pixel values
3659	*/
3660	void
3661	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662	{
3663	*x = Pixel2Col (*x);
3664	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665	*y = Pixel2Row (*y);
3666	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667	}
3668		3702
3669	/* ------------------------------------------------------------------------- */	3703	/* ------------------------------------------------------------------------- */
3670	#ifdef USE_XIM	3704	#ifdef USE_XIM
3671	void	3705	void
3672	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3706	rxvt_term::im_set_position (XPoint &pos) NOTHROW
…		…
3699	h += 2; min_it (h, nrow);	3733	h += 2; min_it (h, nrow);
3700		3734
3701	x -= 1; clamp_it (x, 0, ncol - w);	3735	x -= 1; clamp_it (x, 0, ncol - w);
3702	y -= 1; clamp_it (y, 0, nrow - h);	3736	y -= 1; clamp_it (y, 0, nrow - h);
3703		3737
3704	ov_x = x; ov_y = y;	3738	ov.x = x; ov.y = y;
3705	ov_w = w; ov_h = h;	3739	ov.w = w; ov.h = h;
3706		3740
3707	ov_text = new text_t *[h];	3741	ov.text = new text_t *[h];
3708	ov_rend = new rend_t *[h];	3742	ov.rend = new rend_t *[h];
3709		3743
3710	for (y = 0; y < h; y++)	3744	for (y = 0; y < h; y++)
3711	{	3745	{
3712	text_t *tp = ov_text[y] = new text_t[w];	3746	text_t *tp = ov.text[y] = new text_t[w];
3713	rend_t *rp = ov_rend[y] = new rend_t[w];	3747	rend_t *rp = ov.rend[y] = new rend_t[w];
3714		3748
3715	text_t t0, t1, t2;	3749	text_t t0, t1, t2;
3716	rend_t r = OVERLAY_RSTYLE;	3750	rend_t r = OVERLAY_RSTYLE;
3717		3751
3718	if (y == 0)	3752	if (y == 0)
…		…
3737	}	3771	}
3738		3772
3739	void	3773	void
3740	rxvt_term::scr_overlay_off () NOTHROW	3774	rxvt_term::scr_overlay_off () NOTHROW
3741	{	3775	{
3742	if (!ov_text)	3776	if (!ov.text)
3743	return;	3777	return;
3744		3778
3745	want_refresh = 1;	3779	want_refresh = 1;
3746		3780
3747	for (int y = 0; y < ov_h; y++)	3781	for (int y = 0; y < ov.h; y++)
3748	{	3782	{
3749	delete [] ov_text[y];	3783	delete [] ov.text[y];
3750	delete [] ov_rend[y];	3784	delete [] ov.rend[y];
3751	}	3785	}
3752		3786
3753	delete [] ov_text; ov_text = 0;	3787	delete [] ov.text; ov.text = 0;
3754	delete [] ov_rend; ov_rend = 0;	3788	delete [] ov.rend; ov.rend = 0;
3755	}	3789	}
3756		3790
3757	void	3791	void
3758	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW	3792	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759	{	3793	{
3760	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3794	if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761	return;	3795	return;
3762		3796
3763	x++, y++;	3797	x++, y++;
3764		3798
3765	ov_text[y][x] = text;	3799	ov.text[y][x] = text;
3766	ov_rend[y][x] = rend;	3800	ov.rend[y][x] = rend;
3767	}	3801	}
3768		3802
3769	void	3803	void
3770	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW	3804	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771	{	3805	{
…		…
3790	}	3824	}
3791		3825
3792	void	3826	void
3793	rxvt_term::scr_swap_overlay () NOTHROW	3827	rxvt_term::scr_swap_overlay () NOTHROW
3794	{	3828	{
3795	if (!ov_text)	3829	if (!ov.text)
3796	return;	3830	return;
3797		3831
		3832	// hide cursor if it is within the overlay area
		3833	if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
		3834	&& IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
		3835	screen.flags &= ~Screen_VisibleCursor;
		3836
3798	// swap screen mem with overlay	3837	// swap screen mem with overlay
3799	for (int y = ov_h; y--; )	3838	for (int y = ov.h; y--; )
3800	{	3839	{
3801	text_t *t1 = ov_text[y];	3840	text_t *t1 = ov.text[y];
3802	rend_t *r1 = ov_rend[y];	3841	rend_t *r1 = ov.rend[y];
3803		3842
3804	text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;	3843	text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805	rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;	3844	rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806		3845
3807	for (int x = ov_w; x--; )	3846	for (int x = ov.w; x--; )
3808	{	3847	{
3809	text_t t = *t1; *t1++ = *t2; *t2++ = t;	3848	text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));	3849	rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811	}	3850	}
3812	}	3851	}

Diff Legend

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