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.234 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.268 by root, Tue May 1 21:30:01 2007 UTC

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

Diff Legend

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