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

Diff Legend

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