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.240 by root, Thu Jan 19 17:21:20 2006 UTC vs.
Revision 1.273 by ayin, Mon Aug 13 07:18:58 2007 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-2006 Marc Lehmann <pcg@goof.com>
…		…
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	inline void fill_text (text_t *start, text_t value, int len)
…		…
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() \
…		…
93	*/	91	*/
94	#define drawBuffer vt	92	#define drawBuffer vt
95		93
96	#define CLEAR_ROWS(row, num) \	94	#define CLEAR_ROWS(row, num) \
97	if (mapped) \	95	if (mapped) \
98	XClearArea (display->display, drawBuffer, 0, \	96	XClearArea (dpy, drawBuffer, 0, \
99	Row2Pixel (row), (unsigned int)width, \	97	Row2Pixel (row), (unsigned int)width, \
100	(unsigned int)Height2Pixel (num), False)	98	(unsigned int)Height2Pixel (num), False)
101		99
102	#define CLEAR_CHARS(x, y, num) \	100	#define CLEAR_CHARS(x, y, num) \
103	if (mapped) \	101	if (mapped) \
104	XClearArea (display->display, drawBuffer, x, y, \	102	XClearArea (dpy, drawBuffer, x, y, \
105	(unsigned int)Width2Pixel (num), \	103	(unsigned int)Width2Pixel (num), \
106	(unsigned int)Height2Pixel (1), False)	104	(unsigned int)Height2Pixel (1), False)
107		105
108	#define ERASE_ROWS(row, num) \	106	#define ERASE_ROWS(row, num) \
109	XFillRectangle (display->display, drawBuffer, gc, \	107	XFillRectangle (dpy, drawBuffer, gc, \
110	0, Row2Pixel (row), \	108	0, Row2Pixel (row), \
111	(unsigned int)width, \	109	(unsigned int)width, \
112	(unsigned int)Height2Pixel (num))	110	(unsigned int)Height2Pixel (num))
113		111
114	/* ------------------------------------------------------------------------- *	112	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	113	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	114	* ------------------------------------------------------------------------- */
117		115
118	/* Fill part/all of a line with blanks. */	116	/* Fill part/all of a line with blanks. */
119	void	117	void
120	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const	118	rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121	{	119	{
122	if (!l.t)	120	if (!l.t)
123	{	121	{
124	lalloc (l);	122	lalloc (l);
125	col = 0;	123	col = 0;
126	width = ncol;	124	width = ncol;
127	}	125	}
128		126
129	l.touch ();	127	l.touch ();
130		128
131	efs &= ~RS_baseattrMask;	129	efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	130	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133		131
134	text_t *et = l.t + col;	132	text_t *et = l.t + col;
135	rend_t *er = l.r + col;	133	rend_t *er = l.r + col;
136		134
…		…
142	}	140	}
143		141
144	/* ------------------------------------------------------------------------- */	142	/* ------------------------------------------------------------------------- */
145	/* Fill a full line with blanks - make sure it is allocated first */	143	/* Fill a full line with blanks - make sure it is allocated first */
146	void	144	void
147	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const	145	rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148	{	146	{
149	scr_blank_line (l, 0, ncol, efs);	147	scr_blank_line (l, 0, ncol, efs);
150		148
151	l.l = 0;	149	l.l = 0;
152	l.f = 0;	150	l.f = 0;
…		…
161	{	159	{
162	#if ENABLE_OVERLAY	160	#if ENABLE_OVERLAY
163	scr_overlay_off ();	161	scr_overlay_off ();
164	#endif	162	#endif
165		163
		164	rvideo_mode = false;
166	view_start = 0;	165	view_start = 0;
167	num_scr = 0;	166	num_scr = 0;
168		167
169	if (ncol == 0)	168	if (ncol == 0)
170	ncol = 80;	169	ncol = 80;
…		…
173	nrow = 24;	172	nrow = 24;
174		173
175	if (ncol == prev_ncol && nrow == prev_nrow)	174	if (ncol == prev_ncol && nrow == prev_nrow)
176	return;	175	return;
177		176
		177	if (current_screen != PRIMARY)
		178	scr_swap_screen ();
		179
178	// we need at least two lines for wrapping to work correctly	180	// we need at least two lines for wrapping to work correctly
179	if (nrow + saveLines < 2)	181	while (nrow + saveLines < 2)
180	{	182	{
181	//TODO//FIXME	183	//TODO//FIXME
182	saveLines++;	184	saveLines++;
183	prev_nrow--;	185	prev_nrow--;
184	top_row--;	186	top_row--;
…		…
195	if (!row_buf)	197	if (!row_buf)
196	{	198	{
197	/*	199	/*
198	* first time called so just malloc everything: don't rely on realloc	200	* first time called so just malloc everything: don't rely on realloc
199	*/	201	*/
200	top_row = 0; /* no saved lines */	202	top_row = 0;
201	term_start = 0;	203	term_start = 0;
202		204
203	talloc = new rxvt_salloc (ncol * sizeof (text_t));	205	talloc = new rxvt_salloc (ncol * sizeof (text_t));
204	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));	206	ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205		207
…		…
234	selection.text = NULL;	236	selection.text = NULL;
235	selection.len = 0;	237	selection.len = 0;
236	selection.op = SELECTION_CLEAR;	238	selection.op = SELECTION_CLEAR;
237	selection.screen = PRIMARY;	239	selection.screen = PRIMARY;
238	selection.clicks = 0;	240	selection.clicks = 0;
239	CLEAR_ALL_SELECTION ();
240	rvideo = 0;
241	}	241	}
242	else	242	else
243	{	243	{
244	CLEAR_ALL_SELECTION ();
245
246	/*	244	/*
247	* add or delete rows as appropriate	245	* add or delete rows as appropriate
248	*/	246	*/
249		247
250	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));	248	rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
…		…
283	int pend = MOD (term_start + top_row , prev_total_rows);	281	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	282	int q = total_rows; // rewrapped row
285		283
286	if (top_row)	284	if (top_row)
287	{	285	{
288	// re-wrap lines, this is rather ugly, possibly because I am too dumb	286	// Re-wrap lines. This is rather ugly, possibly because I am too dumb
289	// to come up with a lean and mean algorithm.	287	// to come up with a lean and mean algorithm.
290		288
291	row_col_t ocur = screen.cur;	289	row_col_t ocur = screen.cur;
292	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293		291
…		…
350		348
351	line_t &pline = old_buf [prow];	349	line_t &pline = old_buf [prow];
352		350
353	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	351	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354		352
355	assert (len);
356	assert (pline.t);
357
358	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	353	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	354	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360		355
361	lofs += len;	356	lofs += len;
362	qcol += len;	357	qcol += len;
…		…
402	delete old_ra;	397	delete old_ra;
403		398
404	clamp_it (screen.cur.row, 0, nrow - 1);	399	clamp_it (screen.cur.row, 0, nrow - 1);
405	clamp_it (screen.cur.col, 0, ncol - 1);	400	clamp_it (screen.cur.col, 0, ncol - 1);
406		401
407	if (tabs)
408	free (tabs);	402	free (tabs);
409	}	403	}
		404
		405	CLEAR_ALL_SELECTION ();
410		406
411	prev_nrow = nrow;	407	prev_nrow = nrow;
412	prev_ncol = ncol;	408	prev_ncol = ncol;
413		409
414	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	410	tabs = (char *)rxvt_malloc (ncol * sizeof (char));
415		411
416	for (int col = ncol; col--; )	412	for (int col = ncol; --col; )
417	tabs [col] = col % TABSIZE == 0;	413	tabs [col] = col % TABSIZE == 0;
418		414
		415	if (current_screen != PRIMARY)
		416	scr_swap_screen ();
		417
419	tt_winch ();	418	tt_winch ();
420		419
421	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422	}	421	}
423		422
424	/* ------------------------------------------------------------------------- */	423	/* ------------------------------------------------------------------------- */
425	/*	424	/*
426	* Free everything. That way malloc debugging can find leakage.	425	* Free everything. That way malloc debugging can find leakage.
427	*/	426	*/
428	void	427	void
429	rxvt_term::scr_release ()	428	rxvt_term::scr_release () NOTHROW
430	{	429	{
		430	if (row_buf)
		431	{
431	delete talloc; talloc = 0;	432	delete talloc; talloc = 0;
432	delete ralloc; ralloc = 0;	433	delete ralloc; ralloc = 0;
433		434
434	free (row_buf);	435	free (row_buf);
435	free (swap_buf);	436	free (swap_buf);
436	free (drawn_buf);	437	free (drawn_buf);
437	free (tabs);	438	free (tabs);
438		439
439	row_buf = 0; // signal that we freed all the arrays	440	row_buf = 0; // signal that we freed all the arrays
		441	}
440	}	442	}
441		443
442	/* ------------------------------------------------------------------------- */	444	/* ------------------------------------------------------------------------- */
443	/*	445	/*
444	* Hard reset	446	* Hard reset
…		…
461	* Save and Restore cursor	463	* Save and Restore cursor
462	* XTERM_SEQ: Save cursor : ESC 7	464	* XTERM_SEQ: Save cursor : ESC 7
463	* XTERM_SEQ: Restore cursor: ESC 8	465	* XTERM_SEQ: Restore cursor: ESC 8
464	*/	466	*/
465	void	467	void
466	rxvt_term::scr_cursor (int mode)	468	rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
467	{	469	{
468	screen_t *s;	470	screen_t *s;
469		471
470	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)	472	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
471	if (current_screen == SECONDARY)	473	if (current_screen == SECONDARY)
…		…
503	assert (s->cur.row >= 0);	505	assert (s->cur.row >= 0);
504	assert (s->cur.col >= 0);	506	assert (s->cur.col >= 0);
505	#endif	507	#endif
506	}	508	}
507		509
		510	void
		511	rxvt_term::scr_swap_screen ()
		512	{
		513	if (!option (Opt_secondaryScreen))
		514	return;
		515
		516	for (int i = prev_nrow; i--; )
		517	::swap (ROW(i), swap_buf [i]);
		518
		519	::swap (screen.cur, swap.cur);
		520
		521	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
		522	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
		523	}
		524
508	/* ------------------------------------------------------------------------- */	525	/* ------------------------------------------------------------------------- */
509	/*	526	/*
510	* Swap between primary and secondary screens	527	* Swap between primary and secondary screens
511	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h	528	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
512	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	529	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
513	*/	530	*/
514	int	531	void
515	rxvt_term::scr_change_screen (int scrn)	532	rxvt_term::scr_change_screen (int scrn)
516	{	533	{
		534	if (scrn == current_screen)
		535	return;
		536
517	want_refresh = 1;	537	want_refresh = 1;
518	view_start = 0;	538	view_start = 0;
519		539
520	if (current_screen == scrn)
521	return scrn;
522
523	selection_check (2); /* check for boundary cross */	540	selection_check (2); /* check for boundary cross */
524		541
525	int i = current_screen; current_screen = scrn; scrn = i;	542	int i = current_screen; current_screen = scrn; scrn = i;
526		543
527	::swap (screen.cur.row, swap.cur.row);
528	::swap (screen.cur.col, swap.cur.col);
529
530	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
531	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
532
533	#if NSCREENS	544	#if NSCREENS
534	if (OPTION (Opt_secondaryScreen))	545	if (option (Opt_secondaryScreen))
535	{	546	{
536	num_scr = 0;	547	num_scr = 0;
537		548
538	for (int i = prev_nrow; i--; )	549	scr_swap_screen ();
539	::swap (ROW(i), swap_buf [i]);
540		550
541	::swap (screen.charset, swap.charset);	551	::swap (screen.charset, swap.charset);
542	::swap (screen.flags, swap.flags);	552	::swap (screen.flags, swap.flags);
543	screen.flags |= Screen_VisibleCursor;	553	screen.flags |= Screen_VisibleCursor;
544	swap.flags |= Screen_VisibleCursor;	554	swap.flags |= Screen_VisibleCursor;
545	}	555	}
546	else	556	else
547	#endif	557	#endif
548	if (OPTION (Opt_secondaryScroll))	558	if (option (Opt_secondaryScroll))
549	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	559	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
550
551	return scrn;
552	}	560	}
553		561
554	// clear WrapNext indicator, solidifying position on next line	562	// clear WrapNext indicator, solidifying position on next line
555	void	563	void
556	rxvt_term::scr_do_wrap ()	564	rxvt_term::scr_do_wrap () NOTHROW
557	{	565	{
558	if (!(screen.flags & Screen_WrapNext))	566	if (!(screen.flags & Screen_WrapNext))
559	return;	567	return;
560		568
561	screen.flags &= ~Screen_WrapNext;	569	screen.flags &= ~Screen_WrapNext;
…		…
571	/* ------------------------------------------------------------------------- */	579	/* ------------------------------------------------------------------------- */
572	/*	580	/*
573	* Change the colour for following text	581	* Change the colour for following text
574	*/	582	*/
575	void	583	void
576	rxvt_term::scr_color (unsigned int color, int fgbg)	584	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
577	{	585	{
578	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	586	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
579	color = fgbg;	587	color = fgbg;
580		588
581	if (fgbg == Color_fg)	589	if (fgbg == Color_fg)
…		…
587	/* ------------------------------------------------------------------------- */	595	/* ------------------------------------------------------------------------- */
588	/*	596	/*
589	* Change the rendition style for following text	597	* Change the rendition style for following text
590	*/	598	*/
591	void	599	void
592	rxvt_term::scr_rendition (int set, int style)	600	rxvt_term::scr_rendition (int set, int style) NOTHROW
593	{	601	{
594	if (set)	602	if (set)
595	rstyle |= style;	603	rstyle |= style;
596	else if (style == ~RS_None)	604	else if (style == ~RS_None)
597	rstyle = DEFAULT_RSTYLE;	605	rstyle = DEFAULT_RSTYLE;
…		…
604	* Scroll text between <row1> and <row2> inclusive, by <count> lines	612	* Scroll text between <row1> and <row2> inclusive, by <count> lines
605	* count positive ==> scroll up	613	* count positive ==> scroll up
606	* count negative ==> scroll down	614	* count negative ==> scroll down
607	*/	615	*/
608	int	616	int
609	rxvt_term::scr_scroll_text (int row1, int row2, int count)	617	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
610	{	618	{
611	if (count == 0 || (row1 > row2))	619	if (count == 0 || (row1 > row2))
612	return 0;	620	return 0;
613		621
614	want_refresh = 1;	622	want_refresh = 1;
615	num_scr += count;	623	num_scr += count;
616		624
617	if (count > 0	625	if (count > 0
618	&& row1 == 0	626	&& row1 == 0
619	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	627	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620	{	628	{
621	top_row = max (top_row - count, -saveLines);	629	top_row = max (top_row - count, -saveLines);
622		630
623	// scroll everything up 'count' lines	631	// scroll everything up 'count' lines
624	term_start = (term_start + count) % total_rows;	632	term_start = (term_start + count) % total_rows;
…		…
631	}	639	}
632		640
633	// erase newly scrolled-in lines	641	// erase newly scrolled-in lines
634	for (int i = count; i--; )	642	for (int i = count; i--; )
635	{	643	{
636	// basically this is a slightly optimized scr_blank_screen_mem
637	// it is worth the effort on slower machines
638	line_t &l = ROW(nrow - 1 - i);	644	line_t &l = ROW(nrow - 1 - i);
639		645
		646	// optimize if already cleared, can be significant on slow machines
		647	// could be rolled into scr_blank_screen_mem
		648	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
		649	{
640	scr_blank_line (l, 0, l.l, rstyle);	650	scr_blank_line (l, 0, l.l, rstyle);
641
642	l.l = 0;	651	l.l = 0;
643	l.f = 0;	652	l.f = 0;
		653	}
		654	else
		655	scr_blank_screen_mem (l, rstyle);
644	}	656	}
645		657
646	// now copy lines below the scroll region bottom to the	658	// now copy lines below the scroll region bottom to the
647	// bottom of the screen again, so they look as if they	659	// bottom of the screen again, so they look as if they
648	// hadn't moved.	660	// hadn't moved.
…		…
670	selection.op = SELECTION_CLEAR;	682	selection.op = SELECTION_CLEAR;
671	}	683	}
672	}	684	}
673		685
674	// finally move the view window, if desired	686	// finally move the view window, if desired
675	if (OPTION (Opt_scrollWithBuffer)	687	if (option (Opt_scrollWithBuffer)
676	&& view_start != 0	688	&& view_start != 0
677	&& view_start != -saveLines)	689	&& view_start != -saveLines)
678	scr_page (UP, count);	690	scr_page (UP, count);
679		691
680	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
…		…
732	/* ------------------------------------------------------------------------- */	744	/* ------------------------------------------------------------------------- */
733	/*	745	/*
734	* Add text given in <str> of length <len> to screen struct	746	* Add text given in <str> of length <len> to screen struct
735	*/	747	*/
736	void	748	void
737	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)	749	rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738	{	750	{
739	if (len <= 0) /* sanity */	751	if (len <= 0) /* sanity */
740	return;	752	return;
741		753
742	unsigned char checksel;	754	unsigned char checksel;
…		…
748	ZERO_SCROLLBACK ();	760	ZERO_SCROLLBACK ();
749		761
750	if (minlines > 0)	762	if (minlines > 0)
751	{	763	{
752	minlines += screen.cur.row - screen.bscroll;	764	minlines += screen.cur.row - screen.bscroll;
		765	min_it (minlines, screen.cur.row - top_row);
753		766
754	if (minlines > 0	767	if (minlines > 0
755	&& screen.tscroll == 0	768	&& screen.tscroll == 0
756	&& screen.bscroll == nrow - 1)	769	&& screen.bscroll == nrow - 1)
757	{	770	{
…		…
831		844
832	// some utf-8 decoders "decode" surrogate characters: let's fix this.	845	// some utf-8 decoders "decode" surrogate characters: let's fix this.
833	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	846	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
834	c = 0xfffd;	847	c = 0xfffd;
835		848
836	// rely on wcwidth to tell us the character width, at least for non-latin1	849	// rely on wcwidth to tell us the character width, do wcwidth before
837	// do wcwidth before further replacements, as wcwidth might return -1	850	// further replacements, as wcwidth might return -1 for the line
838	// for the line drawing characters below as they might be invalid in the current	851	// drawing characters below as they might be invalid in the current
839	// locale.	852	// locale.
840	int width = c < 0x100 ? 1 : wcwidth (c);	853	int width = WCWIDTH (c);
841		854
842	if (charsets [screen.charset] == '0') // DEC SPECIAL	855	if (charsets [screen.charset] == '0') // DEC SPECIAL
843	{	856	{
844	// vt100 special graphics and line drawing	857	// vt100 special graphics and line drawing
845	// 5f-7e standard vt100	858	// 5f-7e standard vt100
…		…
996	/*	1009	/*
997	* Process Backspace. Move back the cursor back a position, wrap if have to	1010	* Process Backspace. Move back the cursor back a position, wrap if have to
998	* XTERM_SEQ: CTRL-H	1011	* XTERM_SEQ: CTRL-H
999	*/	1012	*/
1000	void	1013	void
1001	rxvt_term::scr_backspace ()	1014	rxvt_term::scr_backspace () NOTHROW
1002	{	1015	{
1003	want_refresh = 1;	1016	want_refresh = 1;
1004		1017
1005	if (screen.cur.col == 0)	1018	if (screen.cur.col == 0)
1006	{	1019	{
…		…
1024	* Process Horizontal Tab	1037	* Process Horizontal Tab
1025	* count: +ve = forward; -ve = backwards	1038	* count: +ve = forward; -ve = backwards
1026	* XTERM_SEQ: CTRL-I	1039	* XTERM_SEQ: CTRL-I
1027	*/	1040	*/
1028	void	1041	void
1029	rxvt_term::scr_tab (int count, bool ht)	1042	rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030	{	1043	{
1031	int i, x;	1044	int i, x;
1032		1045
1033	want_refresh = 1;	1046	want_refresh = 1;
1034	i = x = screen.cur.col;	1047	i = x = screen.cur.col;
…		…
1056	if (count)	1069	if (count)
1057	x = ncol - 1;	1070	x = ncol - 1;
1058		1071
1059	// store horizontal tab commands as characters inside the text	1072	// store horizontal tab commands as characters inside the text
1060	// buffer so they can be selected and pasted.	1073	// buffer so they can be selected and pasted.
1061	if (ht && OPTION (Opt_pastableTabs))	1074	if (ht && option (Opt_pastableTabs))
1062	{	1075	{
1063	base_rend = SET_FONT (base_rend, 0);	1076	base_rend = SET_FONT (base_rend, 0);
1064		1077
1065	l.touch (x);	1078	l.touch (x);
1066		1079
…		…
1099	* Process DEC Back Index	1112	* Process DEC Back Index
1100	* XTERM_SEQ: ESC 6	1113	* XTERM_SEQ: ESC 6
1101	* Move cursor left in row. If we're at the left boundary, shift everything	1114	* Move cursor left in row. If we're at the left boundary, shift everything
1102	* in that row right. Clear left column.	1115	* in that row right. Clear left column.
1103	*/	1116	*/
1104	#if ENABLE_FRILLS	1117	#if !ENABLE_MINIMAL
1105	void	1118	void
1106	rxvt_term::scr_backindex ()	1119	rxvt_term::scr_backindex () NOTHROW
1107	{	1120	{
1108	if (screen.cur.col > 0)	1121	if (screen.cur.col > 0)
1109	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1122	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110	else	1123	else
1111	scr_insdel_chars (1, INSERT);	1124	scr_insdel_chars (1, INSERT);
…		…
1116	* Process DEC Forward Index	1129	* Process DEC Forward Index
1117	* XTERM_SEQ: ESC 9	1130	* XTERM_SEQ: ESC 9
1118	* Move cursor right in row. If we're at the right boundary, shift everything	1131	* Move cursor right in row. If we're at the right boundary, shift everything
1119	* in that row left. Clear right column.	1132	* in that row left. Clear right column.
1120	*/	1133	*/
1121	#if ENABLE_FRILLS	1134	#if !ENABLE_MINIMAL
1122	void	1135	void
1123	rxvt_term::scr_forwardindex ()	1136	rxvt_term::scr_forwardindex () NOTHROW
1124	{	1137	{
1125	if (screen.cur.col < ncol - 1)	1138	if (screen.cur.col < ncol - 1)
1126	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1139	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127	else	1140	else
1128	{	1141	{
…		…
1141	/* ------------------------------------------------------------------------- */	1154	/* ------------------------------------------------------------------------- */
1142	/*	1155	/*
1143	* Goto Row/Column	1156	* Goto Row/Column
1144	*/	1157	*/
1145	void	1158	void
1146	rxvt_term::scr_gotorc (int row, int col, int relative)	1159	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147	{	1160	{
1148	want_refresh = 1;	1161	want_refresh = 1;
1149	ZERO_SCROLLBACK ();	1162	ZERO_SCROLLBACK ();
1150		1163
1151	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1164	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1189	/* ------------------------------------------------------------------------- */	1202	/* ------------------------------------------------------------------------- */
1190	/*	1203	/*
1191	* direction should be UP or DN	1204	* direction should be UP or DN
1192	*/	1205	*/
1193	void	1206	void
1194	rxvt_term::scr_index (enum page_dirn direction)	1207	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195	{	1208	{
1196	int dirn;	1209	int dirn;
1197		1210
1198	want_refresh = 1;	1211	want_refresh = 1;
1199	ZERO_SCROLLBACK ();	1212	ZERO_SCROLLBACK ();
…		…
1218	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1231	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1219	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1232	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1220	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1233	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1221	*/	1234	*/
1222	void	1235	void
1223	rxvt_term::scr_erase_line (int mode)	1236	rxvt_term::scr_erase_line (int mode) NOTHROW
1224	{	1237	{
1225	unsigned int col, num;	1238	unsigned int col, num;
1226		1239
1227	want_refresh = 1;	1240	want_refresh = 1;
1228	ZERO_SCROLLBACK ();	1241	ZERO_SCROLLBACK ();
…		…
1272	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1285	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1286	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1287	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275	*/	1288	*/
1276	void	1289	void
1277	rxvt_term::scr_erase_screen (int mode)	1290	rxvt_term::scr_erase_screen (int mode) NOTHROW
1278	{	1291	{
1279	int num;	1292	int num;
1280	int32_t row;	1293	int32_t row;
1281	rend_t ren;	1294	rend_t ren;
1282	XGCValues gcvalue;	1295	XGCValues gcvalue;
…		…
1327	}	1340	}
1328	else	1341	else
1329	{	1342	{
1330	ren = rstyle & (RS_fgMask | RS_bgMask);	1343	ren = rstyle & (RS_fgMask | RS_bgMask);
1331	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1344	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1332	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1345	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1333	ERASE_ROWS (row, num);	1346	ERASE_ROWS (row, num);
1334	gcvalue.foreground = pix_colors[Color_fg];	1347	gcvalue.foreground = pix_colors[Color_fg];
1335	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1348	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1336	}	1349	}
1337		1350
1338	for (; num--; row++)	1351	for (; num--; row++)
1339	{	1352	{
1340	scr_blank_screen_mem (ROW(row), rstyle);	1353	scr_blank_screen_mem (ROW(row), rstyle);
1341	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1354	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1342	}	1355	}
1343	}	1356	}
1344		1357
1345	#if ENABLE_FRILLS	1358	#if !ENABLE_MINIMAL
1346	void	1359	void
1347	rxvt_term::scr_erase_savelines ()	1360	rxvt_term::scr_erase_savelines () NOTHROW
1348	{	1361	{
1349	want_refresh = 1;	1362	want_refresh = 1;
1350	ZERO_SCROLLBACK ();	1363	ZERO_SCROLLBACK ();
1351		1364
1352	top_row = 0;	1365	top_row = 0;
…		…
1357	/*	1370	/*
1358	* Fill the screen with `E's	1371	* Fill the screen with `E's
1359	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1372	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1360	*/	1373	*/
1361	void	1374	void
1362	rxvt_term::scr_E ()	1375	rxvt_term::scr_E () NOTHROW
1363	{	1376	{
1364	rend_t fs;	1377	rend_t fs;
1365		1378
1366	want_refresh = 1;	1379	want_refresh = 1;
1367	ZERO_SCROLLBACK ();	1380	ZERO_SCROLLBACK ();
…		…
1388	/* ------------------------------------------------------------------------- */	1401	/* ------------------------------------------------------------------------- */
1389	/*	1402	/*
1390	* Insert/Delete <count> lines	1403	* Insert/Delete <count> lines
1391	*/	1404	*/
1392	void	1405	void
1393	rxvt_term::scr_insdel_lines (int count, int insdel)	1406	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394	{	1407	{
1395	int end;	1408	int end;
1396		1409
1397	ZERO_SCROLLBACK ();	1410	ZERO_SCROLLBACK ();
1398		1411
…		…
1418	/* ------------------------------------------------------------------------- */	1431	/* ------------------------------------------------------------------------- */
1419	/*	1432	/*
1420	* Insert/Delete <count> characters from the current position	1433	* Insert/Delete <count> characters from the current position
1421	*/	1434	*/
1422	void	1435	void
1423	rxvt_term::scr_insdel_chars (int count, int insdel)	1436	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424	{	1437	{
1425	int col, row;	1438	int col, row;
1426	rend_t tr;	1439	rend_t tr;
1427		1440
1428	want_refresh = 1;	1441	want_refresh = 1;
…		…
1516	/*	1529	/*
1517	* Set the scrolling region	1530	* Set the scrolling region
1518	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1531	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519	*/	1532	*/
1520	void	1533	void
1521	rxvt_term::scr_scroll_region (int top, int bot)	1534	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522	{	1535	{
1523	max_it (top, 0);	1536	max_it (top, 0);
1524	min_it (bot, nrow - 1);	1537	min_it (bot, nrow - 1);
1525		1538
1526	if (top > bot)	1539	if (top > bot)
…		…
1536	* Make the cursor visible/invisible	1549	* Make the cursor visible/invisible
1537	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1550	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1551	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539	*/	1552	*/
1540	void	1553	void
1541	rxvt_term::scr_cursor_visible (int mode)	1554	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542	{	1555	{
1543	want_refresh = 1;	1556	want_refresh = 1;
1544		1557
1545	if (mode)	1558	if (mode)
1546	screen.flags |= Screen_VisibleCursor;	1559	screen.flags |= Screen_VisibleCursor;
…		…
1553	* Set/unset automatic wrapping	1566	* Set/unset automatic wrapping
1554	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1567	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1568	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556	*/	1569	*/
1557	void	1570	void
1558	rxvt_term::scr_autowrap (int mode)	1571	rxvt_term::scr_autowrap (int mode) NOTHROW
1559	{	1572	{
1560	if (mode)	1573	if (mode)
1561	screen.flags |= Screen_Autowrap;	1574	screen.flags |= Screen_Autowrap;
1562	else	1575	else
1563	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1576	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1572	* and the cursor cannot be moved outside.	1585	* and the cursor cannot be moved outside.
1573	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1586	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1587	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575	*/	1588	*/
1576	void	1589	void
1577	rxvt_term::scr_relative_origin (int mode)	1590	rxvt_term::scr_relative_origin (int mode) NOTHROW
1578	{	1591	{
1579	if (mode)	1592	if (mode)
1580	screen.flags |= Screen_Relative;	1593	screen.flags |= Screen_Relative;
1581	else	1594	else
1582	screen.flags &= ~Screen_Relative;	1595	screen.flags &= ~Screen_Relative;
…		…
1589	* Set insert/replace mode	1602	* Set insert/replace mode
1590	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1603	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1604	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592	*/	1605	*/
1593	void	1606	void
1594	rxvt_term::scr_insert_mode (int mode)	1607	rxvt_term::scr_insert_mode (int mode) NOTHROW
1595	{	1608	{
1596	if (mode)	1609	if (mode)
1597	screen.flags |= Screen_Insert;	1610	screen.flags |= Screen_Insert;
1598	else	1611	else
1599	screen.flags &= ~Screen_Insert;	1612	screen.flags &= ~Screen_Insert;
…		…
1605	* XTERM_SEQ: Set tab at current column : ESC H	1618	* XTERM_SEQ: Set tab at current column : ESC H
1606	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1619	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1620	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608	*/	1621	*/
1609	void	1622	void
1610	rxvt_term::scr_set_tab (int mode)	1623	rxvt_term::scr_set_tab (int mode) NOTHROW
1611	{	1624	{
1612	if (mode < 0)	1625	if (mode < 0)
1613	memset (tabs, 0, ncol * sizeof (char));	1626	memset (tabs, 0, ncol * sizeof (char));
1614	else if (screen.cur.col < ncol)	1627	else if (screen.cur.col < ncol)
1615	tabs [screen.cur.col] = !!mode;	1628	tabs [screen.cur.col] = !!mode;
…		…
1620	* Set reverse/normal video	1633	* Set reverse/normal video
1621	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1634	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1635	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1623	*/	1636	*/
1624	void	1637	void
1625	rxvt_term::scr_rvideo_mode (int mode)	1638	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626	{	1639	{
1627	XGCValues gcvalue;	1640	rvideo_mode = on;
1628		1641
		1642	#ifndef NO_BELL
		1643	on ^= rvideo_bell;
		1644	#endif
		1645
1629	if (rvideo != mode)	1646	if (rvideo_state != on)
1630	{	1647	{
1631	rvideo = mode;	1648	rvideo_state = on;
		1649
1632	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1650	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633	#if XPM_BACKGROUND	1651	#ifdef HAVE_BG_PIXMAP
1634	if (bgPixmap.pixmap == None)	1652	if (bgPixmap.pixmap == None)
1635	#endif	1653	#endif
1636	#if TRANSPARENT	1654	#if ENABLE_TRANSPARENCY
1637	if (! OPTION (Opt_transparent) || am_transparent == 0)	1655	if (!option (Opt_transparent) || am_transparent == 0)
1638	#endif	1656	#endif
1639	XSetWindowBackground (display->display, vt,	1657	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1640	pix_colors[Color_bg]);
1641		1658
		1659	XGCValues gcvalue;
1642	gcvalue.foreground = pix_colors[Color_fg];	1660	gcvalue.foreground = pix_colors[Color_fg];
1643	gcvalue.background = pix_colors[Color_bg];	1661	gcvalue.background = pix_colors[Color_bg];
1644	XChangeGC (display->display, gc, GCBackground | GCForeground,	1662	XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1645	&gcvalue);	1663
1646	scr_clear ();	1664	scr_clear ();
1647	scr_touch (true);	1665	scr_touch (true);
1648	}	1666	}
1649	}	1667	}
1650		1668
…		…
1652	/*	1670	/*
1653	* Report current cursor position	1671	* Report current cursor position
1654	* XTERM_SEQ: Report position: ESC [ 6 n	1672	* XTERM_SEQ: Report position: ESC [ 6 n
1655	*/	1673	*/
1656	void	1674	void
1657	rxvt_term::scr_report_position ()	1675	rxvt_term::scr_report_position () NOTHROW
1658	{	1676	{
1659	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1677	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660	}	1678	}
1661		1679
1662	/* ------------------------------------------------------------------------- *	1680	/* ------------------------------------------------------------------------- *
…		…
1665		1683
1666	/*	1684	/*
1667	* Set font style	1685	* Set font style
1668	*/	1686	*/
1669	void	1687	void
1670	rxvt_term::set_font_style ()	1688	rxvt_term::set_font_style () NOTHROW
1671	{	1689	{
1672	#if 0	1690	#if 0
1673	switch (charsets [screen.charset])	1691	switch (charsets [screen.charset])
1674	{	1692	{
1675	case '0': /* DEC Special Character & Line Drawing Set */	1693	case '0': /* DEC Special Character & Line Drawing Set */
…		…
1697	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1715	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1698	* XTERM_SEQ: Invoke G2 character set: ESC N	1716	* XTERM_SEQ: Invoke G2 character set: ESC N
1699	* XTERM_SEQ: Invoke G3 character set: ESC O	1717	* XTERM_SEQ: Invoke G3 character set: ESC O
1700	*/	1718	*/
1701	void	1719	void
1702	rxvt_term::scr_charset_choose (int set)	1720	rxvt_term::scr_charset_choose (int set) NOTHROW
1703	{	1721	{
1704	screen.charset = set;	1722	screen.charset = set;
1705	set_font_style ();	1723	set_font_style ();
1706	}	1724	}
1707		1725
…		…
1713	* XTERM_SEQ: Set G2 character set: ESC * <C>	1731	* XTERM_SEQ: Set G2 character set: ESC * <C>
1714	* XTERM_SEQ: Set G3 character set: ESC + <C>	1732	* XTERM_SEQ: Set G3 character set: ESC + <C>
1715	* See set_font_style for possible values for <C>	1733	* See set_font_style for possible values for <C>
1716	*/	1734	*/
1717	void	1735	void
1718	rxvt_term::scr_charset_set (int set, unsigned int ch)	1736	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719	{	1737	{
1720	charsets[set] = (unsigned char)ch;	1738	charsets[set] = (unsigned char)ch;
1721	set_font_style ();	1739	set_font_style ();
1722	}	1740	}
1723		1741
…		…
1728		1746
1729	/*	1747	/*
1730	* refresh matching text.	1748	* refresh matching text.
1731	*/	1749	*/
1732	bool	1750	bool
1733	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1751	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734	{	1752	{
1735	bool found = false;	1753	bool found = false;
1736		1754
1737	for (int i = 0; i < nrow; i++)	1755	for (int i = 0; i < nrow; i++)
1738	{	1756	{
1739	int col = 0;
1740	rend_t *drp = drawn_buf[i].r;	1757	rend_t *drp = drawn_buf[i].r;
1741		1758
1742	for (; col < ncol; col++, drp++)	1759	for (int col = 0; col < ncol; col++, drp++)
1743	if ((*drp & mask) == value)	1760	if ((*drp & mask) == value)
1744	{	1761	{
1745	found = true;	1762	found = true;
1746	*drp = ~value;	1763	*drp = ~value;
1747	}	1764	}
…		…
1758	PART_END,	1775	PART_END,
1759	RC_COUNT	1776	RC_COUNT
1760	};	1777	};
1761		1778
1762	void	1779	void
1763	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1780	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764	{	1781	{
1765	int i;	1782	int i;
1766	row_col_t rc[RC_COUNT];	1783	row_col_t rc[RC_COUNT];
1767		1784
1768	if (!drawn_buf) /* sanity check */	1785	if (!drawn_buf) /* sanity check */
…		…
1802	/* ------------------------------------------------------------------------- */	1819	/* ------------------------------------------------------------------------- */
1803	/*	1820	/*
1804	* Refresh the entire screen	1821	* Refresh the entire screen
1805	*/	1822	*/
1806	void	1823	void
1807	rxvt_term::scr_touch (bool refresh)	1824	rxvt_term::scr_touch (bool refresh) NOTHROW
1808	{	1825	{
1809	scr_expose (0, 0, width, height, refresh);	1826	scr_expose (0, 0, width, height, refresh);
1810	}	1827	}
1811		1828
1812	/* ------------------------------------------------------------------------- */	1829	/* ------------------------------------------------------------------------- */
1813	/*	1830	/*
1814	* Move the display so that the line represented by scrollbar value Y is at	1831	* Move the display so that the line represented by scrollbar value Y is at
1815	* the top of the screen	1832	* the top of the screen
1816	*/	1833	*/
1817	void	1834	void
1818	rxvt_term::scr_move_to (int y, int len)	1835	rxvt_term::scr_move_to (int y, int len) NOTHROW
1819	{	1836	{
1820	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1837	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821	}	1838	}
1822		1839
1823	/* ------------------------------------------------------------------------- */	1840	/* ------------------------------------------------------------------------- */
1824	/*	1841	/*
1825	* Page the screen up/down nlines	1842	* Page the screen up/down nlines
1826	* direction should be UP or DN	1843	* direction should be UP or DN
1827	*/	1844	*/
1828	bool	1845	bool
1829	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1846	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830	{	1847	{
1831	int new_view_start =	1848	int new_view_start =
1832	direction == UP ? view_start - nlines	1849	direction == UP ? view_start - nlines
1833	: view_start + nlines;	1850	: view_start + nlines;
1834		1851
1835	return scr_changeview (new_view_start);	1852	return scr_changeview (new_view_start);
1836	}	1853	}
1837		1854
1838	bool	1855	bool
1839	rxvt_term::scr_changeview (int new_view_start)	1856	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840	{	1857	{
1841	clamp_it (new_view_start, top_row, 0);	1858	clamp_it (new_view_start, top_row, 0);
1842		1859
1843	if (new_view_start == view_start)	1860	if (new_view_start == view_start)
1844	return false;	1861	return false;
…		…
1850	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1867	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851		1868
1852	return true;	1869	return true;
1853	}	1870	}
1854		1871
1855	/* ------------------------------------------------------------------------- */	1872	#ifndef NO_BELL
1856	void	1873	void
		1874	rxvt_term::bell_cb (time_watcher &w)
		1875	{
		1876	rvideo_bell = false;
		1877	scr_rvideo_mode (rvideo_mode);
		1878	}
		1879	#endif
		1880
		1881	/* ------------------------------------------------------------------------- */
		1882	void
1857	rxvt_term::scr_bell ()	1883	rxvt_term::scr_bell () NOTHROW
1858	{	1884	{
1859	#ifndef NO_BELL	1885	#ifndef NO_BELL
1860		1886
1861	# ifndef NO_MAPALERT	1887	# ifndef NO_MAPALERT
1862	# ifdef MAPALERT_OPTION	1888	# ifdef MAPALERT_OPTION
1863	if (OPTION (Opt_mapAlert))	1889	if (option (Opt_mapAlert))
1864	# endif	1890	# endif
1865	XMapWindow (display->display, parent[0]);	1891	XMapWindow (dpy, parent[0]);
1866	# endif	1892	# endif
		1893	# if ENABLE_FRILLS
		1894	if (option (Opt_urgentOnBell))
		1895	{
		1896	XWMHints *h;
1867		1897
1868	if (OPTION (Opt_visualBell))	1898	h = XGetWMHints(dpy, parent[0]);
		1899	if (h != NULL)
		1900	{
		1901	h->flags |= XUrgencyHint;
		1902	XSetWMHints(dpy, parent[0], h);
		1903	}
1869	{	1904	}
1870	scr_rvideo_mode (!rvideo); /* refresh also done */	1905	# endif
		1906
		1907	if (option (Opt_visualBell))
		1908	{
		1909	rvideo_bell = true;
		1910	scr_rvideo_mode (rvideo_mode);
1871	display->flush ();	1911	display->flush ();
1872	rxvt_usleep (VISUAL_BELL_DURATION);	1912
1873	scr_rvideo_mode (!rvideo); /* refresh also done */	1913	bell_ev.start (NOW + VISUAL_BELL_DURATION);
1874	}	1914	}
1875	else	1915	else
1876	XBell (display->display, 0);	1916	XBell (dpy, 0);
1877
1878	#endif	1917	#endif
1879	}	1918	}
1880		1919
1881	/* ------------------------------------------------------------------------- */	1920	/* ------------------------------------------------------------------------- */
1882	/* ARGSUSED */	1921	/* ARGSUSED */
1883	void	1922	void
1884	rxvt_term::scr_printscreen (int fullhist)	1923	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885	{	1924	{
1886	#ifdef PRINTPIPE	1925	#ifdef PRINTPIPE
1887	int nrows, row_start;	1926	int nrows, row_start;
1888	FILE *fd;	1927	FILE *fd;
1889		1928
…		…
1938	* Refresh the screen	1977	* Refresh the screen
1939	* drawn_text/drawn_rend contain the screen information before the update.	1978	* drawn_text/drawn_rend contain the screen information before the update.
1940	* screen.text/screen.rend contain what the screen will change to.	1979	* screen.text/screen.rend contain what the screen will change to.
1941	*/	1980	*/
1942	void	1981	void
1943	rxvt_term::scr_refresh ()	1982	rxvt_term::scr_refresh () NOTHROW
1944	{	1983	{
1945	unsigned char must_clear, /* use draw_string not draw_image_string */	1984	unsigned char have_bg,
1946	showcursor; /* show the cursor */	1985	showcursor; /* show the cursor */
1947	int16_t col, row, /* column/row we're processing */	1986	int16_t col, row, /* column/row we're processing */
1948	ocrow; /* old cursor row */	1987	ocrow; /* old cursor row */
1949	int i; /* tmp */	1988	int i; /* tmp */
1950	#ifndef NO_CURSORCOLOR	1989	#ifndef NO_CURSORCOLOR
1951	rend_t cc1; /* store colours at cursor position (s) */	1990	rend_t cc1; /* store colours at cursor position (s) */
1952	#endif	1991	#endif
1953	rend_t *crp; // cursor rendition pointer	1992	rend_t *crp; // cursor rendition pointer
		1993	rend_t ccol1, /* Cursor colour */
		1994	ccol2; /* Cursor colour2 */
1954		1995
1955	want_refresh = 0; /* screen is current */	1996	want_refresh = 0; /* screen is current */
1956		1997
1957	if (refresh_type == NO_REFRESH || !mapped)	1998	if (refresh_type == NO_REFRESH || !mapped)
1958	return;	1999	return;
1959		2000
1960	/*	2001	/*
1961	* A: set up vars	2002	* A: set up vars
1962	*/	2003	*/
1963	must_clear = 0;	2004	have_bg = 0;
1964	refresh_count = 0;	2005	refresh_count = 0;
1965		2006
1966	#if XPM_BACKGROUND	2007	#ifdef HAVE_BG_PIXMAP
1967	must_clear |= bgPixmap.pixmap != None;	2008	have_bg |= bgPixmap.pixmap != None;
1968	#endif	2009	#endif
1969	#if TRANSPARENT	2010	#if ENABLE_TRANSPARENCY
1970	must_clear |= OPTION (Opt_transparent) && am_transparent;	2011	have_bg |= option (Opt_transparent) && am_transparent;
1971	#endif	2012	#endif
1972	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2013	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973		2014
1974	/*	2015	/*
1975	* B: reverse any characters which are selected	2016	* B: reverse any characters which are selected
…		…
1979	/*	2020	/*
1980	* C: set the cursor character (s)	2021	* C: set the cursor character (s)
1981	*/	2022	*/
1982	{	2023	{
1983	unsigned char setoldcursor;	2024	unsigned char setoldcursor;
1984	rend_t ccol1, /* Cursor colour */
1985	ccol2; /* Cursor colour2 */
1986		2025
1987	showcursor = (screen.flags & Screen_VisibleCursor);	2026	showcursor = (screen.flags & Screen_VisibleCursor);
1988	#ifdef CURSOR_BLINK	2027	#ifdef CURSOR_BLINK
1989	if (hidden_cursor)	2028	if (hidden_cursor)
1990	showcursor = 0;	2029	showcursor = 0;
…		…
1997	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2036	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1998	col--;	2037	col--;
1999		2038
2000	crp = &ROW(screen.cur.row).r[col];	2039	crp = &ROW(screen.cur.row).r[col];
2001		2040
		2041	#ifndef NO_CURSORCOLOR
		2042	cc1 = *crp & (RS_fgMask | RS_bgMask);
		2043	if (ISSET_PIXCOLOR (Color_cursor))
		2044	ccol1 = Color_cursor;
		2045	else
		2046	#endif
		2047	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2048	ccol1 = fgcolor_of (rstyle);
		2049	#else
		2050	ccol1 = Color_fg;
		2051	#endif
		2052
		2053	#ifndef NO_CURSORCOLOR
		2054	if (ISSET_PIXCOLOR (Color_cursor2))
		2055	ccol2 = Color_cursor2;
		2056	else
		2057	#endif
		2058	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2059	ccol2 = bgcolor_of (rstyle);
		2060	#else
		2061	ccol2 = Color_bg;
		2062	#endif
		2063
2002	if (showcursor && focus)	2064	if (showcursor && focus)
2003	{	2065	{
2004	if (OPTION (Opt_cursorUnderline))	2066	if (option (Opt_cursorUnderline))
2005	*crp ^= RS_Uline;	2067	*crp ^= RS_Uline;
2006	else	2068	else
2007	{	2069	{
2008	*crp ^= RS_RVid;	2070	*crp ^= RS_RVid;
2009
2010	#ifndef NO_CURSORCOLOR
2011	cc1 = *crp & (RS_fgMask | RS_bgMask);
2012	if (ISSET_PIXCOLOR (Color_cursor))
2013	ccol1 = Color_cursor;
2014	else
2015	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2016	ccol1 = fgcolor_of (rstyle);
2017	#else
2018	ccol1 = Color_fg;
2019	#endif
2020	if (ISSET_PIXCOLOR (Color_cursor2))
2021	ccol2 = Color_cursor2;
2022	else
2023	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2024	ccol2 = bgcolor_of (rstyle);
2025	#else
2026	ccol2 = Color_bg;
2027	#endif
2028	*crp = SET_FGCOLOR (*crp, ccol1);	2071	*crp = SET_FGCOLOR (*crp, ccol1);
2029	*crp = SET_BGCOLOR (*crp, ccol2);	2072	*crp = SET_BGCOLOR (*crp, ccol2);
2030	#endif
2031	}	2073	}
2032	}	2074	}
2033	}	2075	}
2034		2076
2035	/* make sure no outline cursor is left around */	2077	/* make sure no outline cursor is left around */
…		…
2074	* D: CopyArea pass - very useful for slower links	2116	* D: CopyArea pass - very useful for slower links
2075	* This has been deliberately kept simple.	2117	* This has been deliberately kept simple.
2076	*/	2118	*/
2077	if (!display->is_local	2119	if (!display->is_local
2078	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2120	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079	&& abs (num_scr) < nrow && !must_clear)	2121	&& abs (num_scr) < nrow && !have_bg)
2080	{	2122	{
2081	int16_t nits;	2123	int16_t nits;
		2124	int i = num_scr;
2082	int j;	2125	int j;
2083	int len, wlen;	2126	int len, wlen;
2084	dLocal (int, num_scr);	2127	dLocal (int, num_scr);
2085		2128
2086	j = nrow;	2129	j = nrow;
2087	wlen = len = -1;	2130	wlen = len = -1;
2088	row = i > 0 ? 0 : j - 1;	2131	row = i > 0 ? 0 : j - 1;
		2132
2089	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2133	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2090	{	2134	{
2091	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2135	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2092	{	2136	{
2093	line_t s = ROW(view_start + row);	2137	line_t s = ROW(view_start + row);
…		…
2114	wlen = row;	2158	wlen = row;
2115	continue;	2159	continue;
2116	}	2160	}
2117	}	2161	}
2118		2162
2119	if (len != -1)	2163	if (len >= 0)
2120	{	2164	{
2121	/* also comes here at end if needed because of >= above */	2165	/* also comes here at end if needed because of >= above */
2122	if (wlen < len)	2166	if (wlen < len)
2123	::swap (wlen, len);	2167	::swap (wlen, len);
2124		2168
		2169	XGCValues gcv;
		2170
		2171	gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2125	XCopyArea (display->display, vt, vt,	2172	XCopyArea (dpy, vt, vt,
2126	gc, 0, Row2Pixel (len + i),	2173	gc, 0, Row2Pixel (len + i),
2127	(unsigned int)this->width,	2174	(unsigned int)this->width,
2128	(unsigned int)Height2Pixel (wlen - len + 1),	2175	(unsigned int)Height2Pixel (wlen - len + 1),
2129	0, Row2Pixel (len));	2176	0, Row2Pixel (len));
		2177	gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
		2178
2130	len = -1;	2179	len = -1;
2131	}	2180	}
2132	}	2181	}
2133	}	2182	}
2134	#endif	2183	#endif
…		…
2190	count++;	2239	count++;
2191		2240
2192	if (stp[col] != dtp[col]	2241	if (stp[col] != dtp[col]
2193	|| !RS_SAME (srp[col], drp[col]))	2242	|| !RS_SAME (srp[col], drp[col]))
2194	{	2243	{
2195	if (must_clear && (i++ > count / 2))	2244	if (have_bg && (i++ > count / 2))
2196	break;	2245	break;
2197		2246
2198	dtp[col] = stp[col];	2247	dtp[col] = stp[col];
2199	drp[col] = rend;	2248	drp[col] = rend;
2200	i = 0;	2249	i = 0;
2201	}	2250	}
2202	else if (must_clear || (stp[col] != ' ' && ++i >= 16))	2251	else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2203	break;	2252	break;
2204	}	2253	}
2205		2254
2206	col--; /* went one too far. move back */	2255	col--; /* went one too far. move back */
2207	count -= i; /* dump any matching trailing chars */	2256	count -= i; /* dump any matching trailing chars */
…		…
2217	int back = bgcolor_of (rend); // desired background	2266	int back = bgcolor_of (rend); // desired background
2218		2267
2219	// only do special processing if any attributes are set, which is unlikely	2268	// only do special processing if any attributes are set, which is unlikely
2220	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2269	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2221	{	2270	{
2222	#if ENABLE_STYLES
2223	// force redraw after "careful" characters to avoid pixel droppings
2224	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2225	drp[col + 1] = ~srp[col + 1];
2226
2227	// include previous careful character(s) if possible, looks nicer (best effort...)
2228	while (text > stp
2229	&& srp[text - stp - 1] & RS_Careful
2230	&& RS_SAME (rend, srp[text - stp - 1]))
2231	text--, count++, xpixel -= fwidth;
2232	#endif
2233
2234	bool invert = rend & RS_RVid;	2271	bool invert = rend & RS_RVid;
2235		2272
2236	#ifndef NO_BOLD_UNDERLINE_REVERSE	2273	#ifndef NO_BOLD_UNDERLINE_REVERSE
2237	if (rend & RS_Bold	2274	if (rend & RS_Bold
2238	&& fore == Color_fg)	2275	&& fore == Color_fg)
…		…
2254	else	2291	else
2255	invert = !invert;	2292	invert = !invert;
2256	# endif	2293	# endif
2257	}	2294	}
2258		2295
2259	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))	2296	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2260	fore = Color_UL;	2297	fore = Color_UL;
2261	#endif	2298	#endif
2262		2299
2263	if (invert)	2300	if (invert)
2264	{	2301	{
		2302	#ifdef OPTION_HC
		2303	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2304	|| !ISSET_PIXCOLOR (Color_HC))
		2305	#endif
		2306	/* invert the column if no highlightColor is set or it is the
		2307	* current cursor column */
2265	::swap (fore, back);	2308	::swap (fore, back);
		2309	#ifdef OPTION_HC
		2310	else if (ISSET_PIXCOLOR (Color_HC))
		2311	back = Color_HC;
		2312	#endif
2266		2313
2267	#ifndef NO_BOLD_UNDERLINE_REVERSE	2314	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2315	# ifndef OPTION_HC
2268	if (ISSET_PIXCOLOR (Color_RV))	2316	if (ISSET_PIXCOLOR (Color_RV))
2269	back = Color_RV;	2317	back = Color_RV;
2270		2318	# endif
2271	if (fore == back)	2319	if (fore == back)
2272	{	2320	{
2273	fore = Color_bg;	2321	fore = Color_bg;
2274	back = Color_fg;	2322	back = Color_fg;
2275	}	2323	}
…		…
2286	}	2334	}
2287	else if (hidden_text)	2335	else if (hidden_text)
2288	fore = back;	2336	fore = back;
2289	}	2337	}
2290	#endif	2338	#endif
		2339
		2340	#if ENABLE_STYLES
		2341	// "careful" (too wide) character handling
		2342
		2343	// include previous careful character(s) if possible, looks nicer (best effort...)
		2344	while (text > stp
		2345	&& srp[text - stp - 1] & RS_Careful
		2346	&& RS_SAME (rend, srp[text - stp - 1]))
		2347	text--, count++, xpixel -= fwidth;
		2348
		2349	// force redraw after "careful" characters to avoid pixel droppings
		2350	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2351	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2352
		2353	// force redraw before "careful" characters to avoid pixel droppings
		2354	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2355	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
		2356	#endif
2291	}	2357	}
2292		2358
2293	/*	2359	/*
2294	* Actually do the drawing of the string here	2360	* Actually do the drawing of the string here
2295	*/	2361	*/
2296	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2362	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2297		2363
2298	if (back == fore)
2299	font->clear_rect (*drawable, xpixel, ypixel,
2300	fwidth * count, fheight,
2301	back);
2302	else if (back == Color_bg)	2364	if (have_bg && back == Color_bg)
2303	{	2365	{
2304	if (must_clear)	2366	// this is very ugly, maybe push it into ->draw?
2305	{
2306	CLEAR_CHARS (xpixel, ypixel, count);
2307		2367
2308	for (i = 0; i < count; i++) /* don't draw empty strings */	2368	for (i = 0; i < count; i++) /* don't draw empty strings */
2309	if (text[i] != ' ')	2369	if (text[i] != ' ')
2310	{	2370	{
2311	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2371	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2312	break;	2372	goto did_clear;
2313	}
2314	}	2373	}
2315	else	2374
2316	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);	2375	CLEAR_CHARS (xpixel, ypixel, count);
		2376	did_clear: ;
2317	}	2377	}
2318	else	2378	else
2319	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2379	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2320		2380
2321	if (rend & RS_Uline && font->descent > 1 && fore != back)	2381	if (rend & RS_Uline && font->descent > 1 && fore != back)
2322	{	2382	{
2323	#if ENABLE_FRILLS	2383	#if ENABLE_FRILLS
2324	if (ISSET_PIXCOLOR (Color_underline))	2384	if (ISSET_PIXCOLOR (Color_underline))
2325	XSetForeground (display->display, gc, pix_colors[Color_underline]);	2385	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2326	else	2386	else
2327	#endif	2387	#endif
2328	XSetForeground (display->display, gc, pix_colors[fore]);	2388	XSetForeground (dpy, gc, pix_colors[fore]);
2329		2389
2330	XDrawLine (display->display, drawBuffer, gc,	2390	XDrawLine (dpy, drawBuffer, gc,
2331	xpixel, ypixel + font->ascent + 1,	2391	xpixel, ypixel + font->ascent + 1,
2332	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2392	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2333	}	2393	}
2334	} /* for (col....) */	2394	} /* for (col....) */
2335	} /* for (row....) */	2395	} /* for (row....) */
…		…
2344	*/	2404	*/
2345	if (showcursor)	2405	if (showcursor)
2346	{	2406	{
2347	if (focus)	2407	if (focus)
2348	{	2408	{
2349	if (OPTION (Opt_cursorUnderline))	2409	if (option (Opt_cursorUnderline))
2350	*crp ^= RS_Uline;	2410	*crp ^= RS_Uline;
2351	else	2411	else
2352	{	2412	{
2353	*crp ^= RS_RVid;	2413	*crp ^= RS_RVid;
2354	#ifndef NO_CURSORCOLOR	2414	#ifndef NO_CURSORCOLOR
…		…
2368	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2428	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2369	cursorwidth++;	2429	cursorwidth++;
2370		2430
2371	#ifndef NO_CURSORCOLOR	2431	#ifndef NO_CURSORCOLOR
2372	if (ISSET_PIXCOLOR (Color_cursor))	2432	if (ISSET_PIXCOLOR (Color_cursor))
2373	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2433	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
		2434	else
2374	#endif	2435	#endif
		2436	XSetForeground (dpy, gc, pix_colors[ccol1]);
2375		2437
2376	XDrawRectangle (display->display, drawBuffer, gc,	2438	XDrawRectangle (dpy, drawBuffer, gc,
2377	Col2Pixel (col),	2439	Col2Pixel (col),
2378	Row2Pixel (oldcursor.row),	2440	Row2Pixel (oldcursor.row),
2379	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2441	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2380	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2442	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2381	}	2443	}
…		…
2389	num_scr = 0;	2451	num_scr = 0;
2390	num_scr_allow = 1;	2452	num_scr_allow = 1;
2391	}	2453	}
2392		2454
2393	void	2455	void
2394	rxvt_term::scr_remap_chars (line_t &l)	2456	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395	{	2457	{
2396	if (!l.t)	2458	if (!l.t)
2397	return;	2459	return;
2398		2460
2399	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2461	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
…		…
2401	for (int i = ncol; i--; )	2463	for (int i = ncol; i--; )
2402	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2464	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403	}	2465	}
2404		2466
2405	void	2467	void
2406	rxvt_term::scr_remap_chars ()	2468	rxvt_term::scr_remap_chars () NOTHROW
2407	{	2469	{
2408	for (int i = total_rows; i--; )	2470	for (int i = total_rows; i--; )
2409	scr_remap_chars (row_buf [i]);	2471	scr_remap_chars (row_buf [i]);
2410		2472
2411	for (int i = nrow; i--; )	2473	for (int i = nrow; i--; )
…		…
2414	scr_remap_chars (swap_buf [i]);	2476	scr_remap_chars (swap_buf [i]);
2415	}	2477	}
2416	}	2478	}
2417		2479
2418	void	2480	void
2419	rxvt_term::scr_recolour ()	2481	rxvt_term::scr_recolour () NOTHROW
2420	{	2482	{
2421	if (1	2483	if (1
2422	#if TRANSPARENT	2484	#if ENABLE_TRANSPARENCY
2423	&& !am_transparent	2485	&& !am_transparent
2424	#endif	2486	#endif
2425	#if XPM_BACKGROUND	2487	#ifdef HAVE_BG_PIXMAP
2426	&& !bgPixmap.pixmap	2488	&& !bgPixmap.pixmap
2427	#endif	2489	#endif
2428	)	2490	)
2429	{	2491	{
2430	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);	2492	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2431	XClearWindow (display->display, parent[0]);	2493	XClearWindow (dpy, parent[0]);
2432	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);	2494	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2433	#if HAVE_SCROLLBARS	2495	#if HAVE_SCROLLBARS
2434	if (scrollBar.win)	2496	if (scrollBar.win)
2435	{	2497	{
2436	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2498	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2437	scrollBar.setIdle ();	2499	scrollBar.setIdle ();
2438	scrollbar_show (0);	2500	scrollbar_show (0);
2439	}	2501	}
2440	#endif	2502	#endif
2441	}	2503	}
…		…
2445	want_refresh = 1;	2507	want_refresh = 1;
2446	}	2508	}
2447		2509
2448	/* ------------------------------------------------------------------------- */	2510	/* ------------------------------------------------------------------------- */
2449	void	2511	void
2450	rxvt_term::scr_clear (bool really)	2512	rxvt_term::scr_clear (bool really) NOTHROW
2451	{	2513	{
2452	if (!mapped)	2514	if (!mapped)
2453	return;	2515	return;
2454		2516
2455	num_scr_allow = 0;	2517	num_scr_allow = 0;
2456	want_refresh = 1;	2518	want_refresh = 1;
2457		2519
2458	if (really)	2520	if (really)
2459	XClearWindow (display->display, vt);	2521	XClearWindow (dpy, vt);
2460	}	2522	}
2461		2523
2462	void	2524	void
2463	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)	2525	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464	{	2526	{
2465	int view_end = view_start + nrow;	2527	int view_end = view_start + nrow;
2466	int row, col;	2528	int row, col;
2467		2529
2468	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)	2530	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
…		…
2480	srp[col] ^= rstyle2;	2542	srp[col] ^= rstyle2;
2481	}	2543	}
2482	}	2544	}
2483		2545
2484	void	2546	void
2485	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)	2547	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486	{	2548	{
2487	int view_end = view_start + nrow;	2549	int view_end = view_start + nrow;
2488	int row, col;	2550	int row, col;
2489		2551
2490	if (beg_row >= view_start)	2552	if (beg_row >= view_start)
…		…
2507	srp[col] ^= rstyle;	2569	srp[col] ^= rstyle;
2508	}	2570	}
2509		2571
2510	/* ------------------------------------------------------------------------- */	2572	/* ------------------------------------------------------------------------- */
2511	void	2573	void
2512	rxvt_term::scr_reverse_selection ()	2574	rxvt_term::scr_reverse_selection () NOTHROW
2513	{	2575	{
2514	if (selection.op	2576	if (selection.op
2515	&& current_screen == selection.screen	2577	&& current_screen == selection.screen
2516	&& selection.end.row >= view_start)	2578	&& selection.end.row >= view_start)
2517	{	2579	{
2518	#if ENABLE_FRILLS	2580	#if !ENABLE_MINIMAL
2519	if (selection.rect)	2581	if (selection.rect)
2520	scr_xor_rect (selection.beg.row, selection.beg.col,	2582	scr_xor_rect (selection.beg.row, selection.beg.col,
2521	selection.end.row, selection.end.col,	2583	selection.end.row, selection.end.col,
2522	RS_RVid, RS_RVid | RS_Uline);	2584	RS_RVid, RS_RVid | RS_Uline);
2523	else	2585	else
…		…
2533	* Dump the whole scrollback and screen to the passed filedescriptor. The	2595	* Dump the whole scrollback and screen to the passed filedescriptor. The
2534	* invoking routine must close the fd.	2596	* invoking routine must close the fd.
2535	*/	2597	*/
2536	#if 0	2598	#if 0
2537	void	2599	void
2538	rxvt_term::scr_dump (int fd)	2600	rxvt_term::scr_dump (int fd) NOTHROW
2539	{	2601	{
2540	int row, wrote;	2602	int row, wrote;
2541	unsigned int width, towrite;	2603	unsigned int width, towrite;
2542	char r1[] = "\n";	2604	char r1[] = "\n";
2543		2605
…		…
2562		2624
2563	/* ------------------------------------------------------------------------- *	2625	/* ------------------------------------------------------------------------- *
2564	* CHARACTER SELECTION *	2626	* CHARACTER SELECTION *
2565	* ------------------------------------------------------------------------- */	2627	* ------------------------------------------------------------------------- */
2566	void	2628	void
2567	rxvt_term::selection_check (int check_more)	2629	rxvt_term::selection_check (int check_more) NOTHROW
2568	{	2630	{
2569	row_col_t pos;	2631	row_col_t pos;
2570		2632
2571	if (!selection.op)	2633	if (!selection.op)
2572	return;	2634	return;
…		…
2593	/* ------------------------------------------------------------------------- */	2655	/* ------------------------------------------------------------------------- */
2594	/*	2656	/*
2595	* Paste a selection direct to the command fd	2657	* Paste a selection direct to the command fd
2596	*/	2658	*/
2597	void	2659	void
2598	rxvt_term::paste (char *data, unsigned int len)	2660	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2599	{	2661	{
2600	/* convert normal newline chars into common keyboard Return key sequence */	2662	/* convert normal newline chars into common keyboard Return key sequence */
2601	for (unsigned int i = 0; i < len; i++)	2663	for (unsigned int i = 0; i < len; i++)
2602	if (data[i] == C0_LF)	2664	if (data[i] == C0_LF)
2603	data[i] = C0_CR;	2665	data[i] = C0_CR;
…		…
2609	/*	2671	/*
2610	* Respond to a notification that a primary selection has been sent	2672	* Respond to a notification that a primary selection has been sent
2611	* EXT: SelectionNotify	2673	* EXT: SelectionNotify
2612	*/	2674	*/
2613	void	2675	void
2614	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2676	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2615	{	2677	{
2616	if (prop == None) /* check for failed XConvertSelection */	2678	if (prop == None) /* check for failed XConvertSelection */
2617	{	2679	{
2618	if ((selection_type & Sel_CompoundText))	2680	if ((selection_type & Sel_CompoundText))
2619	{	2681	{
…		…
2639	}	2701	}
2640		2702
2641	unsigned long bytes_after;	2703	unsigned long bytes_after;
2642	XTextProperty ct;	2704	XTextProperty ct;
2643		2705
2644	if (XGetWindowProperty (display->display, win, prop,	2706	if (XGetWindowProperty (dpy, win, prop,
2645	0, PROP_SIZE / 4,	2707	0, PROP_SIZE / 4,
2646	delete_prop, AnyPropertyType,	2708	delete_prop, AnyPropertyType,
2647	&ct.encoding, &ct.format,	2709	&ct.encoding, &ct.format,
2648	&ct.nitems, &bytes_after,	2710	&ct.nitems, &bytes_after,
2649	&ct.value) != Success)	2711	&ct.value) != Success)
…		…
2658	if (bytes_after)	2720	if (bytes_after)
2659	{	2721	{
2660	// fetch and append remaining data	2722	// fetch and append remaining data
2661	XTextProperty ct2;	2723	XTextProperty ct2;
2662		2724
2663	if (XGetWindowProperty (display->display, win, prop,	2725	if (XGetWindowProperty (dpy, win, prop,
2664	ct.nitems / 4, (bytes_after + 3) / 4,	2726	ct.nitems / 4, (bytes_after + 3) / 4,
2665	delete_prop, AnyPropertyType,	2727	delete_prop, AnyPropertyType,
2666	&ct2.encoding, &ct2.format,	2728	&ct2.encoding, &ct2.format,
2667	&ct2.nitems, &bytes_after,	2729	&ct2.nitems, &bytes_after,
2668	&ct2.value) != Success)	2730	&ct2.value) != Success)
…		…
2681		2743
2682	if (ct.encoding == xa[XA_INCR])	2744	if (ct.encoding == xa[XA_INCR])
2683	{	2745	{
2684	// INCR selection, start handshake	2746	// INCR selection, start handshake
2685	if (!delete_prop)	2747	if (!delete_prop)
2686	XDeleteProperty (display->display, win, prop);	2748	XDeleteProperty (dpy, win, prop);
2687		2749
2688	selection_wait = Sel_incr;	2750	selection_wait = Sel_incr;
2689	incr_buf_fill = 0;	2751	incr_buf_fill = 0;
2690	incr_ev.start (NOW + 10);	2752	incr_ev.start (NOW + 10);
2691		2753
…		…
2738	}	2800	}
2739		2801
2740	char **cl;	2802	char **cl;
2741	int cr;	2803	int cr;
2742		2804
2743	#if ENABLE_FRILLS	2805	#if !ENABLE_MINIMAL
2744	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	2806	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2745	// so recode it manually	2807	// so recode it manually
2746	if (ct.encoding == xa[XA_UTF8_STRING])	2808	if (ct.encoding == xa[XA_UTF8_STRING])
2747	{	2809	{
2748	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2810	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
…		…
2752	paste (s, strlen (s));	2814	paste (s, strlen (s));
2753	free (s);	2815	free (s);
2754	}	2816	}
2755	else	2817	else
2756	#endif	2818	#endif
2757	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2819	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2758	&& cl)	2820	&& cl)
2759	{	2821	{
2760	for (int i = 0; i < cr; i++)	2822	for (int i = 0; i < cr; i++)
2761	paste (cl[i], strlen (cl[i]));	2823	paste (cl[i], strlen (cl[i]));
2762		2824
…		…
2771	if (selection_wait == Sel_normal)	2833	if (selection_wait == Sel_normal)
2772	selection_wait = Sel_none;	2834	selection_wait = Sel_none;
2773	}	2835	}
2774		2836
2775	void	2837	void
2776	rxvt_term::incr_cb (time_watcher &w)	2838	rxvt_term::incr_cb (time_watcher &w) NOTHROW
2777	{	2839	{
2778	selection_wait = Sel_none;	2840	selection_wait = Sel_none;
2779		2841
2780	incr_buf_size = 0;	2842	incr_buf_size = 0;
2781	free (incr_buf);	2843	free (incr_buf);
2782		2844
2783	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2845	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2784	}	2846	}
2785		2847
2786	void	2848	void
2787	rxvt_term::selection_property (Window win, Atom prop)	2849	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2788	{	2850	{
2789	if (prop == None || selection_wait != Sel_incr)	2851	if (prop == None || selection_wait != Sel_incr)
2790	return;	2852	return;
2791		2853
2792	selection_paste (win, prop, true);	2854	selection_paste (win, prop, true);
…		…
2801	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2863	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802	* will auto fallback to CUT_BUFFER0	2864	* will auto fallback to CUT_BUFFER0
2803	* EXT: button 2 release	2865	* EXT: button 2 release
2804	*/	2866	*/
2805	void	2867	void
2806	rxvt_term::selection_request (Time tm)	2868	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807	{	2869	{
2808	if (selection.text)	2870	if (selection.text && selnum == Sel_Primary)
2809	{ /* internal selection */	2871	{ /* internal selection */
2810	char *str = rxvt_wcstombs (selection.text, selection.len);	2872	char *str = rxvt_wcstombs (selection.text, selection.len);
2811	paste (str, strlen (str));	2873	paste (str, strlen (str));
2812	free (str);	2874	free (str);
2813	return;	2875	return;
2814	}	2876	}
2815	else	2877	else
2816	{	2878	{
2817	int i;
2818
2819	selection_request_time = tm;	2879	selection_request_time = tm;
2820	selection_wait = Sel_normal;	2880	selection_wait = Sel_normal;
2821		2881
2822	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823	{
2824	#if X_HAVE_UTF8_STRING	2882	#if X_HAVE_UTF8_STRING
2825	selection_type = Sel_UTF8String;	2883	selection_type = Sel_UTF8String;
2826	if (selection_request_other (xa[XA_UTF8_STRING], i))	2884	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827	return;	2885	return;
2828	#else	2886	#else
2829	selection_type = Sel_CompoundText;	2887	selection_type = Sel_CompoundText;
2830	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2888	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831	return;	2889	return;
2832	#endif	2890	#endif
2833	}
2834	}	2891	}
2835		2892
2836	selection_wait = Sel_none; /* don't loop in selection_paste () */	2893	selection_wait = Sel_none; /* don't loop in selection_paste () */
2837	selection_paste (display->root, XA_CUT_BUFFER0, false);	2894	selection_paste (display->root, XA_CUT_BUFFER0, false);
2838	}	2895	}
2839		2896
2840	int	2897	int
2841	rxvt_term::selection_request_other (Atom target, int selnum)	2898	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842	{	2899	{
2843	Atom sel;	2900	Atom sel;
2844		2901
2845	selection_type |= selnum;	2902	selection_type |= selnum;
2846		2903
…		…
2849	else if (selnum == Sel_Secondary)	2906	else if (selnum == Sel_Secondary)
2850	sel = XA_SECONDARY;	2907	sel = XA_SECONDARY;
2851	else	2908	else
2852	sel = xa[XA_CLIPBOARD];	2909	sel = xa[XA_CLIPBOARD];
2853		2910
2854	if (XGetSelectionOwner (display->display, sel) != None)	2911	if (XGetSelectionOwner (dpy, sel) != None)
2855	{	2912	{
2856	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2913	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857	vt, selection_request_time);	2914	vt, selection_request_time);
2858	return 1;	2915	return 1;
2859	}	2916	}
2860		2917
2861	return 0;	2918	return 0;
…		…
2865	/*	2922	/*
2866	* Clear all selected text	2923	* Clear all selected text
2867	* EXT: SelectionClear	2924	* EXT: SelectionClear
2868	*/	2925	*/
2869	void	2926	void
2870	rxvt_term::selection_clear ()	2927	rxvt_term::selection_clear () NOTHROW
2871	{	2928	{
2872	want_refresh = 1;	2929	want_refresh = 1;
2873	free (selection.text);	2930	free (selection.text);
2874	selection.text = NULL;	2931	selection.text = NULL;
2875	selection.len = 0;	2932	selection.len = 0;
…		…
2924		2981
2925	int end_col;	2982	int end_col;
2926		2983
2927	for (; row <= selection.end.row; row++, col = 0)	2984	for (; row <= selection.end.row; row++, col = 0)
2928	{	2985	{
2929	#if ENABLE_FRILLS	2986	#if !ENABLE_MINIMAL
2930	if (selection.rect)	2987	if (selection.rect)
2931	{	2988	{
2932	col = selection.beg.col;	2989	col = selection.beg.col;
2933	end_col = ncol + 1;	2990	end_col = ncol + 1;
2934	}	2991	}
…		…
2937	end_col = ROW(row).l;	2994	end_col = ROW(row).l;
2938		2995
2939	col = max (col, 0);	2996	col = max (col, 0);
2940		2997
2941	if (row == selection.end.row	2998	if (row == selection.end.row
2942	#if ENABLE_FRILLS	2999	#if !ENABLE_MINIMAL
2943	|| selection.rect	3000	|| selection.rect
2944	#endif	3001	#endif
2945	)	3002	)
2946	min_it (end_col, selection.end.col);	3003	min_it (end_col, selection.end.col);
2947		3004
…		…
2970	#endif	3027	#endif
2971	else	3028	else
2972	new_selection_text[ofs++] = *t++;	3029	new_selection_text[ofs++] = *t++;
2973	}	3030	}
2974		3031
2975	#if ENABLE_FRILLS	3032	#if !ENABLE_MINIMAL
2976	if (selection.rect)	3033	if (selection.rect)
2977	{	3034	{
2978	while (ofs	3035	while (ofs
2979	&& new_selection_text[ofs - 1] != C0_LF	3036	&& new_selection_text[ofs - 1] != C0_LF
2980	&& unicode::is_space (new_selection_text[ofs - 1]))	3037	&& unicode::is_space (new_selection_text[ofs - 1]))
…		…
3010		3067
3011	selection_grab (tm);	3068	selection_grab (tm);
3012	}	3069	}
3013		3070
3014	bool	3071	bool
3015	rxvt_term::selection_grab (Time tm)	3072	rxvt_term::selection_grab (Time tm) NOTHROW
3016	{	3073	{
3017	selection_time = tm;	3074	selection_time = tm;
3018		3075
3019	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3076	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3077	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021	{	3078	{
3022	display->set_selection_owner (this);	3079	display->set_selection_owner (this);
3023	return true;	3080	return true;
3024	}	3081	}
3025	else	3082	else
…		…
3029	}	3086	}
3030		3087
3031	#if 0	3088	#if 0
3032	XTextProperty ct;	3089	XTextProperty ct;
3033		3090
3034	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3091	if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035	{	3092	{
3036	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3093	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037	XFree (ct.value);	3094	XFree (ct.value);
3038	}	3095	}
3039	#endif	3096	#endif
…		…
3043	/*	3100	/*
3044	* Mark or select text based upon number of clicks: 1, 2, or 3	3101	* Mark or select text based upon number of clicks: 1, 2, or 3
3045	* EXT: button 1 press	3102	* EXT: button 1 press
3046	*/	3103	*/
3047	void	3104	void
3048	rxvt_term::selection_click (int clicks, int x, int y)	3105	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049	{	3106	{
3050	clicks = ((clicks - 1) % 3) + 1;	3107	clicks = ((clicks - 1) % 3) + 1;
3051	selection.clicks = clicks; /* save clicks so extend will work */	3108	selection.clicks = clicks; /* save clicks so extend will work */
3052		3109
3053	if (clicks == 2 && !selection.rect	3110	if (clicks == 2 && !selection.rect
…		…
3072	/* ------------------------------------------------------------------------- */	3129	/* ------------------------------------------------------------------------- */
3073	/*	3130	/*
3074	* Mark a selection at the specified col/row	3131	* Mark a selection at the specified col/row
3075	*/	3132	*/
3076	void	3133	void
3077	rxvt_term::selection_start_colrow (int col, int row)	3134	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078	{	3135	{
3079	want_refresh = 1;	3136	want_refresh = 1;
3080		3137
3081	selection.mark.row = row + view_start;	3138	selection.mark.row = row + view_start;
3082	selection.mark.col = col;	3139	selection.mark.col = col;
…		…
3108	#define DELIMIT_TEXT(x) \	3165	#define DELIMIT_TEXT(x) \
3109	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3166	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110	#define DELIMIT_REND(x) 1	3167	#define DELIMIT_REND(x) 1
3111		3168
3112	void	3169	void
3113	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3170	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114	{	3171	{
3115	int col, row, dirnadd, tcol, trow, w1, w2;	3172	int col, row, dirnadd, tcol, trow, w1, w2;
3116	row_col_t bound;	3173	row_col_t bound;
3117	text_t *stp;	3174	text_t *stp;
3118	rend_t *srp;	3175	rend_t *srp;
…		…
3192	* flag == 0 ==> button 1	3249	* flag == 0 ==> button 1
3193	* flag == 1 ==> button 3 press	3250	* flag == 1 ==> button 3 press
3194	* flag == 2 ==> button 3 motion	3251	* flag == 2 ==> button 3 motion
3195	*/	3252	*/
3196	void	3253	void
3197	rxvt_term::selection_extend (int x, int y, int flag)	3254	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198	{	3255	{
3199	int col = clamp (Pixel2Col (x), 0, ncol);	3256	int col = clamp (Pixel2Col (x), 0, ncol);
3200	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3257	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201		3258
3202	/*	3259	/*
…		…
3228	/* ------------------------------------------------------------------------- */	3285	/* ------------------------------------------------------------------------- */
3229	/*	3286	/*
3230	* Extend the selection to the specified col/row	3287	* Extend the selection to the specified col/row
3231	*/	3288	*/
3232	void	3289	void
3233	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3290	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234	{	3291	{
3235	row_col_t pos;	3292	row_col_t pos;
3236	enum {	3293	enum {
3237	LEFT, RIGHT	3294	LEFT, RIGHT
3238	} closeto = RIGHT;	3295	} closeto = RIGHT;
…		…
3341		3398
3342	if (selection.clicks == 1)	3399	if (selection.clicks == 1)
3343	{	3400	{
3344	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN	3401	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345	&& !ROW(selection.beg.row).is_longer ()	3402	&& !ROW(selection.beg.row).is_longer ()
3346	#if ENABLE_FRILLS	3403	#if !ENABLE_MINIMAL
3347	&& !selection.rect	3404	&& !selection.rect
3348	#endif	3405	#endif
3349	)	3406	)
3350	selection.beg.col = ncol;	3407	selection.beg.col = ncol;
3351		3408
3352	if (	3409	if (
3353	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN	3410	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354	&& !ROW(selection.end.row).is_longer ()	3411	&& !ROW(selection.end.row).is_longer ()
3355	#if ENABLE_FRILLS	3412	#if !ENABLE_MINIMAL
3356	&& !selection.rect	3413	&& !selection.rect
3357	#endif	3414	#endif
3358	)	3415	)
3359	selection.end.col = ncol;	3416	selection.end.col = ncol;
3360	}	3417	}
…		…
3367	selection_delimit_word (DN, &selection.end, &selection.end);	3424	selection_delimit_word (DN, &selection.end, &selection.end);
3368	}	3425	}
3369	else if (selection.clicks == 3)	3426	else if (selection.clicks == 3)
3370	{	3427	{
3371	#if ENABLE_FRILLS	3428	#if ENABLE_FRILLS
3372	if (OPTION (Opt_tripleclickwords))	3429	if (option (Opt_tripleclickwords))
3373	{	3430	{
3374	selection_delimit_word (UP, &selection.beg, &selection.beg);	3431	selection_delimit_word (UP, &selection.beg, &selection.beg);
3375		3432
3376	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3433	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377	{	3434	{
3378	if (!ROW(end_row).is_longer ())	3435	if (!ROW(end_row).is_longer ())
3379	{	3436	{
3380	selection.end.row = end_row;	3437	selection.end.row = end_row;
3381	selection.end.col = ROW(end_row).l;	3438	selection.end.col = ROW(end_row).l;
		3439	# if !ENABLE_MINIMAL
3382	selection_remove_trailing_spaces ();	3440	selection_remove_trailing_spaces ();
		3441	# endif
3383	break;	3442	break;
3384	}	3443	}
3385	}	3444	}
3386	}	3445	}
3387	else	3446	else
…		…
3416	selection.mark.row = selection.beg.row;	3475	selection.mark.row = selection.beg.row;
3417	selection.mark.col = selection.beg.col;	3476	selection.mark.col = selection.beg.col;
3418	}	3477	}
3419	}	3478	}
3420		3479
3421	#if ENABLE_FRILLS	3480	#if !ENABLE_MINIMAL
3422	if (selection.rect && selection.beg.col > selection.end.col)	3481	if (selection.rect && selection.beg.col > selection.end.col)
3423	::swap (selection.beg.col, selection.end.col);	3482	::swap (selection.beg.col, selection.end.col);
3424	#endif	3483	#endif
3425	}	3484	}
3426		3485
3427	#if ENABLE_FRILLS	3486	#if !ENABLE_MINIMAL
3428	void	3487	void
3429	rxvt_term::selection_remove_trailing_spaces ()	3488	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430	{	3489	{
3431	int32_t end_col, end_row;	3490	int32_t end_col, end_row;
3432	text_t *stp;	3491	text_t *stp;
3433		3492
3434	end_col = selection.end.col;	3493	end_col = selection.end.col;
…		…
3472	/*	3531	/*
3473	* Double click on button 3 when already selected	3532	* Double click on button 3 when already selected
3474	* EXT: button 3 double click	3533	* EXT: button 3 double click
3475	*/	3534	*/
3476	void	3535	void
3477	rxvt_term::selection_rotate (int x, int y)	3536	rxvt_term::selection_rotate (int x, int y) NOTHROW
3478	{	3537	{
3479	selection.clicks = selection.clicks % 3 + 1;	3538	selection.clicks = selection.clicks % 3 + 1;
3480	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3539	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481	}	3540	}
3482		3541
…		…
3484	/*	3543	/*
3485	* Respond to a request for our current selection	3544	* Respond to a request for our current selection
3486	* EXT: SelectionRequest	3545	* EXT: SelectionRequest
3487	*/	3546	*/
3488	void	3547	void
3489	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3548	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490	{	3549	{
3491	XSelectionEvent ev;	3550	XSelectionEvent ev;
3492	dDisp;
3493		3551
3494	ev.type = SelectionNotify;	3552	ev.type = SelectionNotify;
3495	ev.property = None;	3553	ev.property = None;
3496	ev.display = rq.display;	3554	ev.display = rq.display;
3497	ev.requestor = rq.requestor;	3555	ev.requestor = rq.requestor;
…		…
3511	*target++ = xa[XA_COMPOUND_TEXT];	3569	*target++ = xa[XA_COMPOUND_TEXT];
3512	#if X_HAVE_UTF8_STRING	3570	#if X_HAVE_UTF8_STRING
3513	*target++ = xa[XA_UTF8_STRING];	3571	*target++ = xa[XA_UTF8_STRING];
3514	#endif	3572	#endif
3515		3573
3516	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,	3574	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3517	32, PropModeReplace,	3575	32, PropModeReplace,
3518	(unsigned char *)target_list, target - target_list);	3576	(unsigned char *)target_list, target - target_list);
3519	ev.property = rq.property;	3577	ev.property = rq.property;
3520	}	3578	}
3521	#if TODO // TODO	3579	#if TODO // TODO
…		…
3524	/* TODO: Handle MULTIPLE */	3582	/* TODO: Handle MULTIPLE */
3525	}	3583	}
3526	#endif	3584	#endif
3527	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3585	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3528	{	3586	{
3529	XChangeProperty (disp, rq.requestor, rq.property, rq.target,	3587	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3530	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3588	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3531	ev.property = rq.property;	3589	ev.property = rq.property;
3532	}	3590	}
3533	else if (rq.target == XA_STRING	3591	else if (rq.target == XA_STRING
3534	|| rq.target == xa[XA_TEXT]	3592	|| rq.target == xa[XA_TEXT]
…		…
3558	style = enc_string;	3616	style = enc_string;
3559	else if (target == xa[XA_TEXT])	3617	else if (target == xa[XA_TEXT])
3560	style = enc_text;	3618	style = enc_text;
3561	else if (target == xa[XA_COMPOUND_TEXT])	3619	else if (target == xa[XA_COMPOUND_TEXT])
3562	style = enc_compound_text;	3620	style = enc_compound_text;
3563	#if ENABLE_FRILLS	3621	#if !ENABLE_MINIMAL
3564	else if (target == xa[XA_UTF8_STRING])	3622	else if (target == xa[XA_UTF8_STRING])
3565	style = enc_utf8;	3623	style = enc_utf8;
3566	#endif	3624	#endif
3567	else	3625	else
3568	{	3626	{
…		…
3579	{	3637	{
3580	cl = L"";	3638	cl = L"";
3581	selectlen = 0;	3639	selectlen = 0;
3582	}	3640	}
3583		3641
3584	#if ENABLE_FRILLS	3642	#if !ENABLE_MINIMAL
3585	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3643	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586	// so recode it manually	3644	// so recode it manually
3587	if (style == enc_utf8)	3645	if (style == enc_utf8)
3588	{	3646	{
3589	freect = 1;	3647	freect = 1;
…		…
3592	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3650	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593	ct.nitems = strlen ((char *)ct.value);	3651	ct.nitems = strlen ((char *)ct.value);
3594	}	3652	}
3595	else	3653	else
3596	#endif	3654	#endif
3597	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3655	if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598	freect = 1;	3656	freect = 1;
3599	else	3657	else
3600	{	3658	{
3601	/* if we failed to convert then send it raw */	3659	/* if we failed to convert then send it raw */
3602	ct.value = (unsigned char *)cl;	3660	ct.value = (unsigned char *)cl;
3603	ct.nitems = selectlen;	3661	ct.nitems = selectlen;
3604	ct.encoding = target;	3662	ct.encoding = target;
3605	}	3663	}
3606		3664
3607	XChangeProperty (disp, rq.requestor, rq.property,	3665	XChangeProperty (dpy, rq.requestor, rq.property,
3608	ct.encoding, 8, PropModeReplace,	3666	ct.encoding, 8, PropModeReplace,
3609	ct.value, (int)ct.nitems);	3667	ct.value, (int)ct.nitems);
3610	ev.property = rq.property;	3668	ev.property = rq.property;
3611		3669
3612	if (freect)	3670	if (freect)
3613	XFree (ct.value);	3671	XFree (ct.value);
3614	}	3672	}
3615		3673
3616	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);	3674	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3617	}	3675	}
3618		3676
3619	/* ------------------------------------------------------------------------- *	3677	/* ------------------------------------------------------------------------- *
3620	* MOUSE ROUTINES *	3678	* MOUSE ROUTINES *
3621	* ------------------------------------------------------------------------- */	3679	* ------------------------------------------------------------------------- */
3622		3680
3623	/*	3681	/*
3624	* return col/row values corresponding to x/y pixel values	3682	* return col/row values corresponding to x/y pixel values
3625	*/	3683	*/
3626	void	3684	void
3627	rxvt_term::pixel_position (int *x, int *y)	3685	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3628	{	3686	{
3629	*x = Pixel2Col (*x);	3687	*x = Pixel2Col (*x);
3630	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */	3688	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631	*y = Pixel2Row (*y);	3689	*y = Pixel2Row (*y);
3632	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */	3690	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633	}	3691	}
3634		3692
3635	/* ------------------------------------------------------------------------- */	3693	/* ------------------------------------------------------------------------- */
3636	#ifdef USE_XIM	3694	#ifdef USE_XIM
3637	void	3695	void
3638	rxvt_term::im_set_position (XPoint &pos)	3696	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639	{	3697	{
3640	XWindowAttributes xwa;	3698	XWindowAttributes xwa;
3641		3699
3642	XGetWindowAttributes (display->display, vt, &xwa);	3700	XGetWindowAttributes (dpy, vt, &xwa);
3643		3701
3644	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3702	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3703	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646	}	3704	}
3647	#endif	3705	#endif
3648		3706
3649	#if ENABLE_OVERLAY	3707	#if ENABLE_OVERLAY
3650	void	3708	void
3651	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3709	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652	{	3710	{
3653	if (nrow < 1 || ncol < 1)	3711	if (nrow < 1 || ncol < 1)
3654	return;	3712	return;
3655		3713
3656	want_refresh = 1;	3714	want_refresh = 1;
…		…
3701	*rp = r;	3759	*rp = r;
3702	}	3760	}
3703	}	3761	}
3704		3762
3705	void	3763	void
3706	rxvt_term::scr_overlay_off ()	3764	rxvt_term::scr_overlay_off () NOTHROW
3707	{	3765	{
3708	if (!ov_text)	3766	if (!ov_text)
3709	return;	3767	return;
3710		3768
3711	want_refresh = 1;	3769	want_refresh = 1;
…		…
3719	delete [] ov_text; ov_text = 0;	3777	delete [] ov_text; ov_text = 0;
3720	delete [] ov_rend; ov_rend = 0;	3778	delete [] ov_rend; ov_rend = 0;
3721	}	3779	}
3722		3780
3723	void	3781	void
3724	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3782	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725	{	3783	{
3726	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3784	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727	return;	3785	return;
3728		3786
3729	x++, y++;	3787	x++, y++;
…		…
3731	ov_text[y][x] = text;	3789	ov_text[y][x] = text;
3732	ov_rend[y][x] = rend;	3790	ov_rend[y][x] = rend;
3733	}	3791	}
3734		3792
3735	void	3793	void
3736	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3794	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737	{	3795	{
3738	while (*s)	3796	while (*s)
3739	scr_overlay_set (x++, y, *s++);	3797	scr_overlay_set (x++, y, *s++);
3740	}	3798	}
3741		3799
3742	void	3800	void
3743	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3801	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744	{	3802	{
3745	while (*s)	3803	while (*s)
3746	{	3804	{
3747	text_t t = *s++;	3805	text_t t = *s++;
3748	int width = wcwidth (t);	3806	int width = WCWIDTH (t);
3749		3807
3750	while (width--)	3808	while (width--)
3751	{	3809	{
3752	scr_overlay_set (x++, y, t);	3810	scr_overlay_set (x++, y, t);
3753	t = NOCHAR;	3811	t = NOCHAR;
3754	}	3812	}
3755	}	3813	}
3756	}	3814	}
3757		3815
3758	void	3816	void
3759	rxvt_term::scr_swap_overlay ()	3817	rxvt_term::scr_swap_overlay () NOTHROW
3760	{	3818	{
3761	if (!ov_text)	3819	if (!ov_text)
3762	return;	3820	return;
3763		3821
3764	// swap screen mem with overlay	3822	// swap screen mem with overlay

Diff Legend

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