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.239 by root, Thu Jan 19 17:14:46 2006 UTC vs.
Revision 1.292 by root, Sun Dec 23 02:43:55 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-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() \
…		…
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	/*	244	/*
245	* add or delete rows as appropriate	245	* add or delete rows as appropriate
…		…
274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	274	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275	}	275	}
276		276
277	line_t *old_buf = row_buf;	277	line_t *old_buf = row_buf;
278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	278	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279		279
280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	280	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281	int pend = MOD (term_start + top_row , prev_total_rows);	281	int pend = MOD (term_start + top_row , prev_total_rows);
282	int q = total_rows; // rewrapped row	282	int q = total_rows; // rewrapped row
283		283
284	if (top_row)	284	if (top_row)
285	{	285	{
286	// 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
287	// to come up with a lean and mean algorithm.	287	// to come up with a lean and mean algorithm.
288		288
289	row_col_t ocur = screen.cur;	289	row_col_t ocur = screen.cur;
290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);	290	ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291		291
…		…
328	int qcol = 0;	328	int qcol = 0;
329		329
330	// see below for cursor adjustment rationale	330	// see below for cursor adjustment rationale
331	if (p == ocur.row)	331	if (p == ocur.row)
332	screen.cur.row = q - (total_rows - nrow);	332	screen.cur.row = q - (total_rows - nrow);
333		333
334	// fill a single destination line	334	// fill a single destination line
335	while (lofs < llen && qcol < ncol)	335	while (lofs < llen && qcol < ncol)
336	{	336	{
337	int prow = lofs / prev_ncol;	337	int prow = lofs / prev_ncol;
338	int pcol = lofs % prev_ncol;	338	int pcol = lofs % prev_ncol;
…		…
348		348
349	line_t &pline = old_buf [prow];	349	line_t &pline = old_buf [prow];
350		350
351	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);	351	int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
352		352
353	assert (len);
354	assert (pline.t);
355
356	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));	353	memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));	354	memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
358		355
359	lofs += len;	356	lofs += len;
360	qcol += len;	357	qcol += len;
…		…
367	}	364	}
368	while (p != pend && q > 0);	365	while (p != pend && q > 0);
369		366
370	term_start = total_rows - nrow;	367	term_start = total_rows - nrow;
371	top_row = q - term_start;	368	top_row = q - term_start;
372		369
373	// make sure all terminal lines exist	370	// make sure all terminal lines exist
374	while (top_row > 0)	371	while (top_row > 0)
375	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);	372	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
376	}	373	}
377	else	374	else
378	{	375	{
379	// if no scrollback exists (yet), wing, instead of wrap	376	// if no scrollback exists (yet), wing, instead of wrap
380		377
381	for (int row = min (nrow, prev_nrow); row--; )	378	for (int row = min (nrow, prev_nrow); row--; )
382	{	379	{
383	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	380	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
384	line_t &qline = row_buf [row];	381	line_t &qline = row_buf [row];
385		382
…		…
400	delete old_ra;	397	delete old_ra;
401		398
402	clamp_it (screen.cur.row, 0, nrow - 1);	399	clamp_it (screen.cur.row, 0, nrow - 1);
403	clamp_it (screen.cur.col, 0, ncol - 1);	400	clamp_it (screen.cur.col, 0, ncol - 1);
404		401
405	if (tabs)
406	free (tabs);	402	free (tabs);
407	}	403	}
		404
		405	CLEAR_ALL_SELECTION ();
408		406
409	prev_nrow = nrow;	407	prev_nrow = nrow;
410	prev_ncol = ncol;	408	prev_ncol = ncol;
411		409
412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	410	tabs = (char *)rxvt_malloc (ncol);
413		411
414	for (int col = ncol; col--; )	412	for (int col = ncol; --col; )
415	tabs [col] = col % TABSIZE == 0;	413	tabs [col] = col % TABSIZE == 0;
416		414
		415	if (current_screen != PRIMARY)
		416	scr_swap_screen ();
		417
417	tt_winch ();	418	tt_winch ();
418		419
419	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	420	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420	}	421	}
421		422
422	/* ------------------------------------------------------------------------- */	423	/* ------------------------------------------------------------------------- */
423	/*	424	/*
424	* Free everything. That way malloc debugging can find leakage.	425	* Free everything. That way malloc debugging can find leakage.
425	*/	426	*/
426	void	427	void
427	rxvt_term::scr_release ()	428	rxvt_term::scr_release () NOTHROW
428	{	429	{
		430	if (row_buf)
		431	{
429	delete talloc; talloc = 0;	432	delete talloc; talloc = 0;
430	delete ralloc; ralloc = 0;	433	delete ralloc; ralloc = 0;
431		434
432	free (row_buf);	435	free (row_buf);
433	free (swap_buf);	436	free (swap_buf);
434	free (drawn_buf);	437	free (drawn_buf);
435	free (tabs);	438	free (tabs);
436		439
437	row_buf = 0; // signal that we freed all the arrays	440	row_buf = 0; // signal that we freed all the arrays
		441	}
438	}	442	}
439		443
440	/* ------------------------------------------------------------------------- */	444	/* ------------------------------------------------------------------------- */
441	/*	445	/*
442	* Hard reset	446	* Hard reset
…		…
459	* Save and Restore cursor	463	* Save and Restore cursor
460	* XTERM_SEQ: Save cursor : ESC 7	464	* XTERM_SEQ: Save cursor : ESC 7
461	* XTERM_SEQ: Restore cursor: ESC 8	465	* XTERM_SEQ: Restore cursor: ESC 8
462	*/	466	*/
463	void	467	void
464	rxvt_term::scr_cursor (int mode)	468	rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
465	{	469	{
466	screen_t *s;	470	screen_t *s;
467		471
468	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)	472	#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
469	if (current_screen == SECONDARY)	473	if (current_screen == SECONDARY)
…		…
501	assert (s->cur.row >= 0);	505	assert (s->cur.row >= 0);
502	assert (s->cur.col >= 0);	506	assert (s->cur.col >= 0);
503	#endif	507	#endif
504	}	508	}
505		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
506	/* ------------------------------------------------------------------------- */	525	/* ------------------------------------------------------------------------- */
507	/*	526	/*
508	* Swap between primary and secondary screens	527	* Swap between primary and secondary screens
509	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h	528	* XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
510	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l	529	* XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
511	*/	530	*/
512	int	531	void
513	rxvt_term::scr_change_screen (int scrn)	532	rxvt_term::scr_change_screen (int scrn)
514	{	533	{
		534	if (scrn == current_screen)
		535	return;
		536
515	want_refresh = 1;	537	want_refresh = 1;
516	view_start = 0;	538	view_start = 0;
517		539
518	if (current_screen == scrn)
519	return scrn;
520
521	selection_check (2); /* check for boundary cross */	540	selection_check (2); /* check for boundary cross */
522		541
523	int i = current_screen; current_screen = scrn; scrn = i;	542	int i = current_screen; current_screen = scrn; scrn = i;
524		543
525	::swap (screen.cur.row, swap.cur.row);
526	::swap (screen.cur.col, swap.cur.col);
527
528	screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
529	screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
530
531	#if NSCREENS	544	#if NSCREENS
532	if (OPTION (Opt_secondaryScreen))	545	if (option (Opt_secondaryScreen))
533	{	546	{
534	num_scr = 0;	547	num_scr = 0;
535		548
536	for (int i = prev_nrow; i--; )	549	scr_swap_screen ();
537	::swap (ROW(i), swap_buf [i]);
538		550
539	::swap (screen.charset, swap.charset);	551	::swap (screen.charset, swap.charset);
540	::swap (screen.flags, swap.flags);	552	::swap (screen.flags, swap.flags);
541	screen.flags |= Screen_VisibleCursor;	553	screen.flags |= Screen_VisibleCursor;
542	swap.flags |= Screen_VisibleCursor;	554	swap.flags |= Screen_VisibleCursor;
543	}	555	}
544	else	556	else
545	#endif	557	#endif
546	if (OPTION (Opt_secondaryScroll))	558	if (option (Opt_secondaryScroll))
547	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	559	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
548
549	return scrn;
550	}	560	}
551		561
552	// clear WrapNext indicator, solidifying position on next line	562	// clear WrapNext indicator, solidifying position on next line
553	void	563	void
554	rxvt_term::scr_do_wrap ()	564	rxvt_term::scr_do_wrap () NOTHROW
555	{	565	{
556	if (!(screen.flags & Screen_WrapNext))	566	if (!(screen.flags & Screen_WrapNext))
557	return;	567	return;
558		568
559	screen.flags &= ~Screen_WrapNext;	569	screen.flags &= ~Screen_WrapNext;
…		…
569	/* ------------------------------------------------------------------------- */	579	/* ------------------------------------------------------------------------- */
570	/*	580	/*
571	* Change the colour for following text	581	* Change the colour for following text
572	*/	582	*/
573	void	583	void
574	rxvt_term::scr_color (unsigned int color, int fgbg)	584	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
575	{	585	{
576	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	586	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
577	color = fgbg;	587	color = fgbg;
578		588
579	if (fgbg == Color_fg)	589	if (fgbg == Color_fg)
…		…
585	/* ------------------------------------------------------------------------- */	595	/* ------------------------------------------------------------------------- */
586	/*	596	/*
587	* Change the rendition style for following text	597	* Change the rendition style for following text
588	*/	598	*/
589	void	599	void
590	rxvt_term::scr_rendition (int set, int style)	600	rxvt_term::scr_rendition (int set, int style) NOTHROW
591	{	601	{
592	if (set)	602	if (set)
593	rstyle |= style;	603	rstyle |= style;
594	else if (style == ~RS_None)	604	else if (style == ~RS_None)
595	rstyle = DEFAULT_RSTYLE;	605	rstyle = DEFAULT_RSTYLE;
596	else	606	else
597	rstyle &= ~style;	607	rstyle &= ~style;
598	}	608	}
599		609
600	/* ------------------------------------------------------------------------- */	610	/* ------------------------------------------------------------------------- */
601	/*	611	/*
602	* Scroll text between <row1> and <row2> inclusive, by <count> lines	612	* Scroll text between <row1> and <row2> inclusive, by <count> lines
603	* count positive ==> scroll up	613	* count positive ==> scroll up
604	* count negative ==> scroll down	614	* count negative ==> scroll down
605	*/	615	*/
606	int	616	int
607	rxvt_term::scr_scroll_text (int row1, int row2, int count)	617	rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
608	{	618	{
609	if (count == 0 || (row1 > row2))	619	if (count == 0 || (row1 > row2))
610	return 0;	620	return 0;
611		621
612	want_refresh = 1;	622	want_refresh = 1;
613	num_scr += count;	623	num_scr += count;
614		624
615	if (count > 0	625	if (count > 0
616	&& row1 == 0	626	&& row1 == 0
617	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	627	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
618	{	628	{
619	top_row = max (top_row - count, -saveLines);	629	top_row = max (top_row - count, -saveLines);
620		630
621	// scroll everything up 'count' lines	631	// scroll everything up 'count' lines
622	term_start = (term_start + count) % total_rows;	632	term_start = (term_start + count) % total_rows;
…		…
629	}	639	}
630		640
631	// erase newly scrolled-in lines	641	// erase newly scrolled-in lines
632	for (int i = count; i--; )	642	for (int i = count; i--; )
633	{	643	{
634	// basically this is a slightly optimized scr_blank_screen_mem
635	// it is worth the effort on slower machines
636	line_t &l = ROW(nrow - 1 - i);	644	line_t &l = ROW(nrow - 1 - i);
637		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	{
638	scr_blank_line (l, 0, l.l, rstyle);	650	scr_blank_line (l, 0, l.l, rstyle);
639
640	l.l = 0;	651	l.l = 0;
641	l.f = 0;	652	l.f = 0;
		653	}
		654	else
		655	scr_blank_screen_mem (l, rstyle);
642	}	656	}
643		657
644	// now copy lines below the scroll region bottom to the	658	// now copy lines below the scroll region bottom to the
645	// bottom of the screen again, so they look as if they	659	// bottom of the screen again, so they look as if they
646	// hadn't moved.	660	// hadn't moved.
…		…
650	line_t &l2 = ROW(i);	664	line_t &l2 = ROW(i);
651		665
652	::swap (l1, l2);	666	::swap (l1, l2);
653	l2.touch ();	667	l2.touch ();
654	}	668	}
655		669
656	// move and/or clear selection, if any	670	// move and/or clear selection, if any
657	if (selection.op && current_screen == selection.screen)	671	if (selection.op && current_screen == selection.screen)
658	{	672	{
659	selection.beg.row -= count;	673	selection.beg.row -= count;
660	selection.end.row -= count;	674	selection.end.row -= count;
…		…
668	selection.op = SELECTION_CLEAR;	682	selection.op = SELECTION_CLEAR;
669	}	683	}
670	}	684	}
671		685
672	// finally move the view window, if desired	686	// finally move the view window, if desired
673	if (OPTION (Opt_scrollWithBuffer)	687	if (option (Opt_scrollWithBuffer)
674	&& view_start != 0	688	&& view_start != 0
675	&& view_start != -saveLines)	689	&& view_start != -saveLines)
676	scr_page (UP, count);	690	scr_page (UP, count);
677		691
678	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	692	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
…		…
696	{	710	{
697	/* move selected region too */	711	/* move selected region too */
698	selection.beg.row -= count;	712	selection.beg.row -= count;
699	selection.end.row -= count;	713	selection.end.row -= count;
700	selection.mark.row -= count;	714	selection.mark.row -= count;
701		715
702	selection_check (0);	716	selection_check (0);
703	}	717	}
704	}	718	}
705		719
706	// use a simple and robust scrolling algorithm, this	720	// use a simple and robust scrolling algorithm, this
…		…
730	/* ------------------------------------------------------------------------- */	744	/* ------------------------------------------------------------------------- */
731	/*	745	/*
732	* Add text given in <str> of length <len> to screen struct	746	* Add text given in <str> of length <len> to screen struct
733	*/	747	*/
734	void	748	void
735	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
736	{	750	{
737	if (len <= 0) /* sanity */	751	if (len <= 0) /* sanity */
738	return;	752	return;
739		753
740	unsigned char checksel;	754	unsigned char checksel;
…		…
746	ZERO_SCROLLBACK ();	760	ZERO_SCROLLBACK ();
747		761
748	if (minlines > 0)	762	if (minlines > 0)
749	{	763	{
750	minlines += screen.cur.row - screen.bscroll;	764	minlines += screen.cur.row - screen.bscroll;
		765	min_it (minlines, screen.cur.row - top_row);
751		766
752	if (minlines > 0	767	if (minlines > 0
753	&& screen.tscroll == 0	768	&& screen.tscroll == 0
754	&& screen.bscroll == nrow - 1)	769	&& screen.bscroll == nrow - 1)
755	{	770	{
…		…
817	}	832	}
818		833
819	if (screen.flags & Screen_WrapNext)	834	if (screen.flags & Screen_WrapNext)
820	{	835	{
821	scr_do_wrap ();	836	scr_do_wrap ();
822		837
823	line->l = ncol;	838	line->l = ncol;
824	line->is_longer (1);	839	line->is_longer (1);
825		840
826	row = screen.cur.row;	841	row = screen.cur.row;
827	line = &ROW(row); /* _must_ refresh */	842	line = &ROW(row); /* _must_ refresh */
…		…
829		844
830	// some utf-8 decoders "decode" surrogate characters: let's fix this.	845	// some utf-8 decoders "decode" surrogate characters: let's fix this.
831	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	846	if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832	c = 0xfffd;	847	c = 0xfffd;
833		848
834	// 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
835	// do wcwidth before further replacements, as wcwidth might return -1	850	// further replacements, as wcwidth might return -1 for the line
836	// 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
837	// locale.	852	// locale.
838	int width = c < 0x100 ? 1 : wcwidth (c);	853	int width = WCWIDTH (c);
839		854
840	if (charsets [screen.charset] == '0') // DEC SPECIAL	855	if (charsets [screen.charset] == '0') // DEC SPECIAL
841	{	856	{
842	// vt100 special graphics and line drawing	857	// vt100 special graphics and line drawing
843	// 5f-7e standard vt100	858	// 5f-7e standard vt100
…		…
994	/*	1009	/*
995	* 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
996	* XTERM_SEQ: CTRL-H	1011	* XTERM_SEQ: CTRL-H
997	*/	1012	*/
998	void	1013	void
999	rxvt_term::scr_backspace ()	1014	rxvt_term::scr_backspace () NOTHROW
1000	{	1015	{
1001	want_refresh = 1;	1016	want_refresh = 1;
1002		1017
1003	if (screen.cur.col == 0)	1018	if (screen.cur.col == 0)
1004	{	1019	{
…		…
1022	* Process Horizontal Tab	1037	* Process Horizontal Tab
1023	* count: +ve = forward; -ve = backwards	1038	* count: +ve = forward; -ve = backwards
1024	* XTERM_SEQ: CTRL-I	1039	* XTERM_SEQ: CTRL-I
1025	*/	1040	*/
1026	void	1041	void
1027	rxvt_term::scr_tab (int count, bool ht)	1042	rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028	{	1043	{
1029	int i, x;	1044	int i, x;
1030		1045
1031	want_refresh = 1;	1046	want_refresh = 1;
1032	i = x = screen.cur.col;	1047	i = x = screen.cur.col;
…		…
1045	x = i;	1060	x = i;
1046		1061
1047	if (!--count)	1062	if (!--count)
1048	break;	1063	break;
1049	}	1064	}
1050	else	1065	else
1051	ht &= l.t[i] == ' '	1066	ht &= l.t[i] == ' '
1052	&& RS_SAME (l.r[i], base_rend);	1067	&& RS_SAME (l.r[i], base_rend);
1053		1068
1054	if (count)	1069	if (count)
1055	x = ncol - 1;	1070	x = ncol - 1;
1056		1071
1057	// store horizontal tab commands as characters inside the text	1072	// store horizontal tab commands as characters inside the text
1058	// buffer so they can be selected and pasted.	1073	// buffer so they can be selected and pasted.
1059	if (ht && OPTION (Opt_pastableTabs))	1074	if (ht && option (Opt_pastableTabs))
1060	{	1075	{
1061	base_rend = SET_FONT (base_rend, 0);	1076	base_rend = SET_FONT (base_rend, 0);
1062		1077
1063	l.touch (x);	1078	l.touch (x);
1064		1079
…		…
1097	* Process DEC Back Index	1112	* Process DEC Back Index
1098	* XTERM_SEQ: ESC 6	1113	* XTERM_SEQ: ESC 6
1099	* 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
1100	* in that row right. Clear left column.	1115	* in that row right. Clear left column.
1101	*/	1116	*/
1102	#if ENABLE_FRILLS	1117	#if !ENABLE_MINIMAL
1103	void	1118	void
1104	rxvt_term::scr_backindex ()	1119	rxvt_term::scr_backindex () NOTHROW
1105	{	1120	{
1106	if (screen.cur.col > 0)	1121	if (screen.cur.col > 0)
1107	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1122	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108	else	1123	else
1109	scr_insdel_chars (1, INSERT);	1124	scr_insdel_chars (1, INSERT);
…		…
1114	* Process DEC Forward Index	1129	* Process DEC Forward Index
1115	* XTERM_SEQ: ESC 9	1130	* XTERM_SEQ: ESC 9
1116	* 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
1117	* in that row left. Clear right column.	1132	* in that row left. Clear right column.
1118	*/	1133	*/
1119	#if ENABLE_FRILLS	1134	#if !ENABLE_MINIMAL
1120	void	1135	void
1121	rxvt_term::scr_forwardindex ()	1136	rxvt_term::scr_forwardindex () NOTHROW
1122	{	1137	{
1123	if (screen.cur.col < ncol - 1)	1138	if (screen.cur.col < ncol - 1)
1124	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1139	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125	else	1140	else
1126	{	1141	{
…		…
1139	/* ------------------------------------------------------------------------- */	1154	/* ------------------------------------------------------------------------- */
1140	/*	1155	/*
1141	* Goto Row/Column	1156	* Goto Row/Column
1142	*/	1157	*/
1143	void	1158	void
1144	rxvt_term::scr_gotorc (int row, int col, int relative)	1159	rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145	{	1160	{
1146	want_refresh = 1;	1161	want_refresh = 1;
1147	ZERO_SCROLLBACK ();	1162	ZERO_SCROLLBACK ();
1148		1163
1149	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;	1164	screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
…		…
1171	}	1186	}
1172	}	1187	}
1173	else	1188	else
1174	{	1189	{
1175	if (screen.flags & Screen_Relative)	1190	if (screen.flags & Screen_Relative)
		1191	{
1176	{ /* relative origin mode */	1192	/* relative origin mode */
1177	screen.cur.row = row + screen.tscroll;	1193	screen.cur.row = row + screen.tscroll;
1178	min_it (screen.cur.row, screen.bscroll);	1194	min_it (screen.cur.row, screen.bscroll);
1179	}	1195	}
1180	else	1196	else
1181	screen.cur.row = row;	1197	screen.cur.row = row;
…		…
1187	/* ------------------------------------------------------------------------- */	1203	/* ------------------------------------------------------------------------- */
1188	/*	1204	/*
1189	* direction should be UP or DN	1205	* direction should be UP or DN
1190	*/	1206	*/
1191	void	1207	void
1192	rxvt_term::scr_index (enum page_dirn direction)	1208	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193	{	1209	{
1194	int dirn;	1210	int dirn;
1195		1211
1196	want_refresh = 1;	1212	want_refresh = 1;
1197	ZERO_SCROLLBACK ();	1213	ZERO_SCROLLBACK ();
…		…
1216	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1232	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1217	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1233	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1218	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1234	* XTERM_SEQ: Clear whole line : ESC [ 2 K
1219	*/	1235	*/
1220	void	1236	void
1221	rxvt_term::scr_erase_line (int mode)	1237	rxvt_term::scr_erase_line (int mode) NOTHROW
1222	{	1238	{
1223	unsigned int col, num;	1239	unsigned int col, num;
1224		1240
1225	want_refresh = 1;	1241	want_refresh = 1;
1226	ZERO_SCROLLBACK ();	1242	ZERO_SCROLLBACK ();
…		…
1270	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J	1286	* XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J	1287	* XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272	* XTERM_SEQ: Clear whole screen : ESC [ 2 J	1288	* XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273	*/	1289	*/
1274	void	1290	void
1275	rxvt_term::scr_erase_screen (int mode)	1291	rxvt_term::scr_erase_screen (int mode) NOTHROW
1276	{	1292	{
1277	int num;	1293	int num;
1278	int32_t row;	1294	int32_t row;
1279	rend_t ren;	1295	rend_t ren;
1280	XGCValues gcvalue;	1296	XGCValues gcvalue;
…		…
1325	}	1341	}
1326	else	1342	else
1327	{	1343	{
1328	ren = rstyle & (RS_fgMask | RS_bgMask);	1344	ren = rstyle & (RS_fgMask | RS_bgMask);
1329	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1345	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1346	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331	ERASE_ROWS (row, num);	1347	ERASE_ROWS (row, num);
1332	gcvalue.foreground = pix_colors[Color_fg];	1348	gcvalue.foreground = pix_colors[Color_fg];
1333	XChangeGC (display->display, gc, GCForeground, &gcvalue);	1349	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334	}	1350	}
1335		1351
1336	for (; num--; row++)	1352	for (; num--; row++)
1337	{	1353	{
1338	scr_blank_screen_mem (ROW(row), rstyle);	1354	scr_blank_screen_mem (ROW(row), rstyle);
1339	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1355	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340	}	1356	}
1341	}	1357	}
1342		1358
1343	#if ENABLE_FRILLS	1359	#if !ENABLE_MINIMAL
1344	void	1360	void
1345	rxvt_term::scr_erase_savelines ()	1361	rxvt_term::scr_erase_savelines () NOTHROW
1346	{	1362	{
1347	want_refresh = 1;	1363	want_refresh = 1;
1348	ZERO_SCROLLBACK ();	1364	ZERO_SCROLLBACK ();
1349		1365
1350	top_row = 0;	1366	top_row = 0;
…		…
1355	/*	1371	/*
1356	* Fill the screen with `E's	1372	* Fill the screen with `E's
1357	* XTERM_SEQ: Screen Alignment Test: ESC # 8	1373	* XTERM_SEQ: Screen Alignment Test: ESC # 8
1358	*/	1374	*/
1359	void	1375	void
1360	rxvt_term::scr_E ()	1376	rxvt_term::scr_E () NOTHROW
1361	{	1377	{
1362	rend_t fs;	1378	rend_t fs;
1363		1379
1364	want_refresh = 1;	1380	want_refresh = 1;
1365	ZERO_SCROLLBACK ();	1381	ZERO_SCROLLBACK ();
…		…
1386	/* ------------------------------------------------------------------------- */	1402	/* ------------------------------------------------------------------------- */
1387	/*	1403	/*
1388	* Insert/Delete <count> lines	1404	* Insert/Delete <count> lines
1389	*/	1405	*/
1390	void	1406	void
1391	rxvt_term::scr_insdel_lines (int count, int insdel)	1407	rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392	{	1408	{
1393	int end;	1409	int end;
1394		1410
1395	ZERO_SCROLLBACK ();	1411	ZERO_SCROLLBACK ();
1396		1412
…		…
1416	/* ------------------------------------------------------------------------- */	1432	/* ------------------------------------------------------------------------- */
1417	/*	1433	/*
1418	* Insert/Delete <count> characters from the current position	1434	* Insert/Delete <count> characters from the current position
1419	*/	1435	*/
1420	void	1436	void
1421	rxvt_term::scr_insdel_chars (int count, int insdel)	1437	rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422	{	1438	{
1423	int col, row;	1439	int col, row;
1424	rend_t tr;	1440	rend_t tr;
1425		1441
1426	want_refresh = 1;	1442	want_refresh = 1;
…		…
1457	{	1473	{
1458	if (selection.end.row != screen.cur.row	1474	if (selection.end.row != screen.cur.row
1459	|| (selection.end.col + count >= ncol))	1475	|| (selection.end.col + count >= ncol))
1460	CLEAR_SELECTION ();	1476	CLEAR_SELECTION ();
1461	else	1477	else
		1478	{
1462	{ /* shift selection */	1479	/* shift selection */
1463	selection.beg.col += count;	1480	selection.beg.col += count;
1464	selection.mark.col += count; /* XXX: yes? */	1481	selection.mark.col += count; /* XXX: yes? */
1465	selection.end.col += count;	1482	selection.end.col += count;
1466	}	1483	}
1467	}	1484	}
…		…
1514	/*	1531	/*
1515	* Set the scrolling region	1532	* Set the scrolling region
1516	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r	1533	* XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517	*/	1534	*/
1518	void	1535	void
1519	rxvt_term::scr_scroll_region (int top, int bot)	1536	rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520	{	1537	{
1521	max_it (top, 0);	1538	max_it (top, 0);
1522	min_it (bot, nrow - 1);	1539	min_it (bot, nrow - 1);
1523		1540
1524	if (top > bot)	1541	if (top > bot)
…		…
1534	* Make the cursor visible/invisible	1551	* Make the cursor visible/invisible
1535	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h	1552	* XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l	1553	* XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537	*/	1554	*/
1538	void	1555	void
1539	rxvt_term::scr_cursor_visible (int mode)	1556	rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540	{	1557	{
1541	want_refresh = 1;	1558	want_refresh = 1;
1542		1559
1543	if (mode)	1560	if (mode)
1544	screen.flags |= Screen_VisibleCursor;	1561	screen.flags |= Screen_VisibleCursor;
…		…
1551	* Set/unset automatic wrapping	1568	* Set/unset automatic wrapping
1552	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h	1569	* XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l	1570	* XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554	*/	1571	*/
1555	void	1572	void
1556	rxvt_term::scr_autowrap (int mode)	1573	rxvt_term::scr_autowrap (int mode) NOTHROW
1557	{	1574	{
1558	if (mode)	1575	if (mode)
1559	screen.flags |= Screen_Autowrap;	1576	screen.flags |= Screen_Autowrap;
1560	else	1577	else
1561	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);	1578	screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
…		…
1570	* and the cursor cannot be moved outside.	1587	* and the cursor cannot be moved outside.
1571	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h	1588	* XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572	* XTERM_SEQ: Set Relative: ESC [ ? 6 l	1589	* XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573	*/	1590	*/
1574	void	1591	void
1575	rxvt_term::scr_relative_origin (int mode)	1592	rxvt_term::scr_relative_origin (int mode) NOTHROW
1576	{	1593	{
1577	if (mode)	1594	if (mode)
1578	screen.flags |= Screen_Relative;	1595	screen.flags |= Screen_Relative;
1579	else	1596	else
1580	screen.flags &= ~Screen_Relative;	1597	screen.flags &= ~Screen_Relative;
…		…
1587	* Set insert/replace mode	1604	* Set insert/replace mode
1588	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h	1605	* XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l	1606	* XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590	*/	1607	*/
1591	void	1608	void
1592	rxvt_term::scr_insert_mode (int mode)	1609	rxvt_term::scr_insert_mode (int mode) NOTHROW
1593	{	1610	{
1594	if (mode)	1611	if (mode)
1595	screen.flags |= Screen_Insert;	1612	screen.flags |= Screen_Insert;
1596	else	1613	else
1597	screen.flags &= ~Screen_Insert;	1614	screen.flags &= ~Screen_Insert;
…		…
1603	* XTERM_SEQ: Set tab at current column : ESC H	1620	* XTERM_SEQ: Set tab at current column : ESC H
1604	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g	1621	* XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605	* XTERM_SEQ: Clear all tabs : ESC [ 3 g	1622	* XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606	*/	1623	*/
1607	void	1624	void
1608	rxvt_term::scr_set_tab (int mode)	1625	rxvt_term::scr_set_tab (int mode) NOTHROW
1609	{	1626	{
1610	if (mode < 0)	1627	if (mode < 0)
1611	memset (tabs, 0, ncol * sizeof (char));	1628	memset (tabs, 0, ncol);
1612	else if (screen.cur.col < ncol)	1629	else if (screen.cur.col < ncol)
1613	tabs [screen.cur.col] = !!mode;	1630	tabs [screen.cur.col] = !!mode;
1614	}	1631	}
1615		1632
1616	/* ------------------------------------------------------------------------- */	1633	/* ------------------------------------------------------------------------- */
…		…
1618	* Set reverse/normal video	1635	* Set reverse/normal video
1619	* XTERM_SEQ: Reverse video: ESC [ ? 5 h	1636	* XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620	* XTERM_SEQ: Normal video : ESC [ ? 5 l	1637	* XTERM_SEQ: Normal video : ESC [ ? 5 l
1621	*/	1638	*/
1622	void	1639	void
1623	rxvt_term::scr_rvideo_mode (int mode)	1640	rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624	{	1641	{
1625	XGCValues gcvalue;	1642	rvideo_mode = on;
1626		1643
		1644	#ifndef NO_BELL
		1645	on ^= rvideo_bell;
		1646	#endif
		1647
1627	if (rvideo != mode)	1648	if (rvideo_state != on)
1628	{	1649	{
1629	rvideo = mode;	1650	rvideo_state = on;
		1651
1630	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631	#if XPM_BACKGROUND	1653	#ifdef HAVE_BG_PIXMAP
1632	if (bgPixmap.pixmap == None)	1654	if (bgPixmap.pixmap == None)
1633	#endif	1655	#endif
1634	#if TRANSPARENT	1656	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635	if (! OPTION (Opt_transparent) || am_transparent == 0)
1636	#endif
1637	XSetWindowBackground (display->display, vt,
1638	pix_colors[Color_bg]);
1639		1657
		1658	XGCValues gcvalue;
1640	gcvalue.foreground = pix_colors[Color_fg];	1659	gcvalue.foreground = pix_colors[Color_fg];
1641	gcvalue.background = pix_colors[Color_bg];	1660	gcvalue.background = pix_colors[Color_bg];
1642	XChangeGC (display->display, gc, GCBackground | GCForeground,	1661	XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643	&gcvalue);	1662
1644	scr_clear ();	1663	scr_clear ();
1645	scr_touch (true);	1664	scr_touch (true);
1646	}	1665	}
1647	}	1666	}
1648		1667
…		…
1650	/*	1669	/*
1651	* Report current cursor position	1670	* Report current cursor position
1652	* XTERM_SEQ: Report position: ESC [ 6 n	1671	* XTERM_SEQ: Report position: ESC [ 6 n
1653	*/	1672	*/
1654	void	1673	void
1655	rxvt_term::scr_report_position ()	1674	rxvt_term::scr_report_position () NOTHROW
1656	{	1675	{
1657	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);	1676	tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658	}	1677	}
1659		1678
1660	/* ------------------------------------------------------------------------- *	1679	/* ------------------------------------------------------------------------- *
…		…
1663		1682
1664	/*	1683	/*
1665	* Set font style	1684	* Set font style
1666	*/	1685	*/
1667	void	1686	void
1668	rxvt_term::set_font_style ()	1687	rxvt_term::set_font_style () NOTHROW
1669	{	1688	{
1670	#if 0	1689	#if 0
1671	switch (charsets [screen.charset])	1690	switch (charsets [screen.charset])
1672	{	1691	{
1673	case '0': /* DEC Special Character & Line Drawing Set */	1692	case '0': /* DEC Special Character & Line Drawing Set */
…		…
1695	* XTERM_SEQ: Invoke G1 character set: CTRL-N	1714	* XTERM_SEQ: Invoke G1 character set: CTRL-N
1696	* XTERM_SEQ: Invoke G2 character set: ESC N	1715	* XTERM_SEQ: Invoke G2 character set: ESC N
1697	* XTERM_SEQ: Invoke G3 character set: ESC O	1716	* XTERM_SEQ: Invoke G3 character set: ESC O
1698	*/	1717	*/
1699	void	1718	void
1700	rxvt_term::scr_charset_choose (int set)	1719	rxvt_term::scr_charset_choose (int set) NOTHROW
1701	{	1720	{
1702	screen.charset = set;	1721	screen.charset = set;
1703	set_font_style ();	1722	set_font_style ();
1704	}	1723	}
1705		1724
…		…
1711	* XTERM_SEQ: Set G2 character set: ESC * <C>	1730	* XTERM_SEQ: Set G2 character set: ESC * <C>
1712	* XTERM_SEQ: Set G3 character set: ESC + <C>	1731	* XTERM_SEQ: Set G3 character set: ESC + <C>
1713	* See set_font_style for possible values for <C>	1732	* See set_font_style for possible values for <C>
1714	*/	1733	*/
1715	void	1734	void
1716	rxvt_term::scr_charset_set (int set, unsigned int ch)	1735	rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717	{	1736	{
1718	charsets[set] = (unsigned char)ch;	1737	charsets[set] = (unsigned char)ch;
1719	set_font_style ();	1738	set_font_style ();
1720	}	1739	}
1721		1740
…		…
1726		1745
1727	/*	1746	/*
1728	* refresh matching text.	1747	* refresh matching text.
1729	*/	1748	*/
1730	bool	1749	bool
1731	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)	1750	rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732	{	1751	{
1733	bool found = false;	1752	bool found = false;
1734		1753
1735	for (int i = 0; i < nrow; i++)	1754	for (int i = 0; i < nrow; i++)
1736	{	1755	{
1737	int col = 0;
1738	rend_t *drp = drawn_buf[i].r;	1756	rend_t *drp = drawn_buf[i].r;
1739		1757
1740	for (; col < ncol; col++, drp++)	1758	for (int col = 0; col < ncol; col++, drp++)
1741	if ((*drp & mask) == value)	1759	if ((*drp & mask) == value)
1742	{	1760	{
1743	found = true;	1761	found = true;
1744	*drp = ~value;	1762	*drp = ~value;
1745	}	1763	}
…		…
1756	PART_END,	1774	PART_END,
1757	RC_COUNT	1775	RC_COUNT
1758	};	1776	};
1759		1777
1760	void	1778	void
1761	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)	1779	rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762	{	1780	{
1763	int i;	1781	int i;
1764	row_col_t rc[RC_COUNT];	1782	row_col_t rc[RC_COUNT];
1765		1783
1766	if (!drawn_buf) /* sanity check */	1784	if (!drawn_buf) /* sanity check */
…		…
1785	for (i = PART_BEG; i < RC_COUNT; i++)	1803	for (i = PART_BEG; i < RC_COUNT; i++)
1786	{	1804	{
1787	min_it (rc[i].col, ncol - 1);	1805	min_it (rc[i].col, ncol - 1);
1788	min_it (rc[i].row, nrow - 1);	1806	min_it (rc[i].row, nrow - 1);
1789	}	1807	}
1790		1808	// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1809	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1810	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793		1811
1794	num_scr_allow = 0;	1812	num_scr_allow = 0;
1795		1813
…		…
1800	/* ------------------------------------------------------------------------- */	1818	/* ------------------------------------------------------------------------- */
1801	/*	1819	/*
1802	* Refresh the entire screen	1820	* Refresh the entire screen
1803	*/	1821	*/
1804	void	1822	void
1805	rxvt_term::scr_touch (bool refresh)	1823	rxvt_term::scr_touch (bool refresh) NOTHROW
1806	{	1824	{
1807	scr_expose (0, 0, width, height, refresh);	1825	scr_expose (0, 0, width, height, refresh);
1808	}	1826	}
1809		1827
1810	/* ------------------------------------------------------------------------- */	1828	/* ------------------------------------------------------------------------- */
1811	/*	1829	/*
1812	* Move the display so that the line represented by scrollbar value Y is at	1830	* Move the display so that the line represented by scrollbar value Y is at
1813	* the top of the screen	1831	* the top of the screen
1814	*/	1832	*/
1815	void	1833	void
1816	rxvt_term::scr_move_to (int y, int len)	1834	rxvt_term::scr_move_to (int y, int len) NOTHROW
1817	{	1835	{
1818	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1836	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1819	}	1837	}
1820		1838
1821	/* ------------------------------------------------------------------------- */	1839	/* ------------------------------------------------------------------------- */
1822	/*	1840	/*
1823	* Page the screen up/down nlines	1841	* Page the screen up/down nlines
1824	* direction should be UP or DN	1842	* direction should be UP or DN
1825	*/	1843	*/
1826	bool	1844	bool
1827	rxvt_term::scr_page (enum page_dirn direction, int nlines)	1845	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1828	{	1846	{
1829	int new_view_start =	1847	int new_view_start =
1830	direction == UP ? view_start - nlines	1848	direction == UP ? view_start - nlines
1831	: view_start + nlines;	1849	: view_start + nlines;
1832		1850
1833	return scr_changeview (new_view_start);	1851	return scr_changeview (new_view_start);
1834	}	1852	}
1835		1853
1836	bool	1854	bool
1837	rxvt_term::scr_changeview (int new_view_start)	1855	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1838	{	1856	{
1839	clamp_it (new_view_start, top_row, 0);	1857	clamp_it (new_view_start, top_row, 0);
1840		1858
1841	if (new_view_start == view_start)	1859	if (new_view_start == view_start)
1842	return false;	1860	return false;
…		…
1848	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));	1866	HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1849		1867
1850	return true;	1868	return true;
1851	}	1869	}
1852		1870
1853	/* ------------------------------------------------------------------------- */	1871	#ifndef NO_BELL
1854	void	1872	void
		1873	rxvt_term::bell_cb (ev::timer &w, int revents)
		1874	{
		1875	rvideo_bell = false;
		1876	scr_rvideo_mode (rvideo_mode);
		1877	refresh_check ();
		1878	}
		1879	#endif
		1880
		1881	/* ------------------------------------------------------------------------- */
		1882	void
1855	rxvt_term::scr_bell ()	1883	rxvt_term::scr_bell () NOTHROW
1856	{	1884	{
1857	#ifndef NO_BELL	1885	#ifndef NO_BELL
1858		1886
1859	# ifndef NO_MAPALERT	1887	# ifndef NO_MAPALERT
1860	# ifdef MAPALERT_OPTION	1888	# ifdef MAPALERT_OPTION
1861	if (OPTION (Opt_mapAlert))	1889	if (option (Opt_mapAlert))
1862	# endif	1890	# endif
1863	XMapWindow (display->display, parent[0]);	1891	XMapWindow (dpy, parent[0]);
1864	# endif	1892	# endif
1865		1893
1866	if (OPTION (Opt_visualBell))	1894	# if ENABLE_FRILLS
		1895	if (option (Opt_urgentOnBell))
		1896	{
		1897	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
		1898	{
		1899	h->flags |= XUrgencyHint;
		1900	XSetWMHints (dpy, parent[0], h);
		1901	}
1867	{	1902	}
1868	scr_rvideo_mode (!rvideo); /* refresh also done */	1903	# endif
		1904
		1905	if (option (Opt_visualBell))
		1906	{
		1907	rvideo_bell = true;
		1908	scr_rvideo_mode (rvideo_mode);
1869	display->flush ();	1909	flush ();
		1910
1870	rxvt_usleep (VISUAL_BELL_DURATION);	1911	bell_ev.start (VISUAL_BELL_DURATION);
1871	scr_rvideo_mode (!rvideo); /* refresh also done */
1872	}	1912	}
1873	else	1913	else
1874	XBell (display->display, 0);	1914	XBell (dpy, 0);
1875
1876	#endif	1915	#endif
1877	}	1916	}
1878		1917
1879	/* ------------------------------------------------------------------------- */	1918	/* ------------------------------------------------------------------------- */
1880	/* ARGSUSED */	1919	/* ARGSUSED */
1881	void	1920	void
1882	rxvt_term::scr_printscreen (int fullhist)	1921	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1883	{	1922	{
1884	#ifdef PRINTPIPE	1923	#ifdef PRINTPIPE
1885	int nrows, row_start;	1924	int nrows, row_start;
1886	FILE *fd;	1925	FILE *fd;
1887		1926
…		…
1936	* Refresh the screen	1975	* Refresh the screen
1937	* drawn_text/drawn_rend contain the screen information before the update.	1976	* drawn_text/drawn_rend contain the screen information before the update.
1938	* screen.text/screen.rend contain what the screen will change to.	1977	* screen.text/screen.rend contain what the screen will change to.
1939	*/	1978	*/
1940	void	1979	void
1941	rxvt_term::scr_refresh ()	1980	rxvt_term::scr_refresh () NOTHROW
1942	{	1981	{
1943	unsigned char must_clear, /* use draw_string not draw_image_string */	1982	unsigned char have_bg,
1944	showcursor; /* show the cursor */	1983	showcursor; /* show the cursor */
1945	int16_t col, row, /* column/row we're processing */	1984	int16_t col, row, /* column/row we're processing */
1946	ocrow; /* old cursor row */	1985	ocrow; /* old cursor row */
1947	int i; /* tmp */	1986	int i; /* tmp */
1948	#ifndef NO_CURSORCOLOR	1987	#ifndef NO_CURSORCOLOR
1949	rend_t cc1; /* store colours at cursor position (s) */	1988	rend_t cc1; /* store colours at cursor position (s) */
1950	#endif	1989	#endif
1951	rend_t *crp; // cursor rendition pointer	1990	rend_t *crp; // cursor rendition pointer
		1991	rend_t ccol1, /* Cursor colour */
		1992	ccol2; /* Cursor colour2 */
1952		1993
1953	want_refresh = 0; /* screen is current */	1994	want_refresh = 0; /* screen is current */
1954		1995
1955	if (refresh_type == NO_REFRESH || !mapped)	1996	if (refresh_type == NO_REFRESH || !mapped)
1956	return;	1997	return;
1957		1998
1958	/*	1999	/*
1959	* A: set up vars	2000	* A: set up vars
1960	*/	2001	*/
1961	must_clear = 0;	2002	have_bg = 0;
1962	refresh_count = 0;	2003	refresh_count = 0;
1963		2004
1964	#if XPM_BACKGROUND	2005	#ifdef HAVE_BG_PIXMAP
1965	must_clear |= bgPixmap.pixmap != None;	2006	have_bg |= bgPixmap.pixmap != None;
1966	#endif
1967	#if TRANSPARENT
1968	must_clear |= OPTION (Opt_transparent) && am_transparent;
1969	#endif	2007	#endif
1970	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2008	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1971		2009
1972	/*	2010	/*
1973	* B: reverse any characters which are selected	2011	* B: reverse any characters which are selected
…		…
1977	/*	2015	/*
1978	* C: set the cursor character (s)	2016	* C: set the cursor character (s)
1979	*/	2017	*/
1980	{	2018	{
1981	unsigned char setoldcursor;	2019	unsigned char setoldcursor;
1982	rend_t ccol1, /* Cursor colour */
1983	ccol2; /* Cursor colour2 */
1984		2020
1985	showcursor = (screen.flags & Screen_VisibleCursor);	2021	showcursor = (screen.flags & Screen_VisibleCursor);
1986	#ifdef CURSOR_BLINK	2022	#ifdef CURSOR_BLINK
1987	if (hidden_cursor)	2023	if (hidden_cursor)
1988	showcursor = 0;	2024	showcursor = 0;
…		…
1995	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2031	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1996	col--;	2032	col--;
1997		2033
1998	crp = &ROW(screen.cur.row).r[col];	2034	crp = &ROW(screen.cur.row).r[col];
1999		2035
		2036	#ifndef NO_CURSORCOLOR
		2037	cc1 = *crp & (RS_fgMask | RS_bgMask);
		2038	if (ISSET_PIXCOLOR (Color_cursor))
		2039	ccol1 = Color_cursor;
		2040	else
		2041	#endif
		2042	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2043	ccol1 = fgcolor_of (rstyle);
		2044	#else
		2045	ccol1 = Color_fg;
		2046	#endif
		2047
		2048	#ifndef NO_CURSORCOLOR
		2049	if (ISSET_PIXCOLOR (Color_cursor2))
		2050	ccol2 = Color_cursor2;
		2051	else
		2052	#endif
		2053	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2054	ccol2 = bgcolor_of (rstyle);
		2055	#else
		2056	ccol2 = Color_bg;
		2057	#endif
		2058
2000	if (showcursor && focus)	2059	if (showcursor && focus)
2001	{	2060	{
2002	if (OPTION (Opt_cursorUnderline))	2061	if (option (Opt_cursorUnderline))
2003	*crp ^= RS_Uline;	2062	*crp ^= RS_Uline;
2004	else	2063	else
2005	{	2064	{
2006	*crp ^= RS_RVid;	2065	*crp ^= RS_RVid;
2007
2008	#ifndef NO_CURSORCOLOR
2009	cc1 = *crp & (RS_fgMask | RS_bgMask);
2010	if (ISSET_PIXCOLOR (Color_cursor))
2011	ccol1 = Color_cursor;
2012	else
2013	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014	ccol1 = fgcolor_of (rstyle);
2015	#else
2016	ccol1 = Color_fg;
2017	#endif
2018	if (ISSET_PIXCOLOR (Color_cursor2))
2019	ccol2 = Color_cursor2;
2020	else
2021	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2022	ccol2 = bgcolor_of (rstyle);
2023	#else
2024	ccol2 = Color_bg;
2025	#endif
2026	*crp = SET_FGCOLOR (*crp, ccol1);	2066	*crp = SET_FGCOLOR (*crp, ccol1);
2027	*crp = SET_BGCOLOR (*crp, ccol2);	2067	*crp = SET_BGCOLOR (*crp, ccol2);
2028	#endif
2029	}	2068	}
2030	}	2069	}
2031	}	2070	}
2032		2071
2033	/* make sure no outline cursor is left around */	2072	/* make sure no outline cursor is left around */
…		…
2072	* D: CopyArea pass - very useful for slower links	2111	* D: CopyArea pass - very useful for slower links
2073	* This has been deliberately kept simple.	2112	* This has been deliberately kept simple.
2074	*/	2113	*/
2075	if (!display->is_local	2114	if (!display->is_local
2076	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2115	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077	&& abs (num_scr) < nrow && !must_clear)	2116	&& abs (num_scr) < nrow && !have_bg)
2078	{	2117	{
2079	int16_t nits;	2118	int16_t nits;
		2119	int i = num_scr;
2080	int j;	2120	int j;
2081	int len, wlen;	2121	int len, wlen;
2082	dLocal (int, num_scr);	2122	dLocal (int, num_scr);
2083		2123
2084	j = nrow;	2124	j = nrow;
2085	wlen = len = -1;	2125	wlen = len = -1;
2086	row = i > 0 ? 0 : j - 1;	2126	row = i > 0 ? 0 : j - 1;
		2127
2087	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2128	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2088	{	2129	{
2089	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2130	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2090	{	2131	{
2091	line_t s = ROW(view_start + row);	2132	line_t s = ROW(view_start + row);
…		…
2112	wlen = row;	2153	wlen = row;
2113	continue;	2154	continue;
2114	}	2155	}
2115	}	2156	}
2116		2157
2117	if (len != -1)	2158	if (len >= 0)
2118	{	2159	{
2119	/* also comes here at end if needed because of >= above */	2160	/* also comes here at end if needed because of >= above */
2120	if (wlen < len)	2161	if (wlen < len)
2121	::swap (wlen, len);	2162	::swap (wlen, len);
2122		2163
		2164	XGCValues gcv;
		2165
		2166	gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2123	XCopyArea (display->display, vt, vt,	2167	XCopyArea (dpy, vt, vt,
2124	gc, 0, Row2Pixel (len + i),	2168	gc, 0, Row2Pixel (len + i),
2125	(unsigned int)this->width,	2169	(unsigned int)this->width,
2126	(unsigned int)Height2Pixel (wlen - len + 1),	2170	(unsigned int)Height2Pixel (wlen - len + 1),
2127	0, Row2Pixel (len));	2171	0, Row2Pixel (len));
		2172	gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
		2173
2128	len = -1;	2174	len = -1;
2129	}	2175	}
2130	}	2176	}
2131	}	2177	}
2132	#endif	2178	#endif
…		…
2188	count++;	2234	count++;
2189		2235
2190	if (stp[col] != dtp[col]	2236	if (stp[col] != dtp[col]
2191	|| !RS_SAME (srp[col], drp[col]))	2237	|| !RS_SAME (srp[col], drp[col]))
2192	{	2238	{
2193	if (must_clear && (i++ > count / 2))	2239	if (have_bg && (i++ > count / 2))
2194	break;	2240	break;
2195		2241
2196	dtp[col] = stp[col];	2242	dtp[col] = stp[col];
2197	drp[col] = rend;	2243	drp[col] = rend;
2198	i = 0;	2244	i = 0;
2199	}	2245	}
2200	else if (must_clear || (stp[col] != ' ' && ++i >= 16))	2246	else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2201	break;	2247	break;
2202	}	2248	}
2203		2249
2204	col--; /* went one too far. move back */	2250	col--; /* went one too far. move back */
2205	count -= i; /* dump any matching trailing chars */	2251	count -= i; /* dump any matching trailing chars */
…		…
2215	int back = bgcolor_of (rend); // desired background	2261	int back = bgcolor_of (rend); // desired background
2216		2262
2217	// only do special processing if any attributes are set, which is unlikely	2263	// only do special processing if any attributes are set, which is unlikely
2218	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2264	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2219	{	2265	{
2220	#if ENABLE_STYLES
2221	// force redraw after "careful" characters to avoid pixel droppings
2222	if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2223	drp[col + 1] = ~srp[col + 1];
2224
2225	// include previous careful character(s) if possible, looks nicer (best effort...)
2226	while (text > stp
2227	&& srp[text - stp - 1] & RS_Careful
2228	&& RS_SAME (rend, srp[text - stp - 1]))
2229	text--, count++, xpixel -= fwidth;
2230	#endif
2231
2232	bool invert = rend & RS_RVid;	2266	bool invert = rend & RS_RVid;
2233		2267
2234	#ifndef NO_BOLD_UNDERLINE_REVERSE	2268	#ifndef NO_BOLD_UNDERLINE_REVERSE
2235	if (rend & RS_Bold
2236	&& fore == Color_fg)	2269	if (rend & RS_Bold && fore == Color_fg)
2237	{	2270	{
2238	if (ISSET_PIXCOLOR (Color_BD))	2271	if (ISSET_PIXCOLOR (Color_BD))
2239	fore = Color_BD;	2272	fore = Color_BD;
2240	# if !ENABLE_STYLES	2273	# if !ENABLE_STYLES
2241	else	2274	else
2242	invert = !invert;	2275	invert = !invert;
2243	# endif	2276	# endif
2244	}	2277	}
2245		2278
2246	if (rend & RS_Italic	2279	if (rend & RS_Italic && fore == Color_fg)
2247	&& fore == Color_fg)
2248	{	2280	{
2249	if (ISSET_PIXCOLOR (Color_IT))	2281	if (ISSET_PIXCOLOR (Color_IT))
2250	fore = Color_IT;	2282	fore = Color_IT;
2251	# if !ENABLE_STYLES	2283	# if !ENABLE_STYLES
2252	else	2284	else
2253	invert = !invert;	2285	invert = !invert;
2254	# endif	2286	# endif
2255	}	2287	}
2256		2288
2257	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))	2289	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2258	fore = Color_UL;	2290	fore = Color_UL;
2259	#endif	2291	#endif
2260		2292
2261	if (invert)	2293	if (invert)
2262	{	2294	{
		2295	#ifdef OPTION_HC
		2296	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2297	|| !ISSET_PIXCOLOR (Color_HC))
		2298	#endif
		2299	/* invert the column if no highlightColor is set or it is the
		2300	* current cursor column */
2263	::swap (fore, back);	2301	::swap (fore, back);
		2302	#ifdef OPTION_HC
		2303	else if (ISSET_PIXCOLOR (Color_HC))
		2304	back = Color_HC;
		2305	#endif
2264		2306
2265	#ifndef NO_BOLD_UNDERLINE_REVERSE	2307	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2308	# ifndef OPTION_HC
2266	if (ISSET_PIXCOLOR (Color_RV))	2309	if (ISSET_PIXCOLOR (Color_RV))
2267	back = Color_RV;	2310	back = Color_RV;
2268		2311	# endif
2269	if (fore == back)	2312	if (fore == back)
2270	{	2313	{
2271	fore = Color_bg;	2314	fore = Color_bg;
2272	back = Color_fg;	2315	back = Color_fg;
2273	}	2316	}
…		…
2275	}	2318	}
2276		2319
2277	#ifdef TEXT_BLINK	2320	#ifdef TEXT_BLINK
2278	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2321	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2279	{	2322	{
2280	if (!text_blink_ev.active)	2323	if (!text_blink_ev.is_active ())
2281	{	2324	{
2282	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	2325	text_blink_ev.again ();
2283	hidden_text = 0;	2326	hidden_text = 0;
2284	}	2327	}
2285	else if (hidden_text)	2328	else if (hidden_text)
2286	fore = back;	2329	fore = back;
2287	}	2330	}
2288	#endif	2331	#endif
		2332
		2333	#if ENABLE_STYLES
		2334	// "careful" (too wide) character handling
		2335
		2336	// include previous careful character(s) if possible, looks nicer (best effort...)
		2337	while (text > stp
		2338	&& srp[text - stp - 1] & RS_Careful
		2339	&& RS_SAME (rend, srp[text - stp - 1]))
		2340	text--, count++, xpixel -= fwidth;
		2341
		2342	// force redraw after "careful" characters to avoid pixel droppings
		2343	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2344	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2345
		2346	// force redraw before "careful" characters to avoid pixel droppings
		2347	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2348	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
		2349	#endif
2289	}	2350	}
2290		2351
2291	/*	2352	/*
2292	* Actually do the drawing of the string here	2353	* Actually do the drawing of the string here
2293	*/	2354	*/
2294	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2355	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2295		2356
2296	if (back == fore)
2297	font->clear_rect (*drawable, xpixel, ypixel,
2298	fwidth * count, fheight,
2299	back);
2300	else if (back == Color_bg)	2357	if (have_bg && back == Color_bg)
2301	{	2358	{
2302	if (must_clear)	2359	// this is very ugly, maybe push it into ->draw?
2303	{
2304	CLEAR_CHARS (xpixel, ypixel, count);
2305		2360
2306	for (i = 0; i < count; i++) /* don't draw empty strings */	2361	for (i = 0; i < count; i++) /* don't draw empty strings */
2307	if (text[i] != ' ')	2362	if (text[i] != ' ')
2308	{	2363	{
2309	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2364	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2310	break;	2365	goto did_clear;
2311	}
2312	}	2366	}
2313	else	2367
2314	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);	2368	CLEAR_CHARS (xpixel, ypixel, count);
		2369	did_clear: ;
2315	}	2370	}
2316	else	2371	else
2317	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2372	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2318		2373
2319	if (rend & RS_Uline && font->descent > 1 && fore != back)	2374	if (rend & RS_Uline && font->descent > 1 && fore != back)
2320	{	2375	{
2321	#if ENABLE_FRILLS	2376	#if ENABLE_FRILLS
2322	if (ISSET_PIXCOLOR (Color_underline))	2377	if (ISSET_PIXCOLOR (Color_underline))
2323	XSetForeground (display->display, gc, pix_colors[Color_underline]);	2378	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2324	else	2379	else
2325	#endif	2380	#endif
2326	XSetForeground (display->display, gc, pix_colors[fore]);	2381	XSetForeground (dpy, gc, pix_colors[fore]);
2327		2382
2328	XDrawLine (display->display, drawBuffer, gc,	2383	XDrawLine (dpy, drawBuffer, gc,
2329	xpixel, ypixel + font->ascent + 1,	2384	xpixel, ypixel + font->ascent + 1,
2330	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2385	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2331	}	2386	}
2332	} /* for (col....) */	2387	} /* for (col....) */
2333	} /* for (row....) */	2388	} /* for (row....) */
…		…
2342	*/	2397	*/
2343	if (showcursor)	2398	if (showcursor)
2344	{	2399	{
2345	if (focus)	2400	if (focus)
2346	{	2401	{
2347	if (OPTION (Opt_cursorUnderline))	2402	if (option (Opt_cursorUnderline))
2348	*crp ^= RS_Uline;	2403	*crp ^= RS_Uline;
2349	else	2404	else
2350	{	2405	{
2351	*crp ^= RS_RVid;	2406	*crp ^= RS_RVid;
2352	#ifndef NO_CURSORCOLOR	2407	#ifndef NO_CURSORCOLOR
…		…
2366	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2421	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2367	cursorwidth++;	2422	cursorwidth++;
2368		2423
2369	#ifndef NO_CURSORCOLOR	2424	#ifndef NO_CURSORCOLOR
2370	if (ISSET_PIXCOLOR (Color_cursor))	2425	if (ISSET_PIXCOLOR (Color_cursor))
2371	XSetForeground (display->display, gc, pix_colors[Color_cursor]);	2426	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
		2427	else
2372	#endif	2428	#endif
		2429	XSetForeground (dpy, gc, pix_colors[ccol1]);
2373		2430
2374	XDrawRectangle (display->display, drawBuffer, gc,	2431	XDrawRectangle (dpy, drawBuffer, gc,
2375	Col2Pixel (col),	2432	Col2Pixel (col),
2376	Row2Pixel (oldcursor.row),	2433	Row2Pixel (oldcursor.row),
2377	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2434	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2378	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2435	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2379	}	2436	}
…		…
2387	num_scr = 0;	2444	num_scr = 0;
2388	num_scr_allow = 1;	2445	num_scr_allow = 1;
2389	}	2446	}
2390		2447
2391	void	2448	void
2392	rxvt_term::scr_remap_chars (line_t &l)	2449	rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2393	{	2450	{
2394	if (!l.t)	2451	if (!l.t)
2395	return;	2452	return;
2396		2453
2397	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant	2454	l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
…		…
2399	for (int i = ncol; i--; )	2456	for (int i = ncol; i--; )
2400	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));	2457	l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2401	}	2458	}
2402		2459
2403	void	2460	void
2404	rxvt_term::scr_remap_chars ()	2461	rxvt_term::scr_remap_chars () NOTHROW
2405	{	2462	{
2406	for (int i = total_rows; i--; )	2463	for (int i = total_rows; i--; )
2407	scr_remap_chars (row_buf [i]);	2464	scr_remap_chars (row_buf [i]);
2408		2465
2409	for (int i = nrow; i--; )	2466	for (int i = nrow; i--; )
…		…
2412	scr_remap_chars (swap_buf [i]);	2469	scr_remap_chars (swap_buf [i]);
2413	}	2470	}
2414	}	2471	}
2415		2472
2416	void	2473	void
2417	rxvt_term::scr_recolour ()	2474	rxvt_term::scr_recolour () NOTHROW
2418	{	2475	{
2419	if (1	2476	#ifdef HAVE_BG_PIXMAP
2420	#if TRANSPARENT	2477	bgPixmap.apply ();
2421	&& !am_transparent	2478	#else
2422	#endif	2479
2423	#if XPM_BACKGROUND
2424	&& !bgPixmap.pixmap
2425	#endif
2426	)
2427	{
2428	XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);	2480	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2429	XClearWindow (display->display, parent[0]);	2481	XClearWindow (dpy, parent[0]);
2430	XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);	2482	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2483
2431	#if HAVE_SCROLLBARS	2484	# if HAVE_SCROLLBARS
2432	if (scrollBar.win)	2485	if (scrollBar.win)
2433	{	2486	{
2434	XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);	2487	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2435	scrollBar.setIdle ();	2488	scrollBar.setIdle ();
2436	scrollbar_show (0);	2489	scrollbar_show (0);
2437	}	2490	}
2438	#endif	2491	# endif
2439	}
2440		2492
2441	scr_clear ();	2493	scr_clear ();
2442	scr_touch (true);	2494	scr_touch (true);
2443	want_refresh = 1;	2495	want_refresh = 1;
2444	}
2445		2496
		2497	#endif
		2498	}
		2499
2446	/* ------------------------------------------------------------------------- */	2500	/* ------------------------------------------------------------------------- */
2447	void	2501	void
2448	rxvt_term::scr_clear (bool really)	2502	rxvt_term::scr_clear (bool really) NOTHROW
2449	{	2503	{
2450	if (!mapped)	2504	if (!mapped)
2451	return;	2505	return;
2452		2506
2453	num_scr_allow = 0;	2507	num_scr_allow = 0;
2454	want_refresh = 1;	2508	want_refresh = 1;
2455		2509
2456	if (really)	2510	if (really)
2457	XClearWindow (display->display, vt);	2511	XClearWindow (dpy, vt);
2458	}	2512	}
2459		2513
2460	void	2514	void
2461	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)	2515	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2462	{	2516	{
2463	int view_end = view_start + nrow;	2517	int view_end = view_start + nrow;
2464	int row, col;	2518	int row, col;
2465		2519
2466	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)	2520	for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
…		…
2478	srp[col] ^= rstyle2;	2532	srp[col] ^= rstyle2;
2479	}	2533	}
2480	}	2534	}
2481		2535
2482	void	2536	void
2483	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)	2537	rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2484	{	2538	{
2485	int view_end = view_start + nrow;	2539	int view_end = view_start + nrow;
2486	int row, col;	2540	int row, col;
2487		2541
2488	if (beg_row >= view_start)	2542	if (beg_row >= view_start)
…		…
2505	srp[col] ^= rstyle;	2559	srp[col] ^= rstyle;
2506	}	2560	}
2507		2561
2508	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2509	void	2563	void
2510	rxvt_term::scr_reverse_selection ()	2564	rxvt_term::scr_reverse_selection () NOTHROW
2511	{	2565	{
2512	if (selection.op	2566	if (selection.op
2513	&& current_screen == selection.screen	2567	&& current_screen == selection.screen
2514	&& selection.end.row >= view_start)	2568	&& selection.end.row >= view_start)
2515	{	2569	{
2516	#if ENABLE_FRILLS	2570	#if !ENABLE_MINIMAL
2517	if (selection.rect)	2571	if (selection.rect)
2518	scr_xor_rect (selection.beg.row, selection.beg.col,	2572	scr_xor_rect (selection.beg.row, selection.beg.col,
2519	selection.end.row, selection.end.col,	2573	selection.end.row, selection.end.col,
2520	RS_RVid, RS_RVid | RS_Uline);	2574	RS_RVid, RS_RVid | RS_Uline);
2521	else	2575	else
…		…
2531	* Dump the whole scrollback and screen to the passed filedescriptor. The	2585	* Dump the whole scrollback and screen to the passed filedescriptor. The
2532	* invoking routine must close the fd.	2586	* invoking routine must close the fd.
2533	*/	2587	*/
2534	#if 0	2588	#if 0
2535	void	2589	void
2536	rxvt_term::scr_dump (int fd)	2590	rxvt_term::scr_dump (int fd) NOTHROW
2537	{	2591	{
2538	int row, wrote;	2592	int row, wrote;
2539	unsigned int width, towrite;	2593	unsigned int width, towrite;
2540	char r1[] = "\n";	2594	char r1[] = "\n";
2541		2595
…		…
2560		2614
2561	/* ------------------------------------------------------------------------- *	2615	/* ------------------------------------------------------------------------- *
2562	* CHARACTER SELECTION *	2616	* CHARACTER SELECTION *
2563	* ------------------------------------------------------------------------- */	2617	* ------------------------------------------------------------------------- */
2564	void	2618	void
2565	rxvt_term::selection_check (int check_more)	2619	rxvt_term::selection_check (int check_more) NOTHROW
2566	{	2620	{
2567	row_col_t pos;	2621	row_col_t pos;
2568		2622
2569	if (!selection.op)	2623	if (!selection.op)
2570	return;	2624	return;
…		…
2591	/* ------------------------------------------------------------------------- */	2645	/* ------------------------------------------------------------------------- */
2592	/*	2646	/*
2593	* Paste a selection direct to the command fd	2647	* Paste a selection direct to the command fd
2594	*/	2648	*/
2595	void	2649	void
2596	rxvt_term::paste (char *data, unsigned int len)	2650	rxvt_term::paste (char *data, unsigned int len) NOTHROW
2597	{	2651	{
2598	/* convert normal newline chars into common keyboard Return key sequence */	2652	/* convert normal newline chars into common keyboard Return key sequence */
2599	for (unsigned int i = 0; i < len; i++)	2653	for (unsigned int i = 0; i < len; i++)
2600	if (data[i] == C0_LF)	2654	if (data[i] == C0_LF)
2601	data[i] = C0_CR;	2655	data[i] = C0_CR;
…		…
2607	/*	2661	/*
2608	* Respond to a notification that a primary selection has been sent	2662	* Respond to a notification that a primary selection has been sent
2609	* EXT: SelectionNotify	2663	* EXT: SelectionNotify
2610	*/	2664	*/
2611	void	2665	void
2612	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)	2666	rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2613	{	2667	{
2614	if (prop == None) /* check for failed XConvertSelection */	2668	if (prop == None) /* check for failed XConvertSelection */
2615	{	2669	{
2616	if ((selection_type & Sel_CompoundText))	2670	if ((selection_type & Sel_CompoundText))
2617	{	2671	{
…		…
2637	}	2691	}
2638		2692
2639	unsigned long bytes_after;	2693	unsigned long bytes_after;
2640	XTextProperty ct;	2694	XTextProperty ct;
2641		2695
2642	if (XGetWindowProperty (display->display, win, prop,	2696	if (XGetWindowProperty (dpy, win, prop,
2643	0, PROP_SIZE / 4,	2697	0, PROP_SIZE / 4,
2644	delete_prop, AnyPropertyType,	2698	delete_prop, AnyPropertyType,
2645	&ct.encoding, &ct.format,	2699	&ct.encoding, &ct.format,
2646	&ct.nitems, &bytes_after,	2700	&ct.nitems, &bytes_after,
2647	&ct.value) != Success)	2701	&ct.value) != Success)
…		…
2656	if (bytes_after)	2710	if (bytes_after)
2657	{	2711	{
2658	// fetch and append remaining data	2712	// fetch and append remaining data
2659	XTextProperty ct2;	2713	XTextProperty ct2;
2660		2714
2661	if (XGetWindowProperty (display->display, win, prop,	2715	if (XGetWindowProperty (dpy, win, prop,
2662	ct.nitems / 4, (bytes_after + 3) / 4,	2716	ct.nitems / 4, (bytes_after + 3) / 4,
2663	delete_prop, AnyPropertyType,	2717	delete_prop, AnyPropertyType,
2664	&ct2.encoding, &ct2.format,	2718	&ct2.encoding, &ct2.format,
2665	&ct2.nitems, &bytes_after,	2719	&ct2.nitems, &bytes_after,
2666	&ct2.value) != Success)	2720	&ct2.value) != Success)
…		…
2679		2733
2680	if (ct.encoding == xa[XA_INCR])	2734	if (ct.encoding == xa[XA_INCR])
2681	{	2735	{
2682	// INCR selection, start handshake	2736	// INCR selection, start handshake
2683	if (!delete_prop)	2737	if (!delete_prop)
2684	XDeleteProperty (display->display, win, prop);	2738	XDeleteProperty (dpy, win, prop);
2685		2739
2686	selection_wait = Sel_incr;	2740	selection_wait = Sel_incr;
2687	incr_buf_fill = 0;	2741	incr_buf_fill = 0;
2688	incr_ev.start (NOW + 10);	2742	incr_ev.start (10);
2689		2743
2690	goto bailout;	2744	goto bailout;
2691	}	2745	}
2692		2746
2693	if (ct.nitems == 0)	2747	if (ct.nitems == 0)
…		…
2702	ct.nitems = incr_buf_fill;	2756	ct.nitems = incr_buf_fill;
2703	incr_buf = 0;	2757	incr_buf = 0;
2704	incr_buf_size = 0;	2758	incr_buf_size = 0;
2705	incr_ev.stop ();	2759	incr_ev.stop ();
2706	}	2760	}
2707	else	2761	else
2708	{	2762	{
2709	if (selection_wait == Sel_normal	2763	if (selection_wait == Sel_normal
2710	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2764	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2711	{	2765	{
2712	/*	2766	/*
…		…
2719	goto bailout;	2773	goto bailout;
2720	}	2774	}
2721	}	2775	}
2722	else if (selection_wait == Sel_incr)	2776	else if (selection_wait == Sel_incr)
2723	{	2777	{
2724	incr_ev.start (NOW + 10);	2778	incr_ev.start (10);
2725		2779
2726	while (incr_buf_fill + ct.nitems > incr_buf_size)	2780	while (incr_buf_fill + ct.nitems > incr_buf_size)
2727	{	2781	{
2728	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2782	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2729	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2783	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
…		…
2736	}	2790	}
2737		2791
2738	char **cl;	2792	char **cl;
2739	int cr;	2793	int cr;
2740		2794
2741	#if ENABLE_FRILLS	2795	#if !ENABLE_MINIMAL
2742	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	2796	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2743	// so recode it manually	2797	// so recode it manually
2744	if (ct.encoding == xa[XA_UTF8_STRING])	2798	if (ct.encoding == xa[XA_UTF8_STRING])
2745	{	2799	{
2746	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2800	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
…		…
2750	paste (s, strlen (s));	2804	paste (s, strlen (s));
2751	free (s);	2805	free (s);
2752	}	2806	}
2753	else	2807	else
2754	#endif	2808	#endif
2755	if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0	2809	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2756	&& cl)	2810	&& cl)
2757	{	2811	{
2758	for (int i = 0; i < cr; i++)	2812	for (int i = 0; i < cr; i++)
2759	paste (cl[i], strlen (cl[i]));	2813	paste (cl[i], strlen (cl[i]));
2760		2814
…		…
2769	if (selection_wait == Sel_normal)	2823	if (selection_wait == Sel_normal)
2770	selection_wait = Sel_none;	2824	selection_wait = Sel_none;
2771	}	2825	}
2772		2826
2773	void	2827	void
2774	rxvt_term::incr_cb (time_watcher &w)	2828	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2775	{	2829	{
2776	selection_wait = Sel_none;	2830	selection_wait = Sel_none;
2777		2831
2778	incr_buf_size = 0;	2832	incr_buf_size = 0;
2779	free (incr_buf);	2833	free (incr_buf);
2780		2834
2781	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");	2835	rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2782	}	2836	}
2783		2837
2784	void	2838	void
2785	rxvt_term::selection_property (Window win, Atom prop)	2839	rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2786	{	2840	{
2787	if (prop == None || selection_wait != Sel_incr)	2841	if (prop == None || selection_wait != Sel_incr)
2788	return;	2842	return;
2789		2843
2790	selection_paste (win, prop, true);	2844	selection_paste (win, prop, true);
2791	}	2845	}
2792		2846
2793	/* ------------------------------------------------------------------------- */	2847	/* ------------------------------------------------------------------------- */
2794	/*	2848	/*
2795	* Request the current selection:	2849	* Request the current selection:
2796	* Order: > internal selection if available	2850	* Order: > internal selection if available
2797	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2851	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2798	* > CUT_BUFFER0	2852	* > CUT_BUFFER0
2799	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2853	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2800	* will auto fallback to CUT_BUFFER0	2854	* will auto fallback to CUT_BUFFER0
2801	* EXT: button 2 release	2855	* EXT: button 2 release
2802	*/	2856	*/
2803	void	2857	void
2804	rxvt_term::selection_request (Time tm)	2858	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2805	{	2859	{
2806	if (selection.text)	2860	if (selection.text && selnum == Sel_Primary)
		2861	{
2807	{ /* internal selection */	2862	/* internal selection */
2808	char *str = rxvt_wcstombs (selection.text, selection.len);	2863	char *str = rxvt_wcstombs (selection.text, selection.len);
2809	paste (str, strlen (str));	2864	paste (str, strlen (str));
2810	free (str);	2865	free (str);
2811	return;	2866	return;
2812	}	2867	}
2813	else	2868	else
2814	{	2869	{
2815	int i;
2816
2817	selection_request_time = tm;	2870	selection_request_time = tm;
2818	selection_wait = Sel_normal;	2871	selection_wait = Sel_normal;
2819		2872
2820	for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2821	{
2822	#if X_HAVE_UTF8_STRING	2873	#if X_HAVE_UTF8_STRING
2823	selection_type = Sel_UTF8String;	2874	selection_type = Sel_UTF8String;
2824	if (selection_request_other (xa[XA_UTF8_STRING], i))	2875	if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2825	return;	2876	return;
2826	#else	2877	#else
2827	selection_type = Sel_CompoundText;	2878	selection_type = Sel_CompoundText;
2828	if (selection_request_other (xa[XA_COMPOUND_TEXT], i))	2879	if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2829	return;	2880	return;
2830	#endif	2881	#endif
2831	}
2832	}	2882	}
2833		2883
2834	selection_wait = Sel_none; /* don't loop in selection_paste () */	2884	selection_wait = Sel_none; /* don't loop in selection_paste () */
2835	selection_paste (display->root, XA_CUT_BUFFER0, false);	2885	selection_paste (display->root, XA_CUT_BUFFER0, false);
2836	}	2886	}
2837		2887
2838	int	2888	int
2839	rxvt_term::selection_request_other (Atom target, int selnum)	2889	rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2840	{	2890	{
2841	Atom sel;	2891	Atom sel;
2842		2892
2843	selection_type |= selnum;	2893	selection_type |= selnum;
2844		2894
…		…
2847	else if (selnum == Sel_Secondary)	2897	else if (selnum == Sel_Secondary)
2848	sel = XA_SECONDARY;	2898	sel = XA_SECONDARY;
2849	else	2899	else
2850	sel = xa[XA_CLIPBOARD];	2900	sel = xa[XA_CLIPBOARD];
2851		2901
2852	if (XGetSelectionOwner (display->display, sel) != None)	2902	if (XGetSelectionOwner (dpy, sel) != None)
2853	{	2903	{
2854	XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],	2904	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2855	vt, selection_request_time);	2905	vt, selection_request_time);
2856	return 1;	2906	return 1;
2857	}	2907	}
2858		2908
2859	return 0;	2909	return 0;
…		…
2863	/*	2913	/*
2864	* Clear all selected text	2914	* Clear all selected text
2865	* EXT: SelectionClear	2915	* EXT: SelectionClear
2866	*/	2916	*/
2867	void	2917	void
2868	rxvt_term::selection_clear ()	2918	rxvt_term::selection_clear () NOTHROW
2869	{	2919	{
2870	want_refresh = 1;	2920	want_refresh = 1;
2871	free (selection.text);	2921	free (selection.text);
2872	selection.text = NULL;	2922	selection.text = NULL;
2873	selection.len = 0;	2923	selection.len = 0;
2874	CLEAR_SELECTION ();	2924	CLEAR_SELECTION ();
2875		2925
2876	if (display->selection_owner == this)	2926	if (display->selection_owner == this)
2877	display->selection_owner = 0;	2927	display->selection_owner = 0;
		2928
		2929	flush ();
2878	}	2930	}
2879		2931
2880	/* ------------------------------------------------------------------------- */	2932	/* ------------------------------------------------------------------------- */
2881	/*	2933	/*
2882	* Copy a selection into the cut buffer	2934	* Copy a selection into the cut buffer
…		…
2922		2974
2923	int end_col;	2975	int end_col;
2924		2976
2925	for (; row <= selection.end.row; row++, col = 0)	2977	for (; row <= selection.end.row; row++, col = 0)
2926	{	2978	{
2927	#if ENABLE_FRILLS	2979	#if !ENABLE_MINIMAL
2928	if (selection.rect)	2980	if (selection.rect)
2929	{	2981	{
2930	col = selection.beg.col;	2982	col = selection.beg.col;
2931	end_col = ncol + 1;	2983	end_col = ncol + 1;
2932	}	2984	}
…		…
2935	end_col = ROW(row).l;	2987	end_col = ROW(row).l;
2936		2988
2937	col = max (col, 0);	2989	col = max (col, 0);
2938		2990
2939	if (row == selection.end.row	2991	if (row == selection.end.row
2940	#if ENABLE_FRILLS	2992	#if !ENABLE_MINIMAL
2941	|| selection.rect	2993	|| selection.rect
2942	#endif	2994	#endif
2943	)	2995	)
2944	min_it (end_col, selection.end.col);	2996	min_it (end_col, selection.end.col);
2945		2997
…		…
2968	#endif	3020	#endif
2969	else	3021	else
2970	new_selection_text[ofs++] = *t++;	3022	new_selection_text[ofs++] = *t++;
2971	}	3023	}
2972		3024
2973	#if ENABLE_FRILLS	3025	#if !ENABLE_MINIMAL
2974	if (selection.rect)	3026	if (selection.rect)
2975	{	3027	{
2976	while (ofs	3028	while (ofs
2977	&& new_selection_text[ofs - 1] != C0_LF	3029	&& new_selection_text[ofs - 1] != C0_LF
2978	&& unicode::is_space (new_selection_text[ofs - 1]))	3030	&& unicode::is_space (new_selection_text[ofs - 1]))
…		…
3008		3060
3009	selection_grab (tm);	3061	selection_grab (tm);
3010	}	3062	}
3011		3063
3012	bool	3064	bool
3013	rxvt_term::selection_grab (Time tm)	3065	rxvt_term::selection_grab (Time tm) NOTHROW
3014	{	3066	{
3015	selection_time = tm;	3067	selection_time = tm;
3016		3068
3017	XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);	3069	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3018	if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)	3070	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3019	{	3071	{
3020	display->set_selection_owner (this);	3072	display->set_selection_owner (this);
3021	return true;	3073	return true;
3022	}	3074	}
3023	else	3075	else
…		…
3027	}	3079	}
3028		3080
3029	#if 0	3081	#if 0
3030	XTextProperty ct;	3082	XTextProperty ct;
3031		3083
3032	if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)	3084	if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3033	{	3085	{
3034	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3086	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3035	XFree (ct.value);	3087	XFree (ct.value);
3036	}	3088	}
3037	#endif	3089	#endif
…		…
3041	/*	3093	/*
3042	* Mark or select text based upon number of clicks: 1, 2, or 3	3094	* Mark or select text based upon number of clicks: 1, 2, or 3
3043	* EXT: button 1 press	3095	* EXT: button 1 press
3044	*/	3096	*/
3045	void	3097	void
3046	rxvt_term::selection_click (int clicks, int x, int y)	3098	rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3047	{	3099	{
3048	clicks = ((clicks - 1) % 3) + 1;	3100	clicks = ((clicks - 1) % 3) + 1;
3049	selection.clicks = clicks; /* save clicks so extend will work */	3101	selection.clicks = clicks; /* save clicks so extend will work */
3050		3102
3051	if (clicks == 2 && !selection.rect	3103	if (clicks == 2 && !selection.rect
…		…
3070	/* ------------------------------------------------------------------------- */	3122	/* ------------------------------------------------------------------------- */
3071	/*	3123	/*
3072	* Mark a selection at the specified col/row	3124	* Mark a selection at the specified col/row
3073	*/	3125	*/
3074	void	3126	void
3075	rxvt_term::selection_start_colrow (int col, int row)	3127	rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3076	{	3128	{
3077	want_refresh = 1;	3129	want_refresh = 1;
3078		3130
3079	selection.mark.row = row + view_start;	3131	selection.mark.row = row + view_start;
3080	selection.mark.col = col;	3132	selection.mark.col = col;
…		…
3083	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3135	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3084		3136
3085	while (selection.mark.col > 0	3137	while (selection.mark.col > 0
3086	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3138	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3087	--selection.mark.col;	3139	--selection.mark.col;
3088		3140
3089	if (selection.op)	3141	if (selection.op)
		3142	{
3090	{ /* clear the old selection */	3143	/* clear the old selection */
3091	selection.beg.row = selection.end.row = selection.mark.row;	3144	selection.beg.row = selection.end.row = selection.mark.row;
3092	selection.beg.col = selection.end.col = selection.mark.col;	3145	selection.beg.col = selection.end.col = selection.mark.col;
3093	}	3146	}
3094		3147
3095	selection.op = SELECTION_INIT;	3148	selection.op = SELECTION_INIT;
…		…
3106	#define DELIMIT_TEXT(x) \	3159	#define DELIMIT_TEXT(x) \
3107	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3160	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3108	#define DELIMIT_REND(x) 1	3161	#define DELIMIT_REND(x) 1
3109		3162
3110	void	3163	void
3111	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)	3164	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3112	{	3165	{
3113	int col, row, dirnadd, tcol, trow, w1, w2;	3166	int col, row, dirnadd, tcol, trow, w1, w2;
3114	row_col_t bound;	3167	row_col_t bound;
3115	text_t *stp;	3168	text_t *stp;
3116	rend_t *srp;	3169	rend_t *srp;
…		…
3190	* flag == 0 ==> button 1	3243	* flag == 0 ==> button 1
3191	* flag == 1 ==> button 3 press	3244	* flag == 1 ==> button 3 press
3192	* flag == 2 ==> button 3 motion	3245	* flag == 2 ==> button 3 motion
3193	*/	3246	*/
3194	void	3247	void
3195	rxvt_term::selection_extend (int x, int y, int flag)	3248	rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3196	{	3249	{
3197	int col = clamp (Pixel2Col (x), 0, ncol);	3250	int col = clamp (Pixel2Col (x), 0, ncol);
3198	int row = clamp (Pixel2Row (y), 0, nrow - 1);	3251	int row = clamp (Pixel2Row (y), 0, nrow - 1);
3199		3252
3200	/*	3253	/*
…		…
3226	/* ------------------------------------------------------------------------- */	3279	/* ------------------------------------------------------------------------- */
3227	/*	3280	/*
3228	* Extend the selection to the specified col/row	3281	* Extend the selection to the specified col/row
3229	*/	3282	*/
3230	void	3283	void
3231	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)	3284	rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3232	{	3285	{
3233	row_col_t pos;	3286	row_col_t pos;
3234	enum {	3287	enum {
3235	LEFT, RIGHT	3288	LEFT, RIGHT
3236	} closeto = RIGHT;	3289	} closeto = RIGHT;
…		…
3284	* a point/word/line which is either the start or end of the selection	3337	* a point/word/line which is either the start or end of the selection
3285	* and it was decided by whichever point/word/line was `fixed' at the	3338	* and it was decided by whichever point/word/line was `fixed' at the
3286	* time of the most recent button3 press	3339	* time of the most recent button3 press
3287	*/	3340	*/
3288	if (button3 && buttonpress)	3341	if (button3 && buttonpress)
		3342	{
3289	{ /* button3 press */	3343	/* button3 press */
3290	/*	3344	/*
3291	* first determine which edge of the selection we are closest to	3345	* first determine which edge of the selection we are closest to
3292	*/	3346	*/
3293	if (ROWCOL_IS_BEFORE (pos, selection.beg)	3347	if (ROWCOL_IS_BEFORE (pos, selection.beg)
3294	|| (!ROWCOL_IS_AFTER (pos, selection.end)	3348	|| (!ROWCOL_IS_AFTER (pos, selection.end)
…		…
3312	selection.mark.row = selection.beg.row;	3366	selection.mark.row = selection.beg.row;
3313	selection.mark.col = selection.beg.col;	3367	selection.mark.col = selection.beg.col;
3314	}	3368	}
3315	}	3369	}
3316	else	3370	else
		3371	{
3317	{ /* button1 drag or button3 drag */	3372	/* button1 drag or button3 drag */
3318	if (ROWCOL_IS_AFTER (selection.mark, pos))	3373	if (ROWCOL_IS_AFTER (selection.mark, pos))
3319	{	3374	{
3320	if (selection.mark.row == selection.end.row	3375	if (selection.mark.row == selection.end.row
3321	&& selection.mark.col == selection.end.col	3376	&& selection.mark.col == selection.end.col
3322	&& clickchange	3377	&& clickchange
…		…
3339		3394
3340	if (selection.clicks == 1)	3395	if (selection.clicks == 1)
3341	{	3396	{
3342	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN	3397	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3343	&& !ROW(selection.beg.row).is_longer ()	3398	&& !ROW(selection.beg.row).is_longer ()
3344	#if ENABLE_FRILLS	3399	#if !ENABLE_MINIMAL
3345	&& !selection.rect	3400	&& !selection.rect
3346	#endif	3401	#endif
3347	)	3402	)
3348	selection.beg.col = ncol;	3403	selection.beg.col = ncol;
3349		3404
3350	if (	3405	if (
3351	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN	3406	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3352	&& !ROW(selection.end.row).is_longer ()	3407	&& !ROW(selection.end.row).is_longer ()
3353	#if ENABLE_FRILLS	3408	#if !ENABLE_MINIMAL
3354	&& !selection.rect	3409	&& !selection.rect
3355	#endif	3410	#endif
3356	)	3411	)
3357	selection.end.col = ncol;	3412	selection.end.col = ncol;
3358	}	3413	}
…		…
3365	selection_delimit_word (DN, &selection.end, &selection.end);	3420	selection_delimit_word (DN, &selection.end, &selection.end);
3366	}	3421	}
3367	else if (selection.clicks == 3)	3422	else if (selection.clicks == 3)
3368	{	3423	{
3369	#if ENABLE_FRILLS	3424	#if ENABLE_FRILLS
3370	if (OPTION (Opt_tripleclickwords))	3425	if (option (Opt_tripleclickwords))
3371	{	3426	{
3372	selection_delimit_word (UP, &selection.beg, &selection.beg);	3427	selection_delimit_word (UP, &selection.beg, &selection.beg);
3373		3428
3374	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3429	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3375	{	3430	{
3376	if (!ROW(end_row).is_longer ())	3431	if (!ROW(end_row).is_longer ())
3377	{	3432	{
3378	selection.end.row = end_row;	3433	selection.end.row = end_row;
3379	selection.end.col = ROW(end_row).l;	3434	selection.end.col = ROW(end_row).l;
		3435	# if !ENABLE_MINIMAL
3380	selection_remove_trailing_spaces ();	3436	selection_remove_trailing_spaces ();
		3437	# endif
3381	break;	3438	break;
3382	}	3439	}
3383	}	3440	}
3384	}	3441	}
3385	else	3442	else
…		…
3401	selection.end.row++;	3458	selection.end.row++;
3402	}	3459	}
3403	}	3460	}
3404		3461
3405	if (button3 && buttonpress)	3462	if (button3 && buttonpress)
		3463	{
3406	{ /* mark may need to be changed */	3464	/* mark may need to be changed */
3407	if (closeto == LEFT)	3465	if (closeto == LEFT)
3408	{	3466	{
3409	selection.mark.row = selection.end.row;	3467	selection.mark.row = selection.end.row;
3410	selection.mark.col = selection.end.col - (selection.clicks == 2);	3468	selection.mark.col = selection.end.col - (selection.clicks == 2);
3411	}	3469	}
…		…
3414	selection.mark.row = selection.beg.row;	3472	selection.mark.row = selection.beg.row;
3415	selection.mark.col = selection.beg.col;	3473	selection.mark.col = selection.beg.col;
3416	}	3474	}
3417	}	3475	}
3418		3476
3419	#if ENABLE_FRILLS	3477	#if !ENABLE_MINIMAL
3420	if (selection.rect && selection.beg.col > selection.end.col)	3478	if (selection.rect && selection.beg.col > selection.end.col)
3421	::swap (selection.beg.col, selection.end.col);	3479	::swap (selection.beg.col, selection.end.col);
3422	#endif	3480	#endif
3423	}	3481	}
3424		3482
3425	#if ENABLE_FRILLS	3483	#if !ENABLE_MINIMAL
3426	void	3484	void
3427	rxvt_term::selection_remove_trailing_spaces ()	3485	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3428	{	3486	{
3429	int32_t end_col, end_row;	3487	int32_t end_col, end_row;
3430	text_t *stp;	3488	text_t *stp;
3431		3489
3432	end_col = selection.end.col;	3490	end_col = selection.end.col;
…		…
3470	/*	3528	/*
3471	* Double click on button 3 when already selected	3529	* Double click on button 3 when already selected
3472	* EXT: button 3 double click	3530	* EXT: button 3 double click
3473	*/	3531	*/
3474	void	3532	void
3475	rxvt_term::selection_rotate (int x, int y)	3533	rxvt_term::selection_rotate (int x, int y) NOTHROW
3476	{	3534	{
3477	selection.clicks = selection.clicks % 3 + 1;	3535	selection.clicks = selection.clicks % 3 + 1;
3478	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);	3536	selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3479	}	3537	}
3480		3538
…		…
3482	/*	3540	/*
3483	* Respond to a request for our current selection	3541	* Respond to a request for our current selection
3484	* EXT: SelectionRequest	3542	* EXT: SelectionRequest
3485	*/	3543	*/
3486	void	3544	void
3487	rxvt_term::selection_send (const XSelectionRequestEvent &rq)	3545	rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3488	{	3546	{
3489	XSelectionEvent ev;	3547	XSelectionEvent ev;
3490	dDisp;
3491		3548
3492	ev.type = SelectionNotify;	3549	ev.type = SelectionNotify;
3493	ev.property = None;	3550	ev.property = None;
3494	ev.display = rq.display;	3551	ev.display = rq.display;
3495	ev.requestor = rq.requestor;	3552	ev.requestor = rq.requestor;
…		…
3509	*target++ = xa[XA_COMPOUND_TEXT];	3566	*target++ = xa[XA_COMPOUND_TEXT];
3510	#if X_HAVE_UTF8_STRING	3567	#if X_HAVE_UTF8_STRING
3511	*target++ = xa[XA_UTF8_STRING];	3568	*target++ = xa[XA_UTF8_STRING];
3512	#endif	3569	#endif
3513		3570
3514	XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,	3571	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3515	32, PropModeReplace,	3572	32, PropModeReplace,
3516	(unsigned char *)target_list, target - target_list);	3573	(unsigned char *)target_list, target - target_list);
3517	ev.property = rq.property;	3574	ev.property = rq.property;
3518	}	3575	}
3519	#if TODO // TODO	3576	#if TODO // TODO
…		…
3522	/* TODO: Handle MULTIPLE */	3579	/* TODO: Handle MULTIPLE */
3523	}	3580	}
3524	#endif	3581	#endif
3525	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3582	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3526	{	3583	{
3527	XChangeProperty (disp, rq.requestor, rq.property, rq.target,	3584	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3528	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3585	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3529	ev.property = rq.property;	3586	ev.property = rq.property;
3530	}	3587	}
3531	else if (rq.target == XA_STRING	3588	else if (rq.target == XA_STRING
3532	|| rq.target == xa[XA_TEXT]	3589	|| rq.target == xa[XA_TEXT]
…		…
3556	style = enc_string;	3613	style = enc_string;
3557	else if (target == xa[XA_TEXT])	3614	else if (target == xa[XA_TEXT])
3558	style = enc_text;	3615	style = enc_text;
3559	else if (target == xa[XA_COMPOUND_TEXT])	3616	else if (target == xa[XA_COMPOUND_TEXT])
3560	style = enc_compound_text;	3617	style = enc_compound_text;
3561	#if ENABLE_FRILLS	3618	#if !ENABLE_MINIMAL
3562	else if (target == xa[XA_UTF8_STRING])	3619	else if (target == xa[XA_UTF8_STRING])
3563	style = enc_utf8;	3620	style = enc_utf8;
3564	#endif	3621	#endif
3565	else	3622	else
3566	{	3623	{
…		…
3577	{	3634	{
3578	cl = L"";	3635	cl = L"";
3579	selectlen = 0;	3636	selectlen = 0;
3580	}	3637	}
3581		3638
3582	#if ENABLE_FRILLS	3639	#if !ENABLE_MINIMAL
3583	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3640	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3584	// so recode it manually	3641	// so recode it manually
3585	if (style == enc_utf8)	3642	if (style == enc_utf8)
3586	{	3643	{
3587	freect = 1;	3644	freect = 1;
…		…
3590	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3647	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3591	ct.nitems = strlen ((char *)ct.value);	3648	ct.nitems = strlen ((char *)ct.value);
3592	}	3649	}
3593	else	3650	else
3594	#endif	3651	#endif
3595	if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3652	if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3596	freect = 1;	3653	freect = 1;
3597	else	3654	else
3598	{	3655	{
3599	/* if we failed to convert then send it raw */	3656	/* if we failed to convert then send it raw */
3600	ct.value = (unsigned char *)cl;	3657	ct.value = (unsigned char *)cl;
3601	ct.nitems = selectlen;	3658	ct.nitems = selectlen;
3602	ct.encoding = target;	3659	ct.encoding = target;
3603	}	3660	}
3604		3661
3605	XChangeProperty (disp, rq.requestor, rq.property,	3662	XChangeProperty (dpy, rq.requestor, rq.property,
3606	ct.encoding, 8, PropModeReplace,	3663	ct.encoding, 8, PropModeReplace,
3607	ct.value, (int)ct.nitems);	3664	ct.value, (int)ct.nitems);
3608	ev.property = rq.property;	3665	ev.property = rq.property;
3609		3666
3610	if (freect)	3667	if (freect)
3611	XFree (ct.value);	3668	XFree (ct.value);
3612	}	3669	}
3613		3670
3614	XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);	3671	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3615	}
3616
3617	/* ------------------------------------------------------------------------- *
3618	* MOUSE ROUTINES *
3619	* ------------------------------------------------------------------------- */
3620
3621	/*
3622	* return col/row values corresponding to x/y pixel values
3623	*/
3624	void
3625	rxvt_term::pixel_position (int *x, int *y)
3626	{
3627	*x = Pixel2Col (*x);
3628	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3629	*y = Pixel2Row (*y);
3630	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3631	}	3672	}
3632		3673
3633	/* ------------------------------------------------------------------------- */	3674	/* ------------------------------------------------------------------------- */
3634	#ifdef USE_XIM	3675	#ifdef USE_XIM
3635	void	3676	void
3636	rxvt_term::im_set_position (XPoint &pos)	3677	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3637	{	3678	{
3638	XWindowAttributes xwa;	3679	XWindowAttributes xwa;
3639		3680
3640	XGetWindowAttributes (display->display, vt, &xwa);	3681	XGetWindowAttributes (dpy, vt, &xwa);
3641		3682
3642	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3683	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3643	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3684	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3644	}	3685	}
3645	#endif	3686	#endif
3646		3687
3647	#if ENABLE_OVERLAY	3688	#if ENABLE_OVERLAY
3648	void	3689	void
3649	rxvt_term::scr_overlay_new (int x, int y, int w, int h)	3690	rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3650	{	3691	{
3651	if (nrow < 1 || ncol < 1)	3692	if (nrow < 1 || ncol < 1)
3652	return;	3693	return;
3653		3694
3654	want_refresh = 1;	3695	want_refresh = 1;
…		…
3699	*rp = r;	3740	*rp = r;
3700	}	3741	}
3701	}	3742	}
3702		3743
3703	void	3744	void
3704	rxvt_term::scr_overlay_off ()	3745	rxvt_term::scr_overlay_off () NOTHROW
3705	{	3746	{
3706	if (!ov_text)	3747	if (!ov_text)
3707	return;	3748	return;
3708		3749
3709	want_refresh = 1;	3750	want_refresh = 1;
…		…
3717	delete [] ov_text; ov_text = 0;	3758	delete [] ov_text; ov_text = 0;
3718	delete [] ov_rend; ov_rend = 0;	3759	delete [] ov_rend; ov_rend = 0;
3719	}	3760	}
3720		3761
3721	void	3762	void
3722	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)	3763	rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3723	{	3764	{
3724	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)	3765	if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3725	return;	3766	return;
3726		3767
3727	x++, y++;	3768	x++, y++;
…		…
3729	ov_text[y][x] = text;	3770	ov_text[y][x] = text;
3730	ov_rend[y][x] = rend;	3771	ov_rend[y][x] = rend;
3731	}	3772	}
3732		3773
3733	void	3774	void
3734	rxvt_term::scr_overlay_set (int x, int y, const char *s)	3775	rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3735	{	3776	{
3736	while (*s)	3777	while (*s)
3737	scr_overlay_set (x++, y, *s++);	3778	scr_overlay_set (x++, y, *s++);
3738	}	3779	}
3739		3780
3740	void	3781	void
3741	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)	3782	rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3742	{	3783	{
3743	while (*s)	3784	while (*s)
3744	{	3785	{
3745	text_t t = *s++;	3786	text_t t = *s++;
3746	int width = wcwidth (t);	3787	int width = WCWIDTH (t);
3747		3788
3748	while (width--)	3789	while (width--)
3749	{	3790	{
3750	scr_overlay_set (x++, y, t);	3791	scr_overlay_set (x++, y, t);
3751	t = NOCHAR;	3792	t = NOCHAR;
3752	}	3793	}
3753	}	3794	}
3754	}	3795	}
3755		3796
3756	void	3797	void
3757	rxvt_term::scr_swap_overlay ()	3798	rxvt_term::scr_swap_overlay () NOTHROW
3758	{	3799	{
3759	if (!ov_text)	3800	if (!ov_text)
3760	return;	3801	return;
3761		3802
3762	// swap screen mem with overlay	3803	// swap screen mem with overlay

Diff Legend

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