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.255 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.310 by root, Wed Jul 23 17:10:07 2008 UTC

1	/*--------------------------------*-C-*--------------------------------------*	1	/*---------------------------------------------------------------------------*
2	* File: screen.C	2	* File: screen.C
3	*---------------------------------------------------------------------------*	3	*---------------------------------------------------------------------------*
4	*	4	*
5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>	5	* Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	6	* Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
…		…
26		26
27	#include "../config.h" /* NECESSARY */	27	#include "../config.h" /* NECESSARY */
28	#include "rxvt.h" /* NECESSARY */	28	#include "rxvt.h" /* NECESSARY */
29	#include "rxvtperl.h" /* NECESSARY */	29	#include "rxvtperl.h" /* NECESSARY */
30		30
31	#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33	#include <inttypes.h>	31	#include <inttypes.h>
34		32
35	#include "salloc.C" // HACK, should be a seperate compile!	33	#include "salloc.C" // HACK, should be a seperate compile!
36		34
37	inline void fill_text (text_t *start, text_t value, int len)	35	static inline void fill_text (text_t *start, text_t value, int len)
38	{	36	{
39	while (len--)	37	while (len--)
40	*start++ = value;	38	*start++ = value;
41	}	39	}
42		40
…		…
47		45
48	/* ------------------------------------------------------------------------- *	46	/* ------------------------------------------------------------------------- *
49	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *	47	* GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50	* ------------------------------------------------------------------------- */	48	* ------------------------------------------------------------------------- */
51	#define ZERO_SCROLLBACK() \	49	#define ZERO_SCROLLBACK() \
52	if (OPTION (Opt_scrollTtyOutput)) \	50	if (option (Opt_scrollTtyOutput)) \
53	view_start = 0	51	view_start = 0
54	#define CLEAR_SELECTION() \	52	#define CLEAR_SELECTION() \
55	selection.beg.row = selection.beg.col \	53	selection.beg.row = selection.beg.col \
56	= selection.end.row = selection.end.col = 0	54	= selection.end.row = selection.end.col = 0
57	#define CLEAR_ALL_SELECTION() \	55	#define CLEAR_ALL_SELECTION() \
…		…
85	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)	83	ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \	84	#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)	85	ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88		86
89	/*	87	/*
90	* CLEAR_ROWS : clear <num> rows starting from row <row>
91	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>	88	* CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92	* ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93	*/	89	*/
94	#define drawBuffer vt
95
96	#define CLEAR_ROWS(row, num) \
97	if (mapped) \
98	XClearArea (xdisp, drawBuffer, 0, \
99	Row2Pixel (row), (unsigned int)width, \
100	(unsigned int)Height2Pixel (num), False)
101
102	#define CLEAR_CHARS(x, y, num) \	90	#define CLEAR_CHARS(x, y, num) \
103	if (mapped) \	91	if (mapped) \
104	XClearArea (xdisp, drawBuffer, x, y, \	92	XClearArea (dpy, vt, x, y, \
105	(unsigned int)Width2Pixel (num), \	93	(unsigned int)Width2Pixel (num), \
106	(unsigned int)Height2Pixel (1), False)	94	(unsigned int)Height2Pixel (1), False)
107
108	#define ERASE_ROWS(row, num) \
109	XFillRectangle (xdisp, drawBuffer, gc, \
110	0, Row2Pixel (row), \
111	(unsigned int)width, \
112	(unsigned int)Height2Pixel (num))
113		95
114	/* ------------------------------------------------------------------------- *	96	/* ------------------------------------------------------------------------- *
115	* SCREEN `COMMON' ROUTINES *	97	* SCREEN `COMMON' ROUTINES *
116	* ------------------------------------------------------------------------- */	98	* ------------------------------------------------------------------------- */
117		99
…		…
161	{	143	{
162	#if ENABLE_OVERLAY	144	#if ENABLE_OVERLAY
163	scr_overlay_off ();	145	scr_overlay_off ();
164	#endif	146	#endif
165		147
		148	rvideo_mode = false;
166	view_start = 0;	149	view_start = 0;
167	num_scr = 0;	150	num_scr = 0;
168		151
169	if (ncol == 0)	152	if (ncol == 0)
170	ncol = 80;	153	ncol = 80;
…		…
237	selection.text = NULL;	220	selection.text = NULL;
238	selection.len = 0;	221	selection.len = 0;
239	selection.op = SELECTION_CLEAR;	222	selection.op = SELECTION_CLEAR;
240	selection.screen = PRIMARY;	223	selection.screen = PRIMARY;
241	selection.clicks = 0;	224	selection.clicks = 0;
242	rvideo_state = rvideo_mode = false;
243	}	225	}
244	else	226	else
245	{	227	{
246	/*	228	/*
247	* add or delete rows as appropriate	229	* add or delete rows as appropriate
…		…
276	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);	258	drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277	}	259	}
278		260
279	line_t *old_buf = row_buf;	261	line_t *old_buf = row_buf;
280	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));	262	row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281		263
282	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	264	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283	int pend = MOD (term_start + top_row , prev_total_rows);	265	int pend = MOD (term_start + top_row , prev_total_rows);
284	int q = total_rows; // rewrapped row	266	int q = total_rows; // rewrapped row
285		267
286	if (top_row)	268	if (top_row)
…		…
330	int qcol = 0;	312	int qcol = 0;
331		313
332	// see below for cursor adjustment rationale	314	// see below for cursor adjustment rationale
333	if (p == ocur.row)	315	if (p == ocur.row)
334	screen.cur.row = q - (total_rows - nrow);	316	screen.cur.row = q - (total_rows - nrow);
335		317
336	// fill a single destination line	318	// fill a single destination line
337	while (lofs < llen && qcol < ncol)	319	while (lofs < llen && qcol < ncol)
338	{	320	{
339	int prow = lofs / prev_ncol;	321	int prow = lofs / prev_ncol;
340	int pcol = lofs % prev_ncol;	322	int pcol = lofs % prev_ncol;
…		…
366	}	348	}
367	while (p != pend && q > 0);	349	while (p != pend && q > 0);
368		350
369	term_start = total_rows - nrow;	351	term_start = total_rows - nrow;
370	top_row = q - term_start;	352	top_row = q - term_start;
371		353
372	// make sure all terminal lines exist	354	// make sure all terminal lines exist
373	while (top_row > 0)	355	while (top_row > 0)
374	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);	356	scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375	}	357	}
376	else	358	else
377	{	359	{
378	// if no scrollback exists (yet), wing, instead of wrap	360	// if no scrollback exists (yet), wing, instead of wrap
379		361
380	for (int row = min (nrow, prev_nrow); row--; )	362	for (int row = min (nrow, prev_nrow); row--; )
381	{	363	{
382	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];	364	line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383	line_t &qline = row_buf [row];	365	line_t &qline = row_buf [row];
384		366
…		…
407	CLEAR_ALL_SELECTION ();	389	CLEAR_ALL_SELECTION ();
408		390
409	prev_nrow = nrow;	391	prev_nrow = nrow;
410	prev_ncol = ncol;	392	prev_ncol = ncol;
411		393
412	tabs = (char *)rxvt_malloc (ncol * sizeof (char));	394	tabs = (char *)rxvt_malloc (ncol);
413		395
414	for (int col = ncol; col--; )	396	for (int col = ncol; --col; )
415	tabs [col] = col % TABSIZE == 0;	397	tabs [col] = col % TABSIZE == 0;
416		398
417	if (current_screen != PRIMARY)	399	if (current_screen != PRIMARY)
418	scr_swap_screen ();	400	scr_swap_screen ();
419		401
…		…
510	}	492	}
511		493
512	void	494	void
513	rxvt_term::scr_swap_screen ()	495	rxvt_term::scr_swap_screen ()
514	{	496	{
515	if (!OPTION (Opt_secondaryScreen))	497	if (!option (Opt_secondaryScreen))
516	return;	498	return;
517		499
518	for (int i = prev_nrow; i--; )	500	for (int i = prev_nrow; i--; )
519	::swap (ROW(i), swap_buf [i]);	501	::swap (ROW(i), swap_buf [i]);
520		502
…		…
542	selection_check (2); /* check for boundary cross */	524	selection_check (2); /* check for boundary cross */
543		525
544	int i = current_screen; current_screen = scrn; scrn = i;	526	int i = current_screen; current_screen = scrn; scrn = i;
545		527
546	#if NSCREENS	528	#if NSCREENS
547	if (OPTION (Opt_secondaryScreen))	529	if (option (Opt_secondaryScreen))
548	{	530	{
549	num_scr = 0;	531	num_scr = 0;
550		532
551	scr_swap_screen ();	533	scr_swap_screen ();
552		534
…		…
555	screen.flags |= Screen_VisibleCursor;	537	screen.flags |= Screen_VisibleCursor;
556	swap.flags |= Screen_VisibleCursor;	538	swap.flags |= Screen_VisibleCursor;
557	}	539	}
558	else	540	else
559	#endif	541	#endif
560	if (OPTION (Opt_secondaryScroll))	542	if (option (Opt_secondaryScroll))
561	scr_scroll_text (0, prev_nrow - 1, prev_nrow);	543	scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562	}	544	}
563		545
564	// clear WrapNext indicator, solidifying position on next line	546	// clear WrapNext indicator, solidifying position on next line
565	void	547	void
…		…
598	/*	580	/*
599	* Change the rendition style for following text	581	* Change the rendition style for following text
600	*/	582	*/
601	void	583	void
602	rxvt_term::scr_rendition (int set, int style) NOTHROW	584	rxvt_term::scr_rendition (int set, int style) NOTHROW
603	{	585	{
604	if (set)	586	if (set)
605	rstyle |= style;	587	rstyle |= style;
606	else if (style == ~RS_None)	588	else if (style == ~RS_None)
607	rstyle = DEFAULT_RSTYLE;	589	rstyle = DEFAULT_RSTYLE;
608	else	590	else
609	rstyle &= ~style;	591	rstyle &= ~style;
610	}	592	}
611		593
612	/* ------------------------------------------------------------------------- */	594	/* ------------------------------------------------------------------------- */
613	/*	595	/*
614	* Scroll text between <row1> and <row2> inclusive, by <count> lines	596	* Scroll text between <row1> and <row2> inclusive, by <count> lines
615	* count positive ==> scroll up	597	* count positive ==> scroll up
…		…
624	want_refresh = 1;	606	want_refresh = 1;
625	num_scr += count;	607	num_scr += count;
626		608
627	if (count > 0	609	if (count > 0
628	&& row1 == 0	610	&& row1 == 0
629	&& (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))	611	&& (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630	{	612	{
631	top_row = max (top_row - count, -saveLines);	613	top_row = max (top_row - count, -saveLines);
632		614
633	// scroll everything up 'count' lines	615	// scroll everything up 'count' lines
634	term_start = (term_start + count) % total_rows;	616	term_start = (term_start + count) % total_rows;
…		…
645	{	627	{
646	line_t &l = ROW(nrow - 1 - i);	628	line_t &l = ROW(nrow - 1 - i);
647		629
648	// optimize if already cleared, can be significant on slow machines	630	// optimize if already cleared, can be significant on slow machines
649	// could be rolled into scr_blank_screen_mem	631	// could be rolled into scr_blank_screen_mem
650	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))	632	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651	{	633	{
652	scr_blank_line (l, 0, l.l, rstyle);	634	scr_blank_line (l, 0, l.l, rstyle);
653	l.l = 0;	635	l.l = 0;
654	l.f = 0;	636	l.f = 0;
655	}	637	}
…		…
666	line_t &l2 = ROW(i);	648	line_t &l2 = ROW(i);
667		649
668	::swap (l1, l2);	650	::swap (l1, l2);
669	l2.touch ();	651	l2.touch ();
670	}	652	}
671		653
672	// move and/or clear selection, if any	654	// move and/or clear selection, if any
673	if (selection.op && current_screen == selection.screen)	655	if (selection.op && current_screen == selection.screen)
674	{	656	{
675	selection.beg.row -= count;	657	selection.beg.row -= count;
676	selection.end.row -= count;	658	selection.end.row -= count;
…		…
684	selection.op = SELECTION_CLEAR;	666	selection.op = SELECTION_CLEAR;
685	}	667	}
686	}	668	}
687		669
688	// finally move the view window, if desired	670	// finally move the view window, if desired
689	if (OPTION (Opt_scrollWithBuffer)	671	if (option (Opt_scrollWithBuffer)
690	&& view_start != 0	672	&& view_start != 0
691	&& view_start != -saveLines)	673	&& view_start != -saveLines)
692	scr_page (UP, count);	674	scr_page (UP, count);
693		675
694	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	676	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
…		…
712	{	694	{
713	/* move selected region too */	695	/* move selected region too */
714	selection.beg.row -= count;	696	selection.beg.row -= count;
715	selection.end.row -= count;	697	selection.end.row -= count;
716	selection.mark.row -= count;	698	selection.mark.row -= count;
717		699
718	selection_check (0);	700	selection_check (0);
719	}	701	}
720	}	702	}
721		703
722	// use a simple and robust scrolling algorithm, this	704	// use a simple and robust scrolling algorithm, this
…		…
789		771
790	while (str < strend)	772	while (str < strend)
791	{	773	{
792	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	774	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793		775
794	if (c < 0x20)	776	if (expect_false (c < 0x20))
795	if (c == C0_LF)	777	if (c == C0_LF)
796	{	778	{
797	max_it (line->l, screen.cur.col);	779	max_it (line->l, screen.cur.col);
798		780
799	screen.flags &= ~Screen_WrapNext;	781	screen.flags &= ~Screen_WrapNext;
…		…
818	{	800	{
819	scr_tab (1, true);	801	scr_tab (1, true);
820	continue;	802	continue;
821	}	803	}
822		804
		805	if (expect_false (
823	if (checksel /* see if we're writing within selection */	806	checksel /* see if we're writing within selection */
824	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	807	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	808	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		809	))
826	{	810	{
827	checksel = 0;	811	checksel = 0;
828	/*	812	/*
829	* If we wrote anywhere in the selected area, kill the selection	813	* If we wrote anywhere in the selected area, kill the selection
830	* XXX: should we kill the mark too? Possibly, but maybe that	814	* XXX: should we kill the mark too? Possibly, but maybe that
831	* should be a similar check.	815	* should be a similar check.
832	*/	816	*/
833	CLEAR_SELECTION ();	817	CLEAR_SELECTION ();
834	}	818	}
835		819
836	if (screen.flags & Screen_WrapNext)	820	if (expect_false (screen.flags & Screen_WrapNext))
837	{	821	{
838	scr_do_wrap ();	822	scr_do_wrap ();
839		823
840	line->l = ncol;	824	line->l = ncol;
841	line->is_longer (1);	825	line->is_longer (1);
842		826
843	row = screen.cur.row;	827	row = screen.cur.row;
844	line = &ROW(row); /* _must_ refresh */	828	line = &ROW(row); /* _must_ refresh */
845	}	829	}
846		830
847	// some utf-8 decoders "decode" surrogate characters: let's fix this.	831	// some utf-8 decoders "decode" surrogate characters: let's fix this.
848	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	832	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849	c = 0xfffd;	833	c = 0xfffd;
850		834
851	// rely on wcwidth to tell us the character width, do wcwidth before	835	// rely on wcwidth to tell us the character width, do wcwidth before
852	// further replacements, as wcwidth might return -1 for the line	836	// further replacements, as wcwidth might return -1 for the line
853	// drawing characters below as they might be invalid in the current	837	// drawing characters below as they might be invalid in the current
854	// locale.	838	// locale.
855	int width = WCWIDTH (c);	839	int width = WCWIDTH (c);
856		840
857	if (charsets [screen.charset] == '0') // DEC SPECIAL	841	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858	{	842	{
859	// vt100 special graphics and line drawing	843	// vt100 special graphics and line drawing
860	// 5f-7e standard vt100	844	// 5f-7e standard vt100
861	// 40-5e rxvt extension for extra curses acs chars	845	// 40-5e rxvt extension for extra curses acs chars
862	static uint16_t vt100_0[62] = { // 41 .. 7e	846	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
875	c = vt100_0[c - 0x41];	859	c = vt100_0[c - 0x41];
876	width = 1; // vt100 line drawing characters are always single-width	860	width = 1; // vt100 line drawing characters are always single-width
877	}	861	}
878	}	862	}
879		863
880	if (screen.flags & Screen_Insert)	864	if (expect_false (screen.flags & Screen_Insert))
881	scr_insdel_chars (width, INSERT);	865	scr_insdel_chars (width, INSERT);
882		866
883	if (width != 0)	867	if (width != 0)
884	{	868	{
885	#if !UNICODE_3	869	#if !UNICODE_3
…		…
891	c = 0xfffd;	875	c = 0xfffd;
892	# endif	876	# endif
893	#endif	877	#endif
894		878
895	// nuke the character at this position, if required	879	// nuke the character at this position, if required
		880	if (expect_false (
896	if (line->t[screen.cur.col] == NOCHAR	881	line->t[screen.cur.col] == NOCHAR
897	|| (screen.cur.col < ncol - 1	882	|| (screen.cur.col < ncol - 1
898	&& line->t[screen.cur.col + 1] == NOCHAR))	883	&& line->t[screen.cur.col + 1] == NOCHAR)
		884	))
899	{	885	{
900	int col = screen.cur.col;	886	int col = screen.cur.col;
901		887
902	// find begin	888	// find begin
903	while (col > 0 && line->t[col] == NOCHAR)	889	while (col > 0 && line->t[col] == NOCHAR)
…		…
914	}	900	}
915		901
916	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	902	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917		903
918	// if the character doesn't fit into the remaining columns...	904	// if the character doesn't fit into the remaining columns...
919	if (screen.cur.col > ncol - width && ncol >= width)	905	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920	{	906	{
921	// ...output spaces	907	// ...output spaces
922	c = ' ';	908	c = ' ';
923	// and try the same character next loop iteration	909	// and try the same character next loop iteration
924	--str;	910	--str;
…		…
929	do	915	do
930	{	916	{
931	line->t[screen.cur.col] = c;	917	line->t[screen.cur.col] = c;
932	line->r[screen.cur.col] = rend;	918	line->r[screen.cur.col] = rend;
933		919
934	if (screen.cur.col < ncol - 1)	920	if (expect_true (screen.cur.col < ncol - 1))
935	screen.cur.col++;	921	screen.cur.col++;
936	else	922	else
937	{	923	{
938	line->l = ncol;	924	line->l = ncol;
939	if (screen.flags & Screen_Autowrap)	925	if (screen.flags & Screen_Autowrap)
…		…
941	break;	927	break;
942	}	928	}
943		929
944	c = NOCHAR;	930	c = NOCHAR;
945	}	931	}
946	while (--width > 0);	932	while (expect_false (--width > 0));
947		933
948	// pad with spaces when overwriting wide character with smaller one	934	// pad with spaces when overwriting wide character with smaller one
949	if (!width)	935	if (expect_false (!width))
950	{	936	{
951	line->touch ();	937	line->touch ();
952		938
953	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)	939	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954	{	940	{
955	line->t[c] = ' ';	941	line->t[c] = ' ';
956	line->r[c] = rend;	942	line->r[c] = rend;
957	}	943	}
958	}	944	}
959	}	945	}
		946	#if ENABLE_COMBINING
960	else // width == 0	947	else // width == 0
961	{	948	{
962	#if ENABLE_COMBINING	949	if (c != 0xfeff) // ignore BOM
963	// handle combining characters
964	// we just tag the accent on the previous on-screen character.
965	// this is arguably not correct, but also arguably not wrong.
966	// we don't handle double-width characters nicely yet.
967	line_t *linep;
968	text_t *tp;
969	rend_t *rp;
970
971	if (screen.cur.col > 0)
972	{	950	{
		951	// handle combining characters
		952	// we just tag the accent on the previous on-screen character.
		953	// this is arguably not correct, but also arguably not wrong.
		954	// we don't handle double-width characters nicely yet.
		955	line_t *linep;
		956	text_t *tp;
		957	rend_t *rp;
		958
		959	if (screen.cur.col > 0)
		960	{
973	linep = line;	961	linep = line;
974	tp = line->t + screen.cur.col - 1;	962	tp = line->t + screen.cur.col - 1;
975	rp = line->r + screen.cur.col - 1;	963	rp = line->r + screen.cur.col - 1;
		964	}
		965	else if (screen.cur.row > 0
		966	&& ROW(screen.cur.row - 1).is_longer ())
		967	{
		968	linep = &ROW(screen.cur.row - 1);
		969	tp = line->t + ncol - 1;
		970	rp = line->r + ncol - 1;
		971	}
		972	else
		973	continue;
		974
		975	linep->touch ();
		976
		977	while (*tp == NOCHAR && tp > linep->t)
		978	tp--, rp--;
		979
		980	// first try to find a precomposed character
		981	unicode_t n = rxvt_compose (*tp, c);
		982	if (n == NOCHAR)
		983	n = rxvt_composite.compose (*tp, c);
		984
		985	*tp = n;
		986	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976	}	987	}
977	else if (screen.cur.row > 0
978	&& ROW(screen.cur.row - 1).is_longer ())
979	{
980	linep = &ROW(screen.cur.row - 1);
981	tp = line->t + ncol - 1;
982	rp = line->r + ncol - 1;
983	}	988	}
984	else
985	continue;
986
987	linep->touch ();
988
989	while (*tp == NOCHAR && tp > linep->t)
990	tp--, rp--;
991
992	// first try to find a precomposed character
993	unicode_t n = rxvt_compose (*tp, c);
994	if (n == NOCHAR)
995	n = rxvt_composite.compose (*tp, c);
996
997	*tp = n;
998	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999	#endif	989	#endif
1000	}
1001	}	990	}
1002		991
1003	max_it (line->l, screen.cur.col);	992	max_it (line->l, screen.cur.col);
1004		993
1005	#ifdef DEBUG_STRICT	994	#ifdef DEBUG_STRICT
…		…
1013	* XTERM_SEQ: CTRL-H	1002	* XTERM_SEQ: CTRL-H
1014	*/	1003	*/
1015	void	1004	void
1016	rxvt_term::scr_backspace () NOTHROW	1005	rxvt_term::scr_backspace () NOTHROW
1017	{	1006	{
1018	want_refresh = 1;
1019
1020	if (screen.cur.col == 0)	1007	if (screen.cur.col == 0)
1021	{	1008	{
1022	if (screen.cur.row > 0)	1009	if (screen.cur.row > 0)
1023	{	1010	{
1024	#ifdef TERMCAP_HAS_BW	1011	#ifdef TERMCAP_HAS_BW
1025	screen.cur.col = ncol - 1;	1012	screen.cur.col = ncol - 1;
1026	screen.cur.row--;	1013	--screen.cur.row;
1027	return;	1014
		1015	want_refresh = 1;
1028	#endif	1016	#endif
1029	}	1017	}
1030	}	1018	}
1031	else if (!(screen.flags & Screen_WrapNext))	1019	else
1032	scr_gotorc (0, -1, RELATIVE);	1020	scr_gotorc (0, -1, RELATIVE);
1033
1034	screen.flags &= ~Screen_WrapNext;
1035	}	1021	}
1036		1022
1037	/* ------------------------------------------------------------------------- */	1023	/* ------------------------------------------------------------------------- */
1038	/*	1024	/*
1039	* Process Horizontal Tab	1025	* Process Horizontal Tab
…		…
1062	x = i;	1048	x = i;
1063		1049
1064	if (!--count)	1050	if (!--count)
1065	break;	1051	break;
1066	}	1052	}
1067	else	1053	else
1068	ht &= l.t[i] == ' '	1054	ht &= l.t[i] == ' '
1069	&& RS_SAME (l.r[i], base_rend);	1055	&& RS_SAME (l.r[i], base_rend);
1070		1056
1071	if (count)	1057	if (count)
1072	x = ncol - 1;	1058	x = ncol - 1;
1073		1059
1074	// store horizontal tab commands as characters inside the text	1060	// store horizontal tab commands as characters inside the text
1075	// buffer so they can be selected and pasted.	1061	// buffer so they can be selected and pasted.
1076	if (ht && OPTION (Opt_pastableTabs))	1062	if (ht && option (Opt_pastableTabs))
1077	{	1063	{
1078	base_rend = SET_FONT (base_rend, 0);	1064	base_rend = SET_FONT (base_rend, 0);
1079		1065
1080	l.touch (x);	1066	l.touch (x);
1081		1067
…		…
1114	* Process DEC Back Index	1100	* Process DEC Back Index
1115	* XTERM_SEQ: ESC 6	1101	* XTERM_SEQ: ESC 6
1116	* Move cursor left in row. If we're at the left boundary, shift everything	1102	* Move cursor left in row. If we're at the left boundary, shift everything
1117	* in that row right. Clear left column.	1103	* in that row right. Clear left column.
1118	*/	1104	*/
1119	#if ENABLE_FRILLS	1105	#if !ENABLE_MINIMAL
1120	void	1106	void
1121	rxvt_term::scr_backindex () NOTHROW	1107	rxvt_term::scr_backindex () NOTHROW
1122	{	1108	{
1123	if (screen.cur.col > 0)	1109	if (screen.cur.col > 0)
1124	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1110	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
…		…
1131	* Process DEC Forward Index	1117	* Process DEC Forward Index
1132	* XTERM_SEQ: ESC 9	1118	* XTERM_SEQ: ESC 9
1133	* Move cursor right in row. If we're at the right boundary, shift everything	1119	* Move cursor right in row. If we're at the right boundary, shift everything
1134	* in that row left. Clear right column.	1120	* in that row left. Clear right column.
1135	*/	1121	*/
1136	#if ENABLE_FRILLS	1122	#if !ENABLE_MINIMAL
1137	void	1123	void
1138	rxvt_term::scr_forwardindex () NOTHROW	1124	rxvt_term::scr_forwardindex () NOTHROW
1139	{	1125	{
1140	if (screen.cur.col < ncol - 1)	1126	if (screen.cur.col < ncol - 1)
1141	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1127	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
…		…
1188	}	1174	}
1189	}	1175	}
1190	else	1176	else
1191	{	1177	{
1192	if (screen.flags & Screen_Relative)	1178	if (screen.flags & Screen_Relative)
		1179	{
1193	{ /* relative origin mode */	1180	/* relative origin mode */
1194	screen.cur.row = row + screen.tscroll;	1181	screen.cur.row = row + screen.tscroll;
1195	min_it (screen.cur.row, screen.bscroll);	1182	min_it (screen.cur.row, screen.bscroll);
1196	}	1183	}
1197	else	1184	else
1198	screen.cur.row = row;	1185	screen.cur.row = row;
…		…
1231	/*	1218	/*
1232	* Erase part or whole of a line	1219	* Erase part or whole of a line
1233	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1220	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1234	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1221	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1235	* XTERM_SEQ: Clear whole line : ESC [ 2 K	1222	* XTERM_SEQ: Clear whole line : ESC [ 2 K
		1223	* extension: clear to right unless wrapped: ESC [ 3 K
1236	*/	1224	*/
1237	void	1225	void
1238	rxvt_term::scr_erase_line (int mode) NOTHROW	1226	rxvt_term::scr_erase_line (int mode) NOTHROW
1239	{	1227	{
1240	unsigned int col, num;	1228	unsigned int col, num;
…		…
1249	line.touch ();	1237	line.touch ();
1250	line.is_longer (0);	1238	line.is_longer (0);
1251		1239
1252	switch (mode)	1240	switch (mode)
1253	{	1241	{
		1242	case 3:
		1243	if (screen.flags & Screen_WrapNext)
		1244	return;
		1245
		1246	/* fall through */
		1247
1254	case 0: /* erase to end of line */	1248	case 0: /* erase to end of line */
1255	col = screen.cur.col;	1249	col = screen.cur.col;
1256	num = ncol - col;	1250	num = ncol - col;
1257	min_it (line.l, col);	1251	min_it (line.l, col);
		1252
1258	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1253	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1254	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260	CLEAR_SELECTION ();	1255	CLEAR_SELECTION ();
1261	break;	1256	break;
		1257
1262	case 1: /* erase to beginning of line */	1258	case 1: /* erase to beginning of line */
1263	col = 0;	1259	col = 0;
1264	num = screen.cur.col + 1;	1260	num = screen.cur.col + 1;
		1261
1265	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1262	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1263	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267	CLEAR_SELECTION ();	1264	CLEAR_SELECTION ();
1268	break;	1265	break;
		1266
1269	case 2: /* erase whole line */	1267	case 2: /* erase whole line */
1270	col = 0;	1268	col = 0;
1271	num = ncol;	1269	num = ncol;
1272	line.l = 0;	1270	line.l = 0;
1273	if (selection.beg.row <= screen.cur.row	1271	if (selection.beg.row <= screen.cur.row
…		…
1331	if (row >= nrow) /* Out Of Bounds */	1329	if (row >= nrow) /* Out Of Bounds */
1332	return;	1330	return;
1333		1331
1334	min_it (num, nrow - row);	1332	min_it (num, nrow - row);
1335		1333
		1334	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336	if (rstyle & (RS_RVid | RS_Uline))	1335	if (rstyle & (RS_RVid | RS_Uline))
1337	ren = (rend_t) ~RS_None;	1336	ren = (rend_t) ~RS_None;
1338	else if (GET_BASEBG (rstyle) == Color_bg)	1337	else if (GET_BASEBG (rstyle) == Color_bg)
1339	{	1338	{
1340	ren = DEFAULT_RSTYLE;	1339	ren = DEFAULT_RSTYLE;
1341	CLEAR_ROWS (row, num);	1340
		1341	if (mapped)
		1342	XClearArea (dpy, vt, 0,
		1343	Row2Pixel (row), (unsigned int)width,
		1344	(unsigned int)Height2Pixel (num), False);
1342	}	1345	}
1343	else	1346	else
1344	{	1347	{
1345	ren = rstyle & (RS_fgMask | RS_bgMask);	1348	ren = rstyle & (RS_fgMask | RS_bgMask);
		1349
1346	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1350	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347	XChangeGC (xdisp, gc, GCForeground, &gcvalue);	1351	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348	ERASE_ROWS (row, num);	1352	XFillRectangle (dpy, vt, gc,
		1353	0, Row2Pixel (row),
		1354	(unsigned int)width,
		1355	(unsigned int)Height2Pixel (num));
1349	gcvalue.foreground = pix_colors[Color_fg];	1356	gcvalue.foreground = pix_colors[Color_fg];
1350	XChangeGC (xdisp, gc, GCForeground, &gcvalue);	1357	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351	}	1358	}
1352		1359
1353	for (; num--; row++)	1360	for (; num--; row++)
1354	{	1361	{
1355	scr_blank_screen_mem (ROW(row), rstyle);	1362	scr_blank_screen_mem (ROW(row), rstyle);
1356	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1363	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357	}	1364	}
1358	}	1365	}
1359		1366
1360	#if ENABLE_FRILLS	1367	#if !ENABLE_MINIMAL
1361	void	1368	void
1362	rxvt_term::scr_erase_savelines () NOTHROW	1369	rxvt_term::scr_erase_savelines () NOTHROW
1363	{	1370	{
1364	want_refresh = 1;	1371	want_refresh = 1;
1365	ZERO_SCROLLBACK ();	1372	ZERO_SCROLLBACK ();
…		…
1474	{	1481	{
1475	if (selection.end.row != screen.cur.row	1482	if (selection.end.row != screen.cur.row
1476	|| (selection.end.col + count >= ncol))	1483	|| (selection.end.col + count >= ncol))
1477	CLEAR_SELECTION ();	1484	CLEAR_SELECTION ();
1478	else	1485	else
		1486	{
1479	{ /* shift selection */	1487	/* shift selection */
1480	selection.beg.col += count;	1488	selection.beg.col += count;
1481	selection.mark.col += count; /* XXX: yes? */	1489	selection.mark.col += count; /* XXX: yes? */
1482	selection.end.col += count;	1490	selection.end.col += count;
1483	}	1491	}
1484	}	1492	}
…		…
1623	*/	1631	*/
1624	void	1632	void
1625	rxvt_term::scr_set_tab (int mode) NOTHROW	1633	rxvt_term::scr_set_tab (int mode) NOTHROW
1626	{	1634	{
1627	if (mode < 0)	1635	if (mode < 0)
1628	memset (tabs, 0, ncol * sizeof (char));	1636	memset (tabs, 0, ncol);
1629	else if (screen.cur.col < ncol)	1637	else if (screen.cur.col < ncol)
1630	tabs [screen.cur.col] = !!mode;	1638	tabs [screen.cur.col] = !!mode;
1631	}	1639	}
1632		1640
1633	/* ------------------------------------------------------------------------- */	1641	/* ------------------------------------------------------------------------- */
…		…
1648	if (rvideo_state != on)	1656	if (rvideo_state != on)
1649	{	1657	{
1650	rvideo_state = on;	1658	rvideo_state = on;
1651		1659
1652	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1660	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653	#if XPM_BACKGROUND	1661	#ifdef HAVE_BG_PIXMAP
1654	if (bgPixmap.pixmap == None)	1662	if (bgPixmap.pixmap == None)
1655	#endif	1663	#endif
1656	#if TRANSPARENT
1657	if (!OPTION (Opt_transparent) || am_transparent == 0)
1658	#endif
1659	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);	1664	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660		1665
1661	XGCValues gcvalue;	1666	XGCValues gcvalue;
1662	gcvalue.foreground = pix_colors[Color_fg];	1667	gcvalue.foreground = pix_colors[Color_fg];
1663	gcvalue.background = pix_colors[Color_bg];	1668	gcvalue.background = pix_colors[Color_bg];
1664	XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);	1669	XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665		1670
1666	scr_clear ();	1671	scr_clear ();
1667	scr_touch (true);	1672	scr_touch (true);
1668	}	1673	}
1669	}	1674	}
…		…
1806	for (i = PART_BEG; i < RC_COUNT; i++)	1811	for (i = PART_BEG; i < RC_COUNT; i++)
1807	{	1812	{
1808	min_it (rc[i].col, ncol - 1);	1813	min_it (rc[i].col, ncol - 1);
1809	min_it (rc[i].row, nrow - 1);	1814	min_it (rc[i].row, nrow - 1);
1810	}	1815	}
1811		1816	// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1817	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1818	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814		1819
1815	num_scr_allow = 0;	1820	num_scr_allow = 0;
1816		1821
…		…
1871	return true;	1876	return true;
1872	}	1877	}
1873		1878
1874	#ifndef NO_BELL	1879	#ifndef NO_BELL
1875	void	1880	void
1876	rxvt_term::bell_cb (time_watcher &w)	1881	rxvt_term::bell_cb (ev::timer &w, int revents)
1877	{	1882	{
1878	rvideo_bell = false;	1883	rvideo_bell = false;
1879	scr_rvideo_mode (rvideo_mode);	1884	scr_rvideo_mode (rvideo_mode);
		1885	refresh_check ();
1880	}	1886	}
1881	#endif	1887	#endif
1882		1888
1883	/* ------------------------------------------------------------------------- */	1889	/* ------------------------------------------------------------------------- */
1884	void	1890	void
…		…
1886	{	1892	{
1887	#ifndef NO_BELL	1893	#ifndef NO_BELL
1888		1894
1889	# ifndef NO_MAPALERT	1895	# ifndef NO_MAPALERT
1890	# ifdef MAPALERT_OPTION	1896	# ifdef MAPALERT_OPTION
1891	if (OPTION (Opt_mapAlert))	1897	if (option (Opt_mapAlert))
1892	# endif	1898	# endif
1893	XMapWindow (xdisp, parent[0]);	1899	XMapWindow (dpy, parent[0]);
1894	# endif	1900	# endif
1895		1901
		1902	# if ENABLE_FRILLS
		1903	if (option (Opt_urgentOnBell))
		1904	{
		1905	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
		1906	{
		1907	h->flags |= XUrgencyHint;
		1908	XSetWMHints (dpy, parent[0], h);
		1909	}
		1910	}
		1911	# endif
		1912
1896	if (OPTION (Opt_visualBell))	1913	if (option (Opt_visualBell))
1897	{	1914	{
1898	rvideo_bell = true;	1915	rvideo_bell = true;
1899	scr_rvideo_mode (rvideo_mode);	1916	scr_rvideo_mode (rvideo_mode);
1900	display->flush ();	1917	flush ();
1901		1918
1902	bell_ev.start (NOW + VISUAL_BELL_DURATION);	1919	bell_ev.start (VISUAL_BELL_DURATION);
1903	}	1920	}
1904	else	1921	else
1905	XBell (xdisp, 0);	1922	XBell (dpy, 0);
1906
1907	#endif	1923	#endif
1908	}	1924	}
1909		1925
1910	/* ------------------------------------------------------------------------- */	1926	/* ------------------------------------------------------------------------- */
1911	/* ARGSUSED */	1927	/* ARGSUSED */
1912	void	1928	void
1913	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1929	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914	{	1930	{
1915	#ifdef PRINTPIPE	1931	#ifdef PRINTPIPE
1916	int nrows, row_start;	1932	int nrows, row_start;
1917	FILE *fd;	1933	FILE *fd = popen_printer ();
1918		1934
1919	if ((fd = popen_printer ()) == NULL)	1935	if (!fd)
1920	return;	1936	return;
1921		1937
1922	if (fullhist)	1938	if (fullhist)
1923	{	1939	{
1924	nrows = nrow - top_row;	1940	nrows = nrow - top_row;
…		…
1969	* screen.text/screen.rend contain what the screen will change to.	1985	* screen.text/screen.rend contain what the screen will change to.
1970	*/	1986	*/
1971	void	1987	void
1972	rxvt_term::scr_refresh () NOTHROW	1988	rxvt_term::scr_refresh () NOTHROW
1973	{	1989	{
1974	unsigned char must_clear, /* use draw_string not draw_image_string */	1990	unsigned char have_bg,
1975	showcursor; /* show the cursor */	1991	showcursor; /* show the cursor */
1976	int16_t col, row, /* column/row we're processing */	1992	int16_t col, row, /* column/row we're processing */
1977	ocrow; /* old cursor row */	1993	ocrow; /* old cursor row */
1978	int i; /* tmp */	1994	int i; /* tmp */
1979	#ifndef NO_CURSORCOLOR	1995	#ifndef NO_CURSORCOLOR
1980	rend_t cc1; /* store colours at cursor position (s) */	1996	rend_t cc1; /* store colours at cursor position (s) */
1981	#endif	1997	#endif
1982	rend_t *crp; // cursor rendition pointer	1998	rend_t *crp; // cursor rendition pointer
		1999	rend_t ccol1, /* Cursor colour */
		2000	ccol2; /* Cursor colour2 */
1983		2001
1984	want_refresh = 0; /* screen is current */	2002	want_refresh = 0; /* screen is current */
1985		2003
1986	if (refresh_type == NO_REFRESH || !mapped)	2004	if (refresh_type == NO_REFRESH || !mapped)
1987	return;	2005	return;
1988		2006
1989	/*	2007	/*
1990	* A: set up vars	2008	* A: set up vars
1991	*/	2009	*/
1992	must_clear = 0;
1993	refresh_count = 0;	2010	refresh_count = 0;
1994		2011
1995	#if XPM_BACKGROUND	2012	have_bg = 0;
		2013	#ifdef HAVE_BG_PIXMAP
1996	must_clear |= bgPixmap.pixmap != None;	2014	have_bg = bgPixmap.pixmap != None;
1997	#endif
1998	#if TRANSPARENT
1999	must_clear |= OPTION (Opt_transparent) && am_transparent;
2000	#endif	2015	#endif
2001	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2016	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002		2017
2003	/*	2018	/*
2004	* B: reverse any characters which are selected	2019	* B: reverse any characters which are selected
…		…
2008	/*	2023	/*
2009	* C: set the cursor character (s)	2024	* C: set the cursor character (s)
2010	*/	2025	*/
2011	{	2026	{
2012	unsigned char setoldcursor;	2027	unsigned char setoldcursor;
2013	rend_t ccol1, /* Cursor colour */
2014	ccol2; /* Cursor colour2 */
2015		2028
2016	showcursor = (screen.flags & Screen_VisibleCursor);	2029	showcursor = (screen.flags & Screen_VisibleCursor);
2017	#ifdef CURSOR_BLINK	2030	#ifdef CURSOR_BLINK
2018	if (hidden_cursor)	2031	if (hidden_cursor)
2019	showcursor = 0;	2032	showcursor = 0;
…		…
2026	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2039	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027	col--;	2040	col--;
2028		2041
2029	crp = &ROW(screen.cur.row).r[col];	2042	crp = &ROW(screen.cur.row).r[col];
2030		2043
		2044	#ifndef NO_CURSORCOLOR
		2045	cc1 = *crp & (RS_fgMask | RS_bgMask);
		2046	if (ISSET_PIXCOLOR (Color_cursor))
		2047	ccol1 = Color_cursor;
		2048	else
		2049	#endif
		2050	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2051	ccol1 = fgcolor_of (rstyle);
		2052	#else
		2053	ccol1 = Color_fg;
		2054	#endif
		2055
		2056	#ifndef NO_CURSORCOLOR
		2057	if (ISSET_PIXCOLOR (Color_cursor2))
		2058	ccol2 = Color_cursor2;
		2059	else
		2060	#endif
		2061	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2062	ccol2 = bgcolor_of (rstyle);
		2063	#else
		2064	ccol2 = Color_bg;
		2065	#endif
		2066
2031	if (showcursor && focus)	2067	if (showcursor && focus)
2032	{	2068	{
2033	if (OPTION (Opt_cursorUnderline))	2069	if (option (Opt_cursorUnderline))
2034	*crp ^= RS_Uline;	2070	*crp ^= RS_Uline;
2035	else	2071	else
2036	{	2072	{
2037	*crp ^= RS_RVid;	2073	*crp ^= RS_RVid;
2038
2039	#ifndef NO_CURSORCOLOR
2040	cc1 = *crp & (RS_fgMask | RS_bgMask);
2041	if (ISSET_PIXCOLOR (Color_cursor))
2042	ccol1 = Color_cursor;
2043	else
2044	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045	ccol1 = fgcolor_of (rstyle);
2046	#else
2047	ccol1 = Color_fg;
2048	#endif
2049	if (ISSET_PIXCOLOR (Color_cursor2))
2050	ccol2 = Color_cursor2;
2051	else
2052	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053	ccol2 = bgcolor_of (rstyle);
2054	#else
2055	ccol2 = Color_bg;
2056	#endif
2057	*crp = SET_FGCOLOR (*crp, ccol1);	2074	*crp = SET_FGCOLOR (*crp, ccol1);
2058	*crp = SET_BGCOLOR (*crp, ccol2);	2075	*crp = SET_BGCOLOR (*crp, ccol2);
2059	#endif
2060	}	2076	}
2061	}	2077	}
2062	}	2078	}
2063		2079
2064	/* make sure no outline cursor is left around */	2080	/* make sure no outline cursor is left around */
…		…
2103	* D: CopyArea pass - very useful for slower links	2119	* D: CopyArea pass - very useful for slower links
2104	* This has been deliberately kept simple.	2120	* This has been deliberately kept simple.
2105	*/	2121	*/
2106	if (!display->is_local	2122	if (!display->is_local
2107	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2123	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108	&& abs (num_scr) < nrow && !must_clear)	2124	&& abs (num_scr) < nrow && !have_bg)
2109	{	2125	{
2110	int16_t nits;	2126	int16_t nits;
		2127	int i = num_scr;
2111	int j;	2128	int j;
2112	int len, wlen;	2129	int len, wlen;
2113	dLocal (int, num_scr);	2130	dLocal (int, num_scr);
2114		2131
2115	j = nrow;	2132	j = nrow;
2116	wlen = len = -1;	2133	wlen = len = -1;
2117	row = i > 0 ? 0 : j - 1;	2134	row = i > 0 ? 0 : j - 1;
		2135
2118	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2136	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119	{	2137	{
2120	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2138	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121	{	2139	{
2122	line_t s = ROW(view_start + row);	2140	line_t s = ROW(view_start + row);
…		…
2143	wlen = row;	2161	wlen = row;
2144	continue;	2162	continue;
2145	}	2163	}
2146	}	2164	}
2147		2165
2148	if (len != -1)	2166	if (len >= 0)
2149	{	2167	{
2150	/* also comes here at end if needed because of >= above */	2168	/* also comes here at end if needed because of >= above */
2151	if (wlen < len)	2169	if (wlen < len)
2152	::swap (wlen, len);	2170	::swap (wlen, len);
2153		2171
		2172	XGCValues gcv;
		2173
		2174	gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154	XCopyArea (xdisp, vt, vt,	2175	XCopyArea (dpy, vt, vt,
2155	gc, 0, Row2Pixel (len + i),	2176	gc, 0, Row2Pixel (len + i),
2156	(unsigned int)this->width,	2177	(unsigned int)this->width,
2157	(unsigned int)Height2Pixel (wlen - len + 1),	2178	(unsigned int)Height2Pixel (wlen - len + 1),
2158	0, Row2Pixel (len));	2179	0, Row2Pixel (len));
		2180	gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
		2181
2159	len = -1;	2182	len = -1;
2160	}	2183	}
2161	}	2184	}
2162	}	2185	}
2163	#endif	2186	#endif
…		…
2187	continue;	2210	continue;
2188		2211
2189	// redraw one or more characters	2212	// redraw one or more characters
2190		2213
2191	// seek to the beginning of wide characters	2214	// seek to the beginning of wide characters
2192	while (stp[col] == NOCHAR && col > 0)	2215	while (expect_false (stp[col] == NOCHAR && col > 0))
2193	--col;	2216	--col;
2194		2217
2195	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2218	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2196	text_t *text = stp + col;	2219	text_t *text = stp + col;
2197	int count = 1;	2220	int count = 1;
…		…
2219	count++;	2242	count++;
2220		2243
2221	if (stp[col] != dtp[col]	2244	if (stp[col] != dtp[col]
2222	|| !RS_SAME (srp[col], drp[col]))	2245	|| !RS_SAME (srp[col], drp[col]))
2223	{	2246	{
2224	if (must_clear && (i++ > count / 2))	2247	if (have_bg && (i++ > count / 2))
2225	break;	2248	break;
2226		2249
2227	dtp[col] = stp[col];	2250	dtp[col] = stp[col];
2228	drp[col] = rend;	2251	drp[col] = rend;
2229	i = 0;	2252	i = 0;
2230	}	2253	}
2231	else if (must_clear || (stp[col] != ' ' && ++i >= 16))	2254	else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232	break;	2255	break;
2233	}	2256	}
2234		2257
2235	col--; /* went one too far. move back */	2258	col--; /* went one too far. move back */
2236	count -= i; /* dump any matching trailing chars */	2259	count -= i; /* dump any matching trailing chars */
2237		2260
2238	// sometimes we optimize away the trailing NOCHAR's, add them back	2261	// sometimes we optimize away the trailing NOCHAR's, add them back
2239	while (i && text[count] == NOCHAR)	2262	while (expect_false (i && text[count] == NOCHAR))
2240	count++, i--;	2263	count++, i--;
2241		2264
2242	/*	2265	/*
2243	* Determine the attributes for the string	2266	* Determine the attributes for the string
2244	*/	2267	*/
2245	int fore = fgcolor_of (rend); // desired foreground	2268	int fore = fgcolor_of (rend); // desired foreground
2246	int back = bgcolor_of (rend); // desired background	2269	int back = bgcolor_of (rend); // desired background
2247		2270
2248	// only do special processing if any attributes are set, which is unlikely	2271	// only do special processing if any attributes are set, which is unlikely
2249	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2272	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2250	{	2273	{
2251	#if ENABLE_STYLES
2252	// "careful" (too wide) character handling
2253
2254	// include previous careful character(s) if possible, looks nicer (best effort...)
2255	while (text > stp
2256	&& srp[text - stp - 1] & RS_Careful
2257	&& RS_SAME (rend, srp[text - stp - 1]))
2258	text--, count++, xpixel -= fwidth;
2259
2260	// force redraw after "careful" characters to avoid pixel droppings
2261	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264	// force redraw before "careful" characters to avoid pixel droppings
2265	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267	#endif
2268
2269	bool invert = rend & RS_RVid;	2274	bool invert = rend & RS_RVid;
2270		2275
2271	#ifndef NO_BOLD_UNDERLINE_REVERSE	2276	#ifndef NO_BOLD_UNDERLINE_REVERSE
2272	if (rend & RS_Bold
2273	&& fore == Color_fg)	2277	if (rend & RS_Bold && fore == Color_fg)
2274	{	2278	{
2275	if (ISSET_PIXCOLOR (Color_BD))	2279	if (ISSET_PIXCOLOR (Color_BD))
2276	fore = Color_BD;	2280	fore = Color_BD;
2277	# if !ENABLE_STYLES	2281	# if !ENABLE_STYLES
2278	else	2282	else
2279	invert = !invert;	2283	invert = !invert;
2280	# endif	2284	# endif
2281	}	2285	}
2282		2286
2283	if (rend & RS_Italic	2287	if (rend & RS_Italic && fore == Color_fg)
2284	&& fore == Color_fg)
2285	{	2288	{
2286	if (ISSET_PIXCOLOR (Color_IT))	2289	if (ISSET_PIXCOLOR (Color_IT))
2287	fore = Color_IT;	2290	fore = Color_IT;
2288	# if !ENABLE_STYLES	2291	# if !ENABLE_STYLES
2289	else	2292	else
2290	invert = !invert;	2293	invert = !invert;
2291	# endif	2294	# endif
2292	}	2295	}
2293		2296
2294	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))	2297	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295	fore = Color_UL;	2298	fore = Color_UL;
2296	#endif	2299	#endif
2297		2300
2298	if (invert)	2301	if (invert)
2299	{	2302	{
		2303	#ifdef OPTION_HC
		2304	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2305	|| !ISSET_PIXCOLOR (Color_HC))
		2306	#endif
		2307	/* invert the column if no highlightColor is set or it is the
		2308	* current cursor column */
2300	::swap (fore, back);	2309	::swap (fore, back);
		2310	#ifdef OPTION_HC
		2311	else if (ISSET_PIXCOLOR (Color_HC))
		2312	back = Color_HC;
		2313	#endif
2301		2314
2302	#ifndef NO_BOLD_UNDERLINE_REVERSE	2315	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2316	# ifndef OPTION_HC
2303	if (ISSET_PIXCOLOR (Color_RV))	2317	if (ISSET_PIXCOLOR (Color_RV))
2304	back = Color_RV;	2318	back = Color_RV;
2305		2319	# endif
2306	if (fore == back)	2320	if (fore == back)
2307	{	2321	{
2308	fore = Color_bg;	2322	fore = Color_bg;
2309	back = Color_fg;	2323	back = Color_fg;
2310	}	2324	}
…		…
2312	}	2326	}
2313		2327
2314	#ifdef TEXT_BLINK	2328	#ifdef TEXT_BLINK
2315	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2329	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316	{	2330	{
2317	if (!text_blink_ev.active)	2331	if (!text_blink_ev.is_active ())
2318	{	2332	{
2319	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	2333	text_blink_ev.again ();
2320	hidden_text = 0;	2334	hidden_text = 0;
2321	}	2335	}
2322	else if (hidden_text)	2336	else if (hidden_text)
2323	fore = back;	2337	fore = back;
2324	}	2338	}
2325	#endif	2339	#endif
		2340
		2341	#if ENABLE_STYLES
		2342	// "careful" (too wide) character handling
		2343
		2344	// include previous careful character(s) if possible, looks nicer (best effort...)
		2345	while (text > stp
		2346	&& srp[text - stp - 1] & RS_Careful
		2347	&& RS_SAME (rend, srp[text - stp - 1]))
		2348	text--, count++, xpixel -= fwidth;
		2349
		2350	// force redraw after "careful" characters to avoid pixel droppings
		2351	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2352	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2353
		2354	// force redraw before "careful" characters to avoid pixel droppings
		2355	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2356	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
		2357	#endif
2326	}	2358	}
2327		2359
2328	/*	2360	/*
2329	* Actually do the drawing of the string here	2361	* Actually do the drawing of the string here
2330	*/	2362	*/
2331	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2363	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332		2364
2333	if (back == fore)	2365	if (expect_true (have_bg && back == Color_bg))
2334	font->clear_rect (*drawable, xpixel, ypixel,
2335	fwidth * count, fheight,
2336	back);
2337	else if (back == Color_bg)
2338	{	2366	{
2339	if (must_clear)	2367	// this is very ugly, maybe push it into ->draw?
2340	{
2341	CLEAR_CHARS (xpixel, ypixel, count);
2342		2368
2343	for (i = 0; i < count; i++) /* don't draw empty strings */	2369	for (i = 0; i < count; i++) /* don't draw empty strings */
2344	if (text[i] != ' ')	2370	if (text[i] != ' ')
2345	{	2371	{
2346	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2372	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2347	break;	2373	goto did_clear;
2348	}
2349	}	2374	}
2350	else	2375
2351	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);	2376	CLEAR_CHARS (xpixel, ypixel, count);
		2377	did_clear: ;
2352	}	2378	}
2353	else	2379	else
2354	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2380	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2355		2381
2356	if (rend & RS_Uline && font->descent > 1 && fore != back)	2382	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2357	{	2383	{
2358	#if ENABLE_FRILLS	2384	#if ENABLE_FRILLS
2359	if (ISSET_PIXCOLOR (Color_underline))	2385	if (ISSET_PIXCOLOR (Color_underline))
2360	XSetForeground (xdisp, gc, pix_colors[Color_underline]);	2386	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2361	else	2387	else
2362	#endif	2388	#endif
2363	XSetForeground (xdisp, gc, pix_colors[fore]);	2389	XSetForeground (dpy, gc, pix_colors[fore]);
2364		2390
2365	XDrawLine (xdisp, drawBuffer, gc,	2391	XDrawLine (dpy, vt, gc,
2366	xpixel, ypixel + font->ascent + 1,	2392	xpixel, ypixel + font->ascent + 1,
2367	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2393	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2368	}	2394	}
2369	} /* for (col....) */	2395	} /* for (col....) */
2370	} /* for (row....) */	2396	} /* for (row....) */
…		…
2379	*/	2405	*/
2380	if (showcursor)	2406	if (showcursor)
2381	{	2407	{
2382	if (focus)	2408	if (focus)
2383	{	2409	{
2384	if (OPTION (Opt_cursorUnderline))	2410	if (option (Opt_cursorUnderline))
2385	*crp ^= RS_Uline;	2411	*crp ^= RS_Uline;
2386	else	2412	else
2387	{	2413	{
2388	*crp ^= RS_RVid;	2414	*crp ^= RS_RVid;
2389	#ifndef NO_CURSORCOLOR	2415	#ifndef NO_CURSORCOLOR
…		…
2403	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2429	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2404	cursorwidth++;	2430	cursorwidth++;
2405		2431
2406	#ifndef NO_CURSORCOLOR	2432	#ifndef NO_CURSORCOLOR
2407	if (ISSET_PIXCOLOR (Color_cursor))	2433	if (ISSET_PIXCOLOR (Color_cursor))
2408	XSetForeground (xdisp, gc, pix_colors[Color_cursor]);	2434	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
		2435	else
2409	#endif	2436	#endif
		2437	XSetForeground (dpy, gc, pix_colors[ccol1]);
2410		2438
2411	XDrawRectangle (xdisp, drawBuffer, gc,	2439	XDrawRectangle (dpy, vt, gc,
2412	Col2Pixel (col),	2440	Col2Pixel (col),
2413	Row2Pixel (oldcursor.row),	2441	Row2Pixel (oldcursor.row),
2414	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2442	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2415	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2443	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2416	}	2444	}
…		…
2451	}	2479	}
2452		2480
2453	void	2481	void
2454	rxvt_term::scr_recolour () NOTHROW	2482	rxvt_term::scr_recolour () NOTHROW
2455	{	2483	{
2456	if (1	2484	#ifdef HAVE_BG_PIXMAP
2457	#if TRANSPARENT	2485	bgPixmap.apply ();
2458	&& !am_transparent	2486	#else
2459	#endif	2487
2460	#if XPM_BACKGROUND
2461	&& !bgPixmap.pixmap
2462	#endif
2463	)
2464	{
2465	XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);	2488	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2466	XClearWindow (xdisp, parent[0]);	2489	XClearWindow (dpy, parent[0]);
2467	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);	2490	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2468	#if HAVE_SCROLLBARS	2491
2469	if (scrollBar.win)	2492	if (scrollBar.win)
2470	{	2493	{
2471	XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);	2494	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2472	scrollBar.setIdle ();	2495	scrollBar.state = STATE_IDLE;
2473	scrollbar_show (0);	2496	scrollBar.show (0);
2474	}
2475	#endif
2476	}	2497	}
2477		2498
		2499	#endif
		2500
		2501	/* bgPixmap.apply () does not do the following : */
2478	scr_clear ();	2502	scr_clear ();
2479	scr_touch (true);	2503	scr_touch (true);
2480	want_refresh = 1;	2504	want_refresh = 1;
2481	}	2505	}
2482		2506
…		…
2489		2513
2490	num_scr_allow = 0;	2514	num_scr_allow = 0;
2491	want_refresh = 1;	2515	want_refresh = 1;
2492		2516
2493	if (really)	2517	if (really)
2494	XClearWindow (xdisp, vt);	2518	XClearWindow (dpy, vt);
2495	}	2519	}
2496		2520
2497	void	2521	void
2498	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW	2522	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2499	{	2523	{
…		…
2548	{	2572	{
2549	if (selection.op	2573	if (selection.op
2550	&& current_screen == selection.screen	2574	&& current_screen == selection.screen
2551	&& selection.end.row >= view_start)	2575	&& selection.end.row >= view_start)
2552	{	2576	{
2553	#if ENABLE_FRILLS	2577	#if !ENABLE_MINIMAL
2554	if (selection.rect)	2578	if (selection.rect)
2555	scr_xor_rect (selection.beg.row, selection.beg.col,	2579	scr_xor_rect (selection.beg.row, selection.beg.col,
2556	selection.end.row, selection.end.col,	2580	selection.end.row, selection.end.col,
2557	RS_RVid, RS_RVid | RS_Uline);	2581	RS_RVid, RS_RVid | RS_Uline);
2558	else	2582	else
…		…
2574	{	2598	{
2575	int row, wrote;	2599	int row, wrote;
2576	unsigned int width, towrite;	2600	unsigned int width, towrite;
2577	char r1[] = "\n";	2601	char r1[] = "\n";
2578		2602
2579	for (row = saveLines - nsaved;	2603	for (row = saveLines + top_row;
2580	row < saveLines + nrow - 1; row++)	2604	row < saveLines + nrow - 1; row++)
2581	{	2605	{
2582	width = row_buf[row].l >= 0 ? row_buf[row].l	2606	width = row_buf[row].l >= 0 ? row_buf[row].l
2583	: ncol;	2607	: ncol;
2584	for (towrite = width; towrite; towrite -= wrote)	2608	for (towrite = width; towrite; towrite -= wrote)
…		…
2635	/* convert normal newline chars into common keyboard Return key sequence */	2659	/* convert normal newline chars into common keyboard Return key sequence */
2636	for (unsigned int i = 0; i < len; i++)	2660	for (unsigned int i = 0; i < len; i++)
2637	if (data[i] == C0_LF)	2661	if (data[i] == C0_LF)
2638	data[i] = C0_CR;	2662	data[i] = C0_CR;
2639		2663
		2664	if (priv_modes & PrivMode_BracketPaste)
		2665	tt_printf ("\e[200~");
		2666
2640	tt_write (data, len);	2667	tt_write (data, len);
		2668
		2669	if (priv_modes & PrivMode_BracketPaste)
		2670	tt_printf ("\e[201~");
2641	}	2671	}
2642		2672
2643	/* ------------------------------------------------------------------------- */	2673	/* ------------------------------------------------------------------------- */
2644	/*	2674	/*
2645	* Respond to a notification that a primary selection has been sent	2675	* Respond to a notification that a primary selection has been sent
…		…
2674	}	2704	}
2675		2705
2676	unsigned long bytes_after;	2706	unsigned long bytes_after;
2677	XTextProperty ct;	2707	XTextProperty ct;
2678		2708
2679	if (XGetWindowProperty (xdisp, win, prop,	2709	if (XGetWindowProperty (dpy, win, prop,
2680	0, PROP_SIZE / 4,	2710	0, PROP_SIZE / 4,
2681	delete_prop, AnyPropertyType,	2711	delete_prop, AnyPropertyType,
2682	&ct.encoding, &ct.format,	2712	&ct.encoding, &ct.format,
2683	&ct.nitems, &bytes_after,	2713	&ct.nitems, &bytes_after,
2684	&ct.value) != Success)	2714	&ct.value) != Success)
…		…
2693	if (bytes_after)	2723	if (bytes_after)
2694	{	2724	{
2695	// fetch and append remaining data	2725	// fetch and append remaining data
2696	XTextProperty ct2;	2726	XTextProperty ct2;
2697		2727
2698	if (XGetWindowProperty (xdisp, win, prop,	2728	if (XGetWindowProperty (dpy, win, prop,
2699	ct.nitems / 4, (bytes_after + 3) / 4,	2729	ct.nitems / 4, (bytes_after + 3) / 4,
2700	delete_prop, AnyPropertyType,	2730	delete_prop, AnyPropertyType,
2701	&ct2.encoding, &ct2.format,	2731	&ct2.encoding, &ct2.format,
2702	&ct2.nitems, &bytes_after,	2732	&ct2.nitems, &bytes_after,
2703	&ct2.value) != Success)	2733	&ct2.value) != Success)
…		…
2716		2746
2717	if (ct.encoding == xa[XA_INCR])	2747	if (ct.encoding == xa[XA_INCR])
2718	{	2748	{
2719	// INCR selection, start handshake	2749	// INCR selection, start handshake
2720	if (!delete_prop)	2750	if (!delete_prop)
2721	XDeleteProperty (xdisp, win, prop);	2751	XDeleteProperty (dpy, win, prop);
2722		2752
2723	selection_wait = Sel_incr;	2753	selection_wait = Sel_incr;
2724	incr_buf_fill = 0;	2754	incr_buf_fill = 0;
2725	incr_ev.start (NOW + 10);	2755	incr_ev.start (10);
2726		2756
2727	goto bailout;	2757	goto bailout;
2728	}	2758	}
2729		2759
2730	if (ct.nitems == 0)	2760	if (ct.nitems == 0)
…		…
2739	ct.nitems = incr_buf_fill;	2769	ct.nitems = incr_buf_fill;
2740	incr_buf = 0;	2770	incr_buf = 0;
2741	incr_buf_size = 0;	2771	incr_buf_size = 0;
2742	incr_ev.stop ();	2772	incr_ev.stop ();
2743	}	2773	}
2744	else	2774	else
2745	{	2775	{
2746	if (selection_wait == Sel_normal	2776	if (selection_wait == Sel_normal
2747	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2777	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2748	{	2778	{
2749	/*	2779	/*
…		…
2756	goto bailout;	2786	goto bailout;
2757	}	2787	}
2758	}	2788	}
2759	else if (selection_wait == Sel_incr)	2789	else if (selection_wait == Sel_incr)
2760	{	2790	{
2761	incr_ev.start (NOW + 10);	2791	incr_ev.start (10);
2762		2792
2763	while (incr_buf_fill + ct.nitems > incr_buf_size)	2793	while (incr_buf_fill + ct.nitems > incr_buf_size)
2764	{	2794	{
2765	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2795	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2766	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2796	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
…		…
2773	}	2803	}
2774		2804
2775	char **cl;	2805	char **cl;
2776	int cr;	2806	int cr;
2777		2807
2778	#if ENABLE_FRILLS	2808	#if !ENABLE_MINIMAL
2779	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	2809	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2780	// so recode it manually	2810	// so recode it manually
2781	if (ct.encoding == xa[XA_UTF8_STRING])	2811	if (ct.encoding == xa[XA_UTF8_STRING])
2782	{	2812	{
2783	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2813	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
…		…
2787	paste (s, strlen (s));	2817	paste (s, strlen (s));
2788	free (s);	2818	free (s);
2789	}	2819	}
2790	else	2820	else
2791	#endif	2821	#endif
2792	if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0	2822	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2793	&& cl)	2823	&& cl)
2794	{	2824	{
2795	for (int i = 0; i < cr; i++)	2825	for (int i = 0; i < cr; i++)
2796	paste (cl[i], strlen (cl[i]));	2826	paste (cl[i], strlen (cl[i]));
2797		2827
…		…
2806	if (selection_wait == Sel_normal)	2836	if (selection_wait == Sel_normal)
2807	selection_wait = Sel_none;	2837	selection_wait = Sel_none;
2808	}	2838	}
2809		2839
2810	void	2840	void
2811	rxvt_term::incr_cb (time_watcher &w) NOTHROW	2841	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2812	{	2842	{
2813	selection_wait = Sel_none;	2843	selection_wait = Sel_none;
2814		2844
2815	incr_buf_size = 0;	2845	incr_buf_size = 0;
2816	free (incr_buf);	2846	free (incr_buf);
…		…
2827	selection_paste (win, prop, true);	2857	selection_paste (win, prop, true);
2828	}	2858	}
2829		2859
2830	/* ------------------------------------------------------------------------- */	2860	/* ------------------------------------------------------------------------- */
2831	/*	2861	/*
2832	* Request the current selection:	2862	* Request the current selection:
2833	* Order: > internal selection if available	2863	* Order: > internal selection if available
2834	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2864	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2835	* > CUT_BUFFER0	2865	* > CUT_BUFFER0
2836	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2866	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2837	* will auto fallback to CUT_BUFFER0	2867	* will auto fallback to CUT_BUFFER0
…		…
2839	*/	2869	*/
2840	void	2870	void
2841	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2871	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2842	{	2872	{
2843	if (selection.text && selnum == Sel_Primary)	2873	if (selection.text && selnum == Sel_Primary)
		2874	{
2844	{ /* internal selection */	2875	/* internal selection */
2845	char *str = rxvt_wcstombs (selection.text, selection.len);	2876	char *str = rxvt_wcstombs (selection.text, selection.len);
2846	paste (str, strlen (str));	2877	paste (str, strlen (str));
2847	free (str);	2878	free (str);
2848	return;	2879	return;
2849	}	2880	}
…		…
2879	else if (selnum == Sel_Secondary)	2910	else if (selnum == Sel_Secondary)
2880	sel = XA_SECONDARY;	2911	sel = XA_SECONDARY;
2881	else	2912	else
2882	sel = xa[XA_CLIPBOARD];	2913	sel = xa[XA_CLIPBOARD];
2883		2914
2884	if (XGetSelectionOwner (xdisp, sel) != None)	2915	if (XGetSelectionOwner (dpy, sel) != None)
2885	{	2916	{
2886	XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],	2917	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2887	vt, selection_request_time);	2918	vt, selection_request_time);
2888	return 1;	2919	return 1;
2889	}	2920	}
2890		2921
2891	return 0;	2922	return 0;
…		…
2954		2985
2955	int end_col;	2986	int end_col;
2956		2987
2957	for (; row <= selection.end.row; row++, col = 0)	2988	for (; row <= selection.end.row; row++, col = 0)
2958	{	2989	{
2959	#if ENABLE_FRILLS	2990	#if !ENABLE_MINIMAL
2960	if (selection.rect)	2991	if (selection.rect)
2961	{	2992	{
2962	col = selection.beg.col;	2993	col = selection.beg.col;
2963	end_col = ncol + 1;	2994	end_col = ncol + 1;
2964	}	2995	}
…		…
2967	end_col = ROW(row).l;	2998	end_col = ROW(row).l;
2968		2999
2969	col = max (col, 0);	3000	col = max (col, 0);
2970		3001
2971	if (row == selection.end.row	3002	if (row == selection.end.row
2972	#if ENABLE_FRILLS	3003	#if !ENABLE_MINIMAL
2973	|| selection.rect	3004	|| selection.rect
2974	#endif	3005	#endif
2975	)	3006	)
2976	min_it (end_col, selection.end.col);	3007	min_it (end_col, selection.end.col);
2977		3008
…		…
3000	#endif	3031	#endif
3001	else	3032	else
3002	new_selection_text[ofs++] = *t++;	3033	new_selection_text[ofs++] = *t++;
3003	}	3034	}
3004		3035
3005	#if ENABLE_FRILLS	3036	#if !ENABLE_MINIMAL
3006	if (selection.rect)	3037	if (selection.rect)
3007	{	3038	{
3008	while (ofs	3039	while (ofs
3009	&& new_selection_text[ofs - 1] != C0_LF	3040	&& new_selection_text[ofs - 1] != C0_LF
3010	&& unicode::is_space (new_selection_text[ofs - 1]))	3041	&& unicode::is_space (new_selection_text[ofs - 1]))
…		…
3044	bool	3075	bool
3045	rxvt_term::selection_grab (Time tm) NOTHROW	3076	rxvt_term::selection_grab (Time tm) NOTHROW
3046	{	3077	{
3047	selection_time = tm;	3078	selection_time = tm;
3048		3079
3049	XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);	3080	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3050	if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)	3081	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3051	{	3082	{
3052	display->set_selection_owner (this);	3083	display->set_selection_owner (this);
3053	return true;	3084	return true;
3054	}	3085	}
3055	else	3086	else
…		…
3059	}	3090	}
3060		3091
3061	#if 0	3092	#if 0
3062	XTextProperty ct;	3093	XTextProperty ct;
3063		3094
3064	if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)	3095	if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3065	{	3096	{
3066	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3097	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067	XFree (ct.value);	3098	XFree (ct.value);
3068	}	3099	}
3069	#endif	3100	#endif
…		…
3115	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3146	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3116		3147
3117	while (selection.mark.col > 0	3148	while (selection.mark.col > 0
3118	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3149	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119	--selection.mark.col;	3150	--selection.mark.col;
3120		3151
3121	if (selection.op)	3152	if (selection.op)
		3153	{
3122	{ /* clear the old selection */	3154	/* clear the old selection */
3123	selection.beg.row = selection.end.row = selection.mark.row;	3155	selection.beg.row = selection.end.row = selection.mark.row;
3124	selection.beg.col = selection.end.col = selection.mark.col;	3156	selection.beg.col = selection.end.col = selection.mark.col;
3125	}	3157	}
3126		3158
3127	selection.op = SELECTION_INIT;	3159	selection.op = SELECTION_INIT;
…		…
3316	* a point/word/line which is either the start or end of the selection	3348	* a point/word/line which is either the start or end of the selection
3317	* and it was decided by whichever point/word/line was `fixed' at the	3349	* and it was decided by whichever point/word/line was `fixed' at the
3318	* time of the most recent button3 press	3350	* time of the most recent button3 press
3319	*/	3351	*/
3320	if (button3 && buttonpress)	3352	if (button3 && buttonpress)
		3353	{
3321	{ /* button3 press */	3354	/* button3 press */
3322	/*	3355	/*
3323	* first determine which edge of the selection we are closest to	3356	* first determine which edge of the selection we are closest to
3324	*/	3357	*/
3325	if (ROWCOL_IS_BEFORE (pos, selection.beg)	3358	if (ROWCOL_IS_BEFORE (pos, selection.beg)
3326	|| (!ROWCOL_IS_AFTER (pos, selection.end)	3359	|| (!ROWCOL_IS_AFTER (pos, selection.end)
…		…
3344	selection.mark.row = selection.beg.row;	3377	selection.mark.row = selection.beg.row;
3345	selection.mark.col = selection.beg.col;	3378	selection.mark.col = selection.beg.col;
3346	}	3379	}
3347	}	3380	}
3348	else	3381	else
		3382	{
3349	{ /* button1 drag or button3 drag */	3383	/* button1 drag or button3 drag */
3350	if (ROWCOL_IS_AFTER (selection.mark, pos))	3384	if (ROWCOL_IS_AFTER (selection.mark, pos))
3351	{	3385	{
3352	if (selection.mark.row == selection.end.row	3386	if (selection.mark.row == selection.end.row
3353	&& selection.mark.col == selection.end.col	3387	&& selection.mark.col == selection.end.col
3354	&& clickchange	3388	&& clickchange
…		…
3371		3405
3372	if (selection.clicks == 1)	3406	if (selection.clicks == 1)
3373	{	3407	{
3374	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN	3408	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3375	&& !ROW(selection.beg.row).is_longer ()	3409	&& !ROW(selection.beg.row).is_longer ()
3376	#if ENABLE_FRILLS	3410	#if !ENABLE_MINIMAL
3377	&& !selection.rect	3411	&& !selection.rect
3378	#endif	3412	#endif
3379	)	3413	)
3380	selection.beg.col = ncol;	3414	selection.beg.col = ncol;
3381		3415
3382	if (	3416	if (
3383	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN	3417	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3384	&& !ROW(selection.end.row).is_longer ()	3418	&& !ROW(selection.end.row).is_longer ()
3385	#if ENABLE_FRILLS	3419	#if !ENABLE_MINIMAL
3386	&& !selection.rect	3420	&& !selection.rect
3387	#endif	3421	#endif
3388	)	3422	)
3389	selection.end.col = ncol;	3423	selection.end.col = ncol;
3390	}	3424	}
…		…
3397	selection_delimit_word (DN, &selection.end, &selection.end);	3431	selection_delimit_word (DN, &selection.end, &selection.end);
3398	}	3432	}
3399	else if (selection.clicks == 3)	3433	else if (selection.clicks == 3)
3400	{	3434	{
3401	#if ENABLE_FRILLS	3435	#if ENABLE_FRILLS
3402	if (OPTION (Opt_tripleclickwords))	3436	if (option (Opt_tripleclickwords))
3403	{	3437	{
3404	selection_delimit_word (UP, &selection.beg, &selection.beg);	3438	selection_delimit_word (UP, &selection.beg, &selection.beg);
3405		3439
3406	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3440	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3407	{	3441	{
3408	if (!ROW(end_row).is_longer ())	3442	if (!ROW(end_row).is_longer ())
3409	{	3443	{
3410	selection.end.row = end_row;	3444	selection.end.row = end_row;
3411	selection.end.col = ROW(end_row).l;	3445	selection.end.col = ROW(end_row).l;
		3446	# if !ENABLE_MINIMAL
3412	selection_remove_trailing_spaces ();	3447	selection_remove_trailing_spaces ();
		3448	# endif
3413	break;	3449	break;
3414	}	3450	}
3415	}	3451	}
3416	}	3452	}
3417	else	3453	else
…		…
3433	selection.end.row++;	3469	selection.end.row++;
3434	}	3470	}
3435	}	3471	}
3436		3472
3437	if (button3 && buttonpress)	3473	if (button3 && buttonpress)
		3474	{
3438	{ /* mark may need to be changed */	3475	/* mark may need to be changed */
3439	if (closeto == LEFT)	3476	if (closeto == LEFT)
3440	{	3477	{
3441	selection.mark.row = selection.end.row;	3478	selection.mark.row = selection.end.row;
3442	selection.mark.col = selection.end.col - (selection.clicks == 2);	3479	selection.mark.col = selection.end.col - (selection.clicks == 2);
3443	}	3480	}
…		…
3446	selection.mark.row = selection.beg.row;	3483	selection.mark.row = selection.beg.row;
3447	selection.mark.col = selection.beg.col;	3484	selection.mark.col = selection.beg.col;
3448	}	3485	}
3449	}	3486	}
3450		3487
3451	#if ENABLE_FRILLS	3488	#if !ENABLE_MINIMAL
3452	if (selection.rect && selection.beg.col > selection.end.col)	3489	if (selection.rect && selection.beg.col > selection.end.col)
3453	::swap (selection.beg.col, selection.end.col);	3490	::swap (selection.beg.col, selection.end.col);
3454	#endif	3491	#endif
3455	}	3492	}
3456		3493
3457	#if ENABLE_FRILLS	3494	#if !ENABLE_MINIMAL
3458	void	3495	void
3459	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3496	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3460	{	3497	{
3461	int32_t end_col, end_row;	3498	int32_t end_col, end_row;
3462	text_t *stp;	3499	text_t *stp;
…		…
3540	*target++ = xa[XA_COMPOUND_TEXT];	3577	*target++ = xa[XA_COMPOUND_TEXT];
3541	#if X_HAVE_UTF8_STRING	3578	#if X_HAVE_UTF8_STRING
3542	*target++ = xa[XA_UTF8_STRING];	3579	*target++ = xa[XA_UTF8_STRING];
3543	#endif	3580	#endif
3544		3581
3545	XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,	3582	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546	32, PropModeReplace,	3583	32, PropModeReplace,
3547	(unsigned char *)target_list, target - target_list);	3584	(unsigned char *)target_list, target - target_list);
3548	ev.property = rq.property;	3585	ev.property = rq.property;
3549	}	3586	}
3550	#if TODO // TODO	3587	#if TODO // TODO
…		…
3553	/* TODO: Handle MULTIPLE */	3590	/* TODO: Handle MULTIPLE */
3554	}	3591	}
3555	#endif	3592	#endif
3556	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3593	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557	{	3594	{
3558	XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,	3595	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3596	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560	ev.property = rq.property;	3597	ev.property = rq.property;
3561	}	3598	}
3562	else if (rq.target == XA_STRING	3599	else if (rq.target == XA_STRING
3563	|| rq.target == xa[XA_TEXT]	3600	|| rq.target == xa[XA_TEXT]
…		…
3587	style = enc_string;	3624	style = enc_string;
3588	else if (target == xa[XA_TEXT])	3625	else if (target == xa[XA_TEXT])
3589	style = enc_text;	3626	style = enc_text;
3590	else if (target == xa[XA_COMPOUND_TEXT])	3627	else if (target == xa[XA_COMPOUND_TEXT])
3591	style = enc_compound_text;	3628	style = enc_compound_text;
3592	#if ENABLE_FRILLS	3629	#if !ENABLE_MINIMAL
3593	else if (target == xa[XA_UTF8_STRING])	3630	else if (target == xa[XA_UTF8_STRING])
3594	style = enc_utf8;	3631	style = enc_utf8;
3595	#endif	3632	#endif
3596	else	3633	else
3597	{	3634	{
…		…
3608	{	3645	{
3609	cl = L"";	3646	cl = L"";
3610	selectlen = 0;	3647	selectlen = 0;
3611	}	3648	}
3612		3649
3613	#if ENABLE_FRILLS	3650	#if !ENABLE_MINIMAL
3614	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3651	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3615	// so recode it manually	3652	// so recode it manually
3616	if (style == enc_utf8)	3653	if (style == enc_utf8)
3617	{	3654	{
3618	freect = 1;	3655	freect = 1;
…		…
3621	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3658	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622	ct.nitems = strlen ((char *)ct.value);	3659	ct.nitems = strlen ((char *)ct.value);
3623	}	3660	}
3624	else	3661	else
3625	#endif	3662	#endif
3626	if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3663	if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627	freect = 1;	3664	freect = 1;
3628	else	3665	else
3629	{	3666	{
3630	/* if we failed to convert then send it raw */	3667	/* if we failed to convert then send it raw */
3631	ct.value = (unsigned char *)cl;	3668	ct.value = (unsigned char *)cl;
3632	ct.nitems = selectlen;	3669	ct.nitems = selectlen;
3633	ct.encoding = target;	3670	ct.encoding = target;
3634	}	3671	}
3635		3672
3636	XChangeProperty (xdisp, rq.requestor, rq.property,	3673	XChangeProperty (dpy, rq.requestor, rq.property,
3637	ct.encoding, 8, PropModeReplace,	3674	ct.encoding, 8, PropModeReplace,
3638	ct.value, (int)ct.nitems);	3675	ct.value, (int)ct.nitems);
3639	ev.property = rq.property;	3676	ev.property = rq.property;
3640		3677
3641	if (freect)	3678	if (freect)
3642	XFree (ct.value);	3679	XFree (ct.value);
3643	}	3680	}
3644		3681
3645	XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);	3682	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646	}
3647
3648	/* ------------------------------------------------------------------------- *
3649	* MOUSE ROUTINES *
3650	* ------------------------------------------------------------------------- */
3651
3652	/*
3653	* return col/row values corresponding to x/y pixel values
3654	*/
3655	void
3656	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3657	{
3658	*x = Pixel2Col (*x);
3659	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3660	*y = Pixel2Row (*y);
3661	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3662	}	3683	}
3663		3684
3664	/* ------------------------------------------------------------------------- */	3685	/* ------------------------------------------------------------------------- */
3665	#ifdef USE_XIM	3686	#ifdef USE_XIM
3666	void	3687	void
3667	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3688	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668	{	3689	{
3669	XWindowAttributes xwa;	3690	XWindowAttributes xwa;
3670		3691
3671	XGetWindowAttributes (xdisp, vt, &xwa);	3692	XGetWindowAttributes (dpy, vt, &xwa);
3672		3693
3673	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3694	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3695	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675	}	3696	}
3676	#endif	3697	#endif

Diff Legend

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