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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.312 by root, Tue Nov 4 13:30:41 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
…		…
126	width = ncol;	108	width = ncol;
127	}	109	}
128		110
129	l.touch ();	111	l.touch ();
130		112
131	efs &= ~RS_baseattrMask;	113	efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));	114	efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133		115
134	text_t *et = l.t + col;	116	text_t *et = l.t + col;
135	rend_t *er = l.r + col;	117	rend_t *er = l.r + col;
136		118
…		…
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;
…		…
640	l.touch ();	622	l.touch ();
641	}	623	}
642		624
643	// erase newly scrolled-in lines	625	// erase newly scrolled-in lines
644	for (int i = count; i--; )	626	for (int i = count; i--; )
		627	{
		628	line_t &l = ROW(nrow - 1 - i);
		629
		630	// optimize if already cleared, can be significant on slow machines
		631	// could be rolled into scr_blank_screen_mem
		632	if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
		633	{
		634	scr_blank_line (l, 0, l.l, rstyle);
		635	l.l = 0;
		636	l.f = 0;
		637	}
		638	else
645	scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);	639	scr_blank_screen_mem (l, rstyle);
		640	}
646		641
647	// now copy lines below the scroll region bottom to the	642	// now copy lines below the scroll region bottom to the
648	// bottom of the screen again, so they look as if they	643	// bottom of the screen again, so they look as if they
649	// hadn't moved.	644	// hadn't moved.
650	for (int i = nrow; --i > row2; )	645	for (int i = nrow; --i > row2; )
…		…
653	line_t &l2 = ROW(i);	648	line_t &l2 = ROW(i);
654		649
655	::swap (l1, l2);	650	::swap (l1, l2);
656	l2.touch ();	651	l2.touch ();
657	}	652	}
658		653
659	// move and/or clear selection, if any	654	// move and/or clear selection, if any
660	if (selection.op && current_screen == selection.screen)	655	if (selection.op && current_screen == selection.screen)
661	{	656	{
662	selection.beg.row -= count;	657	selection.beg.row -= count;
663	selection.end.row -= count;	658	selection.end.row -= count;
…		…
671	selection.op = SELECTION_CLEAR;	666	selection.op = SELECTION_CLEAR;
672	}	667	}
673	}	668	}
674		669
675	// finally move the view window, if desired	670	// finally move the view window, if desired
676	if (OPTION (Opt_scrollWithBuffer)	671	if (option (Opt_scrollWithBuffer)
677	&& view_start != 0	672	&& view_start != 0
678	&& view_start != -saveLines)	673	&& view_start != -saveLines)
679	scr_page (UP, count);	674	scr_page (UP, count);
680		675
681	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	676	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
…		…
699	{	694	{
700	/* move selected region too */	695	/* move selected region too */
701	selection.beg.row -= count;	696	selection.beg.row -= count;
702	selection.end.row -= count;	697	selection.end.row -= count;
703	selection.mark.row -= count;	698	selection.mark.row -= count;
704		699
705	selection_check (0);	700	selection_check (0);
706	}	701	}
707	}	702	}
708		703
709	// use a simple and robust scrolling algorithm, this	704	// use a simple and robust scrolling algorithm, this
…		…
776		771
777	while (str < strend)	772	while (str < strend)
778	{	773	{
779	c = (unicode_t)*str++; // convert to rxvt-unicodes representation	774	c = (unicode_t)*str++; // convert to rxvt-unicodes representation
780		775
781	if (c < 0x20)	776	if (expect_false (c < 0x20))
782	if (c == C0_LF)	777	if (c == C0_LF)
783	{	778	{
784	max_it (line->l, screen.cur.col);	779	max_it (line->l, screen.cur.col);
785		780
786	screen.flags &= ~Screen_WrapNext;	781	screen.flags &= ~Screen_WrapNext;
…		…
805	{	800	{
806	scr_tab (1, true);	801	scr_tab (1, true);
807	continue;	802	continue;
808	}	803	}
809		804
		805	if (expect_false (
810	if (checksel /* see if we're writing within selection */	806	checksel /* see if we're writing within selection */
811	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	807	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
812	&& ROWCOL_IS_BEFORE (screen.cur, selection.end))	808	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)
		809	))
813	{	810	{
814	checksel = 0;	811	checksel = 0;
815	/*	812	/*
816	* If we wrote anywhere in the selected area, kill the selection	813	* If we wrote anywhere in the selected area, kill the selection
817	* XXX: should we kill the mark too? Possibly, but maybe that	814	* XXX: should we kill the mark too? Possibly, but maybe that
818	* should be a similar check.	815	* should be a similar check.
819	*/	816	*/
820	CLEAR_SELECTION ();	817	CLEAR_SELECTION ();
821	}	818	}
822		819
823	if (screen.flags & Screen_WrapNext)	820	if (expect_false (screen.flags & Screen_WrapNext))
824	{	821	{
825	scr_do_wrap ();	822	scr_do_wrap ();
826		823
827	line->l = ncol;	824	line->l = ncol;
828	line->is_longer (1);	825	line->is_longer (1);
829		826
830	row = screen.cur.row;	827	row = screen.cur.row;
831	line = &ROW(row); /* _must_ refresh */	828	line = &ROW(row); /* _must_ refresh */
832	}	829	}
833		830
834	// some utf-8 decoders "decode" surrogate characters: let's fix this.	831	// some utf-8 decoders "decode" surrogate characters: let's fix this.
835	if (IN_RANGE_INC (c, 0xd800, 0xdfff))	832	if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
836	c = 0xfffd;	833	c = 0xfffd;
837		834
838	// 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
839	// further replacements, as wcwidth might return -1 for the line	836	// further replacements, as wcwidth might return -1 for the line
840	// drawing characters below as they might be invalid in the current	837	// drawing characters below as they might be invalid in the current
841	// locale.	838	// locale.
842	int width = WCWIDTH (c);	839	int width = WCWIDTH (c);
843		840
844	if (charsets [screen.charset] == '0') // DEC SPECIAL	841	if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
845	{	842	{
846	// vt100 special graphics and line drawing	843	// vt100 special graphics and line drawing
847	// 5f-7e standard vt100	844	// 5f-7e standard vt100
848	// 40-5e rxvt extension for extra curses acs chars	845	// 40-5e rxvt extension for extra curses acs chars
849	static uint16_t vt100_0[62] = { // 41 .. 7e	846	static uint16_t vt100_0[62] = { // 41 .. 7e
…		…
862	c = vt100_0[c - 0x41];	859	c = vt100_0[c - 0x41];
863	width = 1; // vt100 line drawing characters are always single-width	860	width = 1; // vt100 line drawing characters are always single-width
864	}	861	}
865	}	862	}
866		863
867	if (screen.flags & Screen_Insert)	864	if (expect_false (screen.flags & Screen_Insert))
868	scr_insdel_chars (width, INSERT);	865	scr_insdel_chars (width, INSERT);
869		866
870	if (width != 0)	867	if (width != 0)
871	{	868	{
872	#if !UNICODE_3	869	#if !UNICODE_3
…		…
878	c = 0xfffd;	875	c = 0xfffd;
879	# endif	876	# endif
880	#endif	877	#endif
881		878
882	// nuke the character at this position, if required	879	// nuke the character at this position, if required
		880	if (expect_false (
883	if (line->t[screen.cur.col] == NOCHAR	881	line->t[screen.cur.col] == NOCHAR
884	|| (screen.cur.col < ncol - 1	882	|| (screen.cur.col < ncol - 1
885	&& line->t[screen.cur.col + 1] == NOCHAR))	883	&& line->t[screen.cur.col + 1] == NOCHAR)
		884	))
886	{	885	{
887	int col = screen.cur.col;	886	int col = screen.cur.col;
888		887
889	// find begin	888	// find begin
890	while (col > 0 && line->t[col] == NOCHAR)	889	while (col > 0 && line->t[col] == NOCHAR)
…		…
901	}	900	}
902		901
903	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	902	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904		903
905	// if the character doesn't fit into the remaining columns...	904	// if the character doesn't fit into the remaining columns...
906	if (screen.cur.col > ncol - width && ncol >= width)	905	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907	{	906	{
908	// ...output spaces	907	// ...output spaces
909	c = ' ';	908	c = ' ';
910	// and try the same character next loop iteration	909	// and try the same character next loop iteration
911	--str;	910	--str;
…		…
916	do	915	do
917	{	916	{
918	line->t[screen.cur.col] = c;	917	line->t[screen.cur.col] = c;
919	line->r[screen.cur.col] = rend;	918	line->r[screen.cur.col] = rend;
920		919
921	if (screen.cur.col < ncol - 1)	920	if (expect_true (screen.cur.col < ncol - 1))
922	screen.cur.col++;	921	screen.cur.col++;
923	else	922	else
924	{	923	{
925	line->l = ncol;	924	line->l = ncol;
926	if (screen.flags & Screen_Autowrap)	925	if (screen.flags & Screen_Autowrap)
…		…
928	break;	927	break;
929	}	928	}
930		929
931	c = NOCHAR;	930	c = NOCHAR;
932	}	931	}
933	while (--width > 0);	932	while (expect_false (--width > 0));
934		933
935	// pad with spaces when overwriting wide character with smaller one	934	// pad with spaces when overwriting wide character with smaller one
936	if (!width)	935	if (expect_false (!width))
937	{	936	{
938	line->touch ();	937	line->touch ();
939		938
940	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++)
941	{	940	{
942	line->t[c] = ' ';	941	line->t[c] = ' ';
943	line->r[c] = rend;	942	line->r[c] = rend;
944	}	943	}
945	}	944	}
946	}	945	}
		946	#if ENABLE_COMBINING
947	else // width == 0	947	else // width == 0
948	{	948	{
949	#if ENABLE_COMBINING	949	if (c != 0xfeff) // ignore BOM
950	// handle combining characters
951	// we just tag the accent on the previous on-screen character.
952	// this is arguably not correct, but also arguably not wrong.
953	// we don't handle double-width characters nicely yet.
954	line_t *linep;
955	text_t *tp;
956	rend_t *rp;
957
958	if (screen.cur.col > 0)
959	{	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	{
960	linep = line;	961	linep = line;
961	tp = line->t + screen.cur.col - 1;	962	tp = line->t + screen.cur.col - 1;
962	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));
963	}	987	}
964	else if (screen.cur.row > 0
965	&& ROW(screen.cur.row - 1).is_longer ())
966	{
967	linep = &ROW(screen.cur.row - 1);
968	tp = line->t + ncol - 1;
969	rp = line->r + ncol - 1;
970	}	988	}
971	else
972	continue;
973
974	linep->touch ();
975
976	while (*tp == NOCHAR && tp > linep->t)
977	tp--, rp--;
978
979	// first try to find a precomposed character
980	unicode_t n = rxvt_compose (*tp, c);
981	if (n == NOCHAR)
982	n = rxvt_composite.compose (*tp, c);
983
984	*tp = n;
985	*rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
986	#endif	989	#endif
987	}
988	}	990	}
989		991
990	max_it (line->l, screen.cur.col);	992	max_it (line->l, screen.cur.col);
991		993
992	#ifdef DEBUG_STRICT	994	#ifdef DEBUG_STRICT
…		…
1000	* XTERM_SEQ: CTRL-H	1002	* XTERM_SEQ: CTRL-H
1001	*/	1003	*/
1002	void	1004	void
1003	rxvt_term::scr_backspace () NOTHROW	1005	rxvt_term::scr_backspace () NOTHROW
1004	{	1006	{
1005	want_refresh = 1;
1006
1007	if (screen.cur.col == 0)	1007	if (screen.cur.col == 0)
1008	{	1008	{
1009	if (screen.cur.row > 0)	1009	if (screen.cur.row > 0)
1010	{	1010	{
1011	#ifdef TERMCAP_HAS_BW	1011	#ifdef TERMCAP_HAS_BW
1012	screen.cur.col = ncol - 1;	1012	screen.cur.col = ncol - 1;
1013	screen.cur.row--;	1013	--screen.cur.row;
1014	return;	1014
		1015	want_refresh = 1;
1015	#endif	1016	#endif
1016	}	1017	}
1017	}	1018	}
1018	else if (!(screen.flags & Screen_WrapNext))	1019	else
1019	scr_gotorc (0, -1, RELATIVE);	1020	scr_gotorc (0, -1, RELATIVE);
1020
1021	screen.flags &= ~Screen_WrapNext;
1022	}	1021	}
1023		1022
1024	/* ------------------------------------------------------------------------- */	1023	/* ------------------------------------------------------------------------- */
1025	/*	1024	/*
1026	* Process Horizontal Tab	1025	* Process Horizontal Tab
…		…
1049	x = i;	1048	x = i;
1050		1049
1051	if (!--count)	1050	if (!--count)
1052	break;	1051	break;
1053	}	1052	}
1054	else	1053	else
1055	ht &= l.t[i] == ' '	1054	ht &= l.t[i] == ' '
1056	&& RS_SAME (l.r[i], base_rend);	1055	&& RS_SAME (l.r[i], base_rend);
1057		1056
1058	if (count)	1057	if (count)
1059	x = ncol - 1;	1058	x = ncol - 1;
1060		1059
1061	// store horizontal tab commands as characters inside the text	1060	// store horizontal tab commands as characters inside the text
1062	// buffer so they can be selected and pasted.	1061	// buffer so they can be selected and pasted.
1063	if (ht && OPTION (Opt_pastableTabs))	1062	if (ht && option (Opt_pastableTabs))
1064	{	1063	{
1065	base_rend = SET_FONT (base_rend, 0);	1064	base_rend = SET_FONT (base_rend, 0);
1066		1065
1067	l.touch (x);	1066	l.touch (x);
1068		1067
…		…
1101	* Process DEC Back Index	1100	* Process DEC Back Index
1102	* XTERM_SEQ: ESC 6	1101	* XTERM_SEQ: ESC 6
1103	* 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
1104	* in that row right. Clear left column.	1103	* in that row right. Clear left column.
1105	*/	1104	*/
1106	#if ENABLE_FRILLS	1105	#if !ENABLE_MINIMAL
1107	void	1106	void
1108	rxvt_term::scr_backindex () NOTHROW	1107	rxvt_term::scr_backindex () NOTHROW
1109	{	1108	{
1110	if (screen.cur.col > 0)	1109	if (screen.cur.col > 0)
1111	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);	1110	scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
…		…
1118	* Process DEC Forward Index	1117	* Process DEC Forward Index
1119	* XTERM_SEQ: ESC 9	1118	* XTERM_SEQ: ESC 9
1120	* 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
1121	* in that row left. Clear right column.	1120	* in that row left. Clear right column.
1122	*/	1121	*/
1123	#if ENABLE_FRILLS	1122	#if !ENABLE_MINIMAL
1124	void	1123	void
1125	rxvt_term::scr_forwardindex () NOTHROW	1124	rxvt_term::scr_forwardindex () NOTHROW
1126	{	1125	{
1127	if (screen.cur.col < ncol - 1)	1126	if (screen.cur.col < ncol - 1)
1128	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);	1127	scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
…		…
1175	}	1174	}
1176	}	1175	}
1177	else	1176	else
1178	{	1177	{
1179	if (screen.flags & Screen_Relative)	1178	if (screen.flags & Screen_Relative)
		1179	{
1180	{ /* relative origin mode */	1180	/* relative origin mode */
1181	screen.cur.row = row + screen.tscroll;	1181	screen.cur.row = row + screen.tscroll;
1182	min_it (screen.cur.row, screen.bscroll);	1182	min_it (screen.cur.row, screen.bscroll);
1183	}	1183	}
1184	else	1184	else
1185	screen.cur.row = row;	1185	screen.cur.row = row;
…		…
1218	/*	1218	/*
1219	* Erase part or whole of a line	1219	* Erase part or whole of a line
1220	* XTERM_SEQ: Clear line to right: ESC [ 0 K	1220	* XTERM_SEQ: Clear line to right: ESC [ 0 K
1221	* XTERM_SEQ: Clear line to left : ESC [ 1 K	1221	* XTERM_SEQ: Clear line to left : ESC [ 1 K
1222	* 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
1223	*/	1224	*/
1224	void	1225	void
1225	rxvt_term::scr_erase_line (int mode) NOTHROW	1226	rxvt_term::scr_erase_line (int mode) NOTHROW
1226	{	1227	{
1227	unsigned int col, num;	1228	unsigned int col, num;
…		…
1236	line.touch ();	1237	line.touch ();
1237	line.is_longer (0);	1238	line.is_longer (0);
1238		1239
1239	switch (mode)	1240	switch (mode)
1240	{	1241	{
		1242	case 3:
		1243	if (screen.flags & Screen_WrapNext)
		1244	return;
		1245
		1246	/* fall through */
		1247
1241	case 0: /* erase to end of line */	1248	case 0: /* erase to end of line */
1242	col = screen.cur.col;	1249	col = screen.cur.col;
1243	num = ncol - col;	1250	num = ncol - col;
1244	min_it (line.l, col);	1251	min_it (line.l, col);
		1252
1245	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)	1253	if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1246	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))	1254	|| ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1247	CLEAR_SELECTION ();	1255	CLEAR_SELECTION ();
1248	break;	1256	break;
		1257
1249	case 1: /* erase to beginning of line */	1258	case 1: /* erase to beginning of line */
1250	col = 0;	1259	col = 0;
1251	num = screen.cur.col + 1;	1260	num = screen.cur.col + 1;
		1261
1252	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)	1262	if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1253	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))	1263	|| ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1254	CLEAR_SELECTION ();	1264	CLEAR_SELECTION ();
1255	break;	1265	break;
		1266
1256	case 2: /* erase whole line */	1267	case 2: /* erase whole line */
1257	col = 0;	1268	col = 0;
1258	num = ncol;	1269	num = ncol;
1259	line.l = 0;	1270	line.l = 0;
1260	if (selection.beg.row <= screen.cur.row	1271	if (selection.beg.row <= screen.cur.row
…		…
1318	if (row >= nrow) /* Out Of Bounds */	1329	if (row >= nrow) /* Out Of Bounds */
1319	return;	1330	return;
1320		1331
1321	min_it (num, nrow - row);	1332	min_it (num, nrow - row);
1322		1333
		1334	/*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1323	if (rstyle & (RS_RVid | RS_Uline))	1335	if (rstyle & (RS_RVid | RS_Uline))
1324	ren = (rend_t) ~RS_None;	1336	ren = (rend_t) ~RS_None;
1325	else if (GET_BASEBG (rstyle) == Color_bg)	1337	else if (GET_BASEBG (rstyle) == Color_bg)
1326	{	1338	{
1327	ren = DEFAULT_RSTYLE;	1339	ren = DEFAULT_RSTYLE;
1328	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);
1329	}	1345	}
1330	else	1346	else
1331	{	1347	{
1332	ren = rstyle & (RS_fgMask | RS_bgMask);	1348	ren = rstyle & (RS_fgMask | RS_bgMask);
		1349
1333	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];	1350	gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334	XChangeGC (xdisp, gc, GCForeground, &gcvalue);	1351	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335	ERASE_ROWS (row, num);	1352	XFillRectangle (dpy, vt, gc,
		1353	0, Row2Pixel (row),
		1354	(unsigned int)width,
		1355	(unsigned int)Height2Pixel (num));
1336	gcvalue.foreground = pix_colors[Color_fg];	1356	gcvalue.foreground = pix_colors[Color_fg];
1337	XChangeGC (xdisp, gc, GCForeground, &gcvalue);	1357	XChangeGC (dpy, gc, GCForeground, &gcvalue);
1338	}	1358	}
1339		1359
1340	for (; num--; row++)	1360	for (; num--; row++)
1341	{	1361	{
1342	scr_blank_screen_mem (ROW(row), rstyle);	1362	scr_blank_screen_mem (ROW(row), rstyle);
1343	scr_blank_line (drawn_buf [row], 0, ncol, ren);	1363	scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344	}	1364	}
1345	}	1365	}
1346		1366
1347	#if ENABLE_FRILLS	1367	#if !ENABLE_MINIMAL
1348	void	1368	void
1349	rxvt_term::scr_erase_savelines () NOTHROW	1369	rxvt_term::scr_erase_savelines () NOTHROW
1350	{	1370	{
1351	want_refresh = 1;	1371	want_refresh = 1;
1352	ZERO_SCROLLBACK ();	1372	ZERO_SCROLLBACK ();
…		…
1461	{	1481	{
1462	if (selection.end.row != screen.cur.row	1482	if (selection.end.row != screen.cur.row
1463	|| (selection.end.col + count >= ncol))	1483	|| (selection.end.col + count >= ncol))
1464	CLEAR_SELECTION ();	1484	CLEAR_SELECTION ();
1465	else	1485	else
		1486	{
1466	{ /* shift selection */	1487	/* shift selection */
1467	selection.beg.col += count;	1488	selection.beg.col += count;
1468	selection.mark.col += count; /* XXX: yes? */	1489	selection.mark.col += count; /* XXX: yes? */
1469	selection.end.col += count;	1490	selection.end.col += count;
1470	}	1491	}
1471	}	1492	}
…		…
1476	case ERASE:	1497	case ERASE:
1477	screen.cur.col += count; /* don't worry if > ncol */	1498	screen.cur.col += count; /* don't worry if > ncol */
1478	selection_check (1);	1499	selection_check (1);
1479	screen.cur.col -= count;	1500	screen.cur.col -= count;
1480		1501
1481	line->l = max (line->l - count, 0);
1482	scr_blank_line (*line, screen.cur.col, count, rstyle);	1502	scr_blank_line (*line, screen.cur.col, count, rstyle);
1483	break;	1503	break;
1484		1504
1485	case DELETE:	1505	case DELETE:
1486	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);	1506	tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
…		…
1610	*/	1630	*/
1611	void	1631	void
1612	rxvt_term::scr_set_tab (int mode) NOTHROW	1632	rxvt_term::scr_set_tab (int mode) NOTHROW
1613	{	1633	{
1614	if (mode < 0)	1634	if (mode < 0)
1615	memset (tabs, 0, ncol * sizeof (char));	1635	memset (tabs, 0, ncol);
1616	else if (screen.cur.col < ncol)	1636	else if (screen.cur.col < ncol)
1617	tabs [screen.cur.col] = !!mode;	1637	tabs [screen.cur.col] = !!mode;
1618	}	1638	}
1619		1639
1620	/* ------------------------------------------------------------------------- */	1640	/* ------------------------------------------------------------------------- */
…		…
1635	if (rvideo_state != on)	1655	if (rvideo_state != on)
1636	{	1656	{
1637	rvideo_state = on;	1657	rvideo_state = on;
1638		1658
1639	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1659	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640	#if XPM_BACKGROUND	1660	#ifdef HAVE_BG_PIXMAP
1641	if (bgPixmap.pixmap == None)	1661	if (bgPixmap.pixmap == None)
1642	#endif	1662	#endif
1643	#if TRANSPARENT
1644	if (!OPTION (Opt_transparent) || am_transparent == 0)
1645	#endif
1646	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);	1663	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647		1664
1648	XGCValues gcvalue;	1665	XGCValues gcvalue;
1649	gcvalue.foreground = pix_colors[Color_fg];	1666	gcvalue.foreground = pix_colors[Color_fg];
1650	gcvalue.background = pix_colors[Color_bg];	1667	gcvalue.background = pix_colors[Color_bg];
1651	XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);	1668	XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652		1669
1653	scr_clear ();	1670	scr_clear ();
1654	scr_touch (true);	1671	scr_touch (true);
1655	}	1672	}
1656	}	1673	}
…		…
1741	{	1758	{
1742	bool found = false;	1759	bool found = false;
1743		1760
1744	for (int i = 0; i < nrow; i++)	1761	for (int i = 0; i < nrow; i++)
1745	{	1762	{
1746	int col = 0;
1747	rend_t *drp = drawn_buf[i].r;	1763	rend_t *drp = drawn_buf[i].r;
1748		1764
1749	for (; col < ncol; col++, drp++)	1765	for (int col = 0; col < ncol; col++, drp++)
1750	if ((*drp & mask) == value)	1766	if ((*drp & mask) == value)
1751	{	1767	{
1752	found = true;	1768	found = true;
1753	*drp = ~value;	1769	*drp = ~value;
1754	}	1770	}
…		…
1794	for (i = PART_BEG; i < RC_COUNT; i++)	1810	for (i = PART_BEG; i < RC_COUNT; i++)
1795	{	1811	{
1796	min_it (rc[i].col, ncol - 1);	1812	min_it (rc[i].col, ncol - 1);
1797	min_it (rc[i].row, nrow - 1);	1813	min_it (rc[i].row, nrow - 1);
1798	}	1814	}
1799		1815	// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1800	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)	1816	for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1801	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);	1817	fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1802		1818
1803	num_scr_allow = 0;	1819	num_scr_allow = 0;
1804		1820
…		…
1859	return true;	1875	return true;
1860	}	1876	}
1861		1877
1862	#ifndef NO_BELL	1878	#ifndef NO_BELL
1863	void	1879	void
1864	rxvt_term::bell_cb (time_watcher &w)	1880	rxvt_term::bell_cb (ev::timer &w, int revents)
1865	{	1881	{
1866	rvideo_bell = false;	1882	rvideo_bell = false;
1867	scr_rvideo_mode (rvideo_mode);	1883	scr_rvideo_mode (rvideo_mode);
		1884	refresh_check ();
1868	}	1885	}
1869	#endif	1886	#endif
1870		1887
1871	/* ------------------------------------------------------------------------- */	1888	/* ------------------------------------------------------------------------- */
1872	void	1889	void
…		…
1874	{	1891	{
1875	#ifndef NO_BELL	1892	#ifndef NO_BELL
1876		1893
1877	# ifndef NO_MAPALERT	1894	# ifndef NO_MAPALERT
1878	# ifdef MAPALERT_OPTION	1895	# ifdef MAPALERT_OPTION
1879	if (OPTION (Opt_mapAlert))	1896	if (option (Opt_mapAlert))
1880	# endif	1897	# endif
1881	XMapWindow (xdisp, parent[0]);	1898	XMapWindow (dpy, parent[0]);
1882	# endif	1899	# endif
1883		1900
		1901	# if ENABLE_FRILLS
		1902	if (option (Opt_urgentOnBell))
		1903	set_urgency (1);
		1904	# endif
		1905
1884	if (OPTION (Opt_visualBell))	1906	if (option (Opt_visualBell))
1885	{	1907	{
1886	rvideo_bell = true;	1908	rvideo_bell = true;
1887	scr_rvideo_mode (rvideo_mode);	1909	scr_rvideo_mode (rvideo_mode);
1888	display->flush ();	1910	flush ();
1889		1911
1890	bell_ev.start (NOW + VISUAL_BELL_DURATION);	1912	bell_ev.start (VISUAL_BELL_DURATION);
1891	}	1913	}
1892	else	1914	else
1893	XBell (xdisp, 0);	1915	XBell (dpy, 0);
1894
1895	#endif	1916	#endif
1896	}	1917	}
1897		1918
1898	/* ------------------------------------------------------------------------- */	1919	/* ------------------------------------------------------------------------- */
1899	/* ARGSUSED */	1920	/* ARGSUSED */
1900	void	1921	void
1901	rxvt_term::scr_printscreen (int fullhist) NOTHROW	1922	rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902	{	1923	{
1903	#ifdef PRINTPIPE	1924	#ifdef PRINTPIPE
1904	int nrows, row_start;	1925	int nrows, row_start;
1905	FILE *fd;	1926	FILE *fd = popen_printer ();
1906		1927
1907	if ((fd = popen_printer ()) == NULL)	1928	if (!fd)
1908	return;	1929	return;
1909		1930
1910	if (fullhist)	1931	if (fullhist)
1911	{	1932	{
1912	nrows = nrow - top_row;	1933	nrows = nrow - top_row;
…		…
1957	* screen.text/screen.rend contain what the screen will change to.	1978	* screen.text/screen.rend contain what the screen will change to.
1958	*/	1979	*/
1959	void	1980	void
1960	rxvt_term::scr_refresh () NOTHROW	1981	rxvt_term::scr_refresh () NOTHROW
1961	{	1982	{
1962	unsigned char must_clear, /* use draw_string not draw_image_string */	1983	unsigned char have_bg,
1963	showcursor; /* show the cursor */	1984	showcursor; /* show the cursor */
1964	int16_t col, row, /* column/row we're processing */	1985	int16_t col, row, /* column/row we're processing */
1965	ocrow; /* old cursor row */	1986	ocrow; /* old cursor row */
1966	int i; /* tmp */	1987	int i; /* tmp */
1967	#ifndef NO_CURSORCOLOR	1988	#ifndef NO_CURSORCOLOR
1968	rend_t cc1; /* store colours at cursor position (s) */	1989	rend_t cc1; /* store colours at cursor position (s) */
1969	#endif	1990	#endif
1970	rend_t *crp; // cursor rendition pointer	1991	rend_t *crp; // cursor rendition pointer
		1992	rend_t ccol1, /* Cursor colour */
		1993	ccol2; /* Cursor colour2 */
1971		1994
1972	want_refresh = 0; /* screen is current */	1995	want_refresh = 0; /* screen is current */
1973		1996
1974	if (refresh_type == NO_REFRESH || !mapped)	1997	if (refresh_type == NO_REFRESH || !mapped)
1975	return;	1998	return;
1976		1999
1977	/*	2000	/*
1978	* A: set up vars	2001	* A: set up vars
1979	*/	2002	*/
1980	must_clear = 0;
1981	refresh_count = 0;	2003	refresh_count = 0;
1982		2004
1983	#if XPM_BACKGROUND	2005	have_bg = 0;
		2006	#ifdef HAVE_BG_PIXMAP
1984	must_clear |= bgPixmap.pixmap != None;	2007	have_bg = bgPixmap.pixmap != None;
1985	#endif
1986	#if TRANSPARENT
1987	must_clear |= OPTION (Opt_transparent) && am_transparent;
1988	#endif	2008	#endif
1989	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2009	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990		2010
1991	/*	2011	/*
1992	* B: reverse any characters which are selected	2012	* B: reverse any characters which are selected
…		…
1996	/*	2016	/*
1997	* C: set the cursor character (s)	2017	* C: set the cursor character (s)
1998	*/	2018	*/
1999	{	2019	{
2000	unsigned char setoldcursor;	2020	unsigned char setoldcursor;
2001	rend_t ccol1, /* Cursor colour */
2002	ccol2; /* Cursor colour2 */
2003		2021
2004	showcursor = (screen.flags & Screen_VisibleCursor);	2022	showcursor = (screen.flags & Screen_VisibleCursor);
2005	#ifdef CURSOR_BLINK	2023	#ifdef CURSOR_BLINK
2006	if (hidden_cursor)	2024	if (hidden_cursor)
2007	showcursor = 0;	2025	showcursor = 0;
…		…
2014	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2032	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015	col--;	2033	col--;
2016		2034
2017	crp = &ROW(screen.cur.row).r[col];	2035	crp = &ROW(screen.cur.row).r[col];
2018		2036
		2037	#ifndef NO_CURSORCOLOR
		2038	cc1 = *crp & (RS_fgMask | RS_bgMask);
		2039	if (ISSET_PIXCOLOR (Color_cursor))
		2040	ccol1 = Color_cursor;
		2041	else
		2042	#endif
		2043	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2044	ccol1 = fgcolor_of (rstyle);
		2045	#else
		2046	ccol1 = Color_fg;
		2047	#endif
		2048
		2049	#ifndef NO_CURSORCOLOR
		2050	if (ISSET_PIXCOLOR (Color_cursor2))
		2051	ccol2 = Color_cursor2;
		2052	else
		2053	#endif
		2054	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
		2055	ccol2 = bgcolor_of (rstyle);
		2056	#else
		2057	ccol2 = Color_bg;
		2058	#endif
		2059
2019	if (showcursor && focus)	2060	if (showcursor && focus)
2020	{	2061	{
2021	if (OPTION (Opt_cursorUnderline))	2062	if (option (Opt_cursorUnderline))
2022	*crp ^= RS_Uline;	2063	*crp ^= RS_Uline;
2023	else	2064	else
2024	{	2065	{
2025	*crp ^= RS_RVid;	2066	*crp ^= RS_RVid;
2026
2027	#ifndef NO_CURSORCOLOR
2028	cc1 = *crp & (RS_fgMask | RS_bgMask);
2029	if (ISSET_PIXCOLOR (Color_cursor))
2030	ccol1 = Color_cursor;
2031	else
2032	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033	ccol1 = fgcolor_of (rstyle);
2034	#else
2035	ccol1 = Color_fg;
2036	#endif
2037	if (ISSET_PIXCOLOR (Color_cursor2))
2038	ccol2 = Color_cursor2;
2039	else
2040	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041	ccol2 = bgcolor_of (rstyle);
2042	#else
2043	ccol2 = Color_bg;
2044	#endif
2045	*crp = SET_FGCOLOR (*crp, ccol1);	2067	*crp = SET_FGCOLOR (*crp, ccol1);
2046	*crp = SET_BGCOLOR (*crp, ccol2);	2068	*crp = SET_BGCOLOR (*crp, ccol2);
2047	#endif
2048	}	2069	}
2049	}	2070	}
2050	}	2071	}
2051		2072
2052	/* make sure no outline cursor is left around */	2073	/* make sure no outline cursor is left around */
…		…
2091	* D: CopyArea pass - very useful for slower links	2112	* D: CopyArea pass - very useful for slower links
2092	* This has been deliberately kept simple.	2113	* This has been deliberately kept simple.
2093	*/	2114	*/
2094	if (!display->is_local	2115	if (!display->is_local
2095	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr	2116	&& refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096	&& abs (num_scr) < nrow && !must_clear)	2117	&& abs (num_scr) < nrow && !have_bg)
2097	{	2118	{
2098	int16_t nits;	2119	int16_t nits;
		2120	int i = num_scr;
2099	int j;	2121	int j;
2100	int len, wlen;	2122	int len, wlen;
2101	dLocal (int, num_scr);	2123	dLocal (int, num_scr);
2102		2124
2103	j = nrow;	2125	j = nrow;
2104	wlen = len = -1;	2126	wlen = len = -1;
2105	row = i > 0 ? 0 : j - 1;	2127	row = i > 0 ? 0 : j - 1;
		2128
2106	for (; j-- >= 0; row += (i > 0 ? 1 : -1))	2129	for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107	{	2130	{
2108	if (row + i >= 0 && row + i < nrow && row + i != ocrow)	2131	if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109	{	2132	{
2110	line_t s = ROW(view_start + row);	2133	line_t s = ROW(view_start + row);
…		…
2131	wlen = row;	2154	wlen = row;
2132	continue;	2155	continue;
2133	}	2156	}
2134	}	2157	}
2135		2158
2136	if (len != -1)	2159	if (len >= 0)
2137	{	2160	{
2138	/* also comes here at end if needed because of >= above */	2161	/* also comes here at end if needed because of >= above */
2139	if (wlen < len)	2162	if (wlen < len)
2140	::swap (wlen, len);	2163	::swap (wlen, len);
2141		2164
		2165	XGCValues gcv;
		2166
		2167	gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142	XCopyArea (xdisp, vt, vt,	2168	XCopyArea (dpy, vt, vt,
2143	gc, 0, Row2Pixel (len + i),	2169	gc, 0, Row2Pixel (len + i),
2144	(unsigned int)this->width,	2170	(unsigned int)this->width,
2145	(unsigned int)Height2Pixel (wlen - len + 1),	2171	(unsigned int)Height2Pixel (wlen - len + 1),
2146	0, Row2Pixel (len));	2172	0, Row2Pixel (len));
		2173	gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
		2174
2147	len = -1;	2175	len = -1;
2148	}	2176	}
2149	}	2177	}
2150	}	2178	}
2151	#endif	2179	#endif
…		…
2175	continue;	2203	continue;
2176		2204
2177	// redraw one or more characters	2205	// redraw one or more characters
2178		2206
2179	// seek to the beginning of wide characters	2207	// seek to the beginning of wide characters
2180	while (stp[col] == NOCHAR && col > 0)	2208	while (expect_false (stp[col] == NOCHAR && col > 0))
2181	--col;	2209	--col;
2182		2210
2183	rend_t rend = srp[col]; /* screen rendition (target rendtion) */	2211	rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2184	text_t *text = stp + col;	2212	text_t *text = stp + col;
2185	int count = 1;	2213	int count = 1;
…		…
2207	count++;	2235	count++;
2208		2236
2209	if (stp[col] != dtp[col]	2237	if (stp[col] != dtp[col]
2210	|| !RS_SAME (srp[col], drp[col]))	2238	|| !RS_SAME (srp[col], drp[col]))
2211	{	2239	{
2212	if (must_clear && (i++ > count / 2))	2240	if (have_bg && (i++ > count / 2))
2213	break;	2241	break;
2214		2242
2215	dtp[col] = stp[col];	2243	dtp[col] = stp[col];
2216	drp[col] = rend;	2244	drp[col] = rend;
2217	i = 0;	2245	i = 0;
2218	}	2246	}
2219	else if (must_clear || (stp[col] != ' ' && ++i >= 16))	2247	else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220	break;	2248	break;
2221	}	2249	}
2222		2250
2223	col--; /* went one too far. move back */	2251	col--; /* went one too far. move back */
2224	count -= i; /* dump any matching trailing chars */	2252	count -= i; /* dump any matching trailing chars */
2225		2253
2226	// sometimes we optimize away the trailing NOCHAR's, add them back	2254	// sometimes we optimize away the trailing NOCHAR's, add them back
2227	while (i && text[count] == NOCHAR)	2255	while (expect_false (i && text[count] == NOCHAR))
2228	count++, i--;	2256	count++, i--;
2229		2257
2230	/*	2258	/*
2231	* Determine the attributes for the string	2259	* Determine the attributes for the string
2232	*/	2260	*/
2233	int fore = fgcolor_of (rend); // desired foreground	2261	int fore = fgcolor_of (rend); // desired foreground
2234	int back = bgcolor_of (rend); // desired background	2262	int back = bgcolor_of (rend); // desired background
2235		2263
2236	// only do special processing if any attributes are set, which is unlikely	2264	// only do special processing if any attributes are set, which is unlikely
2237	if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))	2265	if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2238	{	2266	{
2239	#if ENABLE_STYLES
2240	// "careful" (too wide) character handling
2241
2242	// include previous careful character(s) if possible, looks nicer (best effort...)
2243	while (text > stp
2244	&& srp[text - stp - 1] & RS_Careful
2245	&& RS_SAME (rend, srp[text - stp - 1]))
2246	text--, count++, xpixel -= fwidth;
2247
2248	// force redraw after "careful" characters to avoid pixel droppings
2249	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250	drp[col + i + 1] = ~srp[col + i + 1];
2251
2252	// force redraw before "careful" characters to avoid pixel droppings
2253	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254	drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2255	#endif
2256
2257	bool invert = rend & RS_RVid;	2267	bool invert = rend & RS_RVid;
2258		2268
2259	#ifndef NO_BOLD_UNDERLINE_REVERSE	2269	#ifndef NO_BOLD_UNDERLINE_REVERSE
2260	if (rend & RS_Bold
2261	&& fore == Color_fg)	2270	if (rend & RS_Bold && fore == Color_fg)
2262	{	2271	{
2263	if (ISSET_PIXCOLOR (Color_BD))	2272	if (ISSET_PIXCOLOR (Color_BD))
2264	fore = Color_BD;	2273	fore = Color_BD;
2265	# if !ENABLE_STYLES	2274	# if !ENABLE_STYLES
2266	else	2275	else
2267	invert = !invert;	2276	invert = !invert;
2268	# endif	2277	# endif
2269	}	2278	}
2270		2279
2271	if (rend & RS_Italic	2280	if (rend & RS_Italic && fore == Color_fg)
2272	&& fore == Color_fg)
2273	{	2281	{
2274	if (ISSET_PIXCOLOR (Color_IT))	2282	if (ISSET_PIXCOLOR (Color_IT))
2275	fore = Color_IT;	2283	fore = Color_IT;
2276	# if !ENABLE_STYLES	2284	# if !ENABLE_STYLES
2277	else	2285	else
2278	invert = !invert;	2286	invert = !invert;
2279	# endif	2287	# endif
2280	}	2288	}
2281		2289
2282	if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))	2290	if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283	fore = Color_UL;	2291	fore = Color_UL;
2284	#endif	2292	#endif
2285		2293
2286	if (invert)	2294	if (invert)
2287	{	2295	{
		2296	#ifdef OPTION_HC
		2297	if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
		2298	|| !ISSET_PIXCOLOR (Color_HC))
		2299	#endif
		2300	/* invert the column if no highlightColor is set or it is the
		2301	* current cursor column */
2288	::swap (fore, back);	2302	::swap (fore, back);
		2303	#ifdef OPTION_HC
		2304	else if (ISSET_PIXCOLOR (Color_HC))
		2305	back = Color_HC;
		2306	#endif
2289		2307
2290	#ifndef NO_BOLD_UNDERLINE_REVERSE	2308	#ifndef NO_BOLD_UNDERLINE_REVERSE
		2309	# ifndef OPTION_HC
2291	if (ISSET_PIXCOLOR (Color_RV))	2310	if (ISSET_PIXCOLOR (Color_RV))
2292	back = Color_RV;	2311	back = Color_RV;
2293		2312	# endif
2294	if (fore == back)	2313	if (fore == back)
2295	{	2314	{
2296	fore = Color_bg;	2315	fore = Color_bg;
2297	back = Color_fg;	2316	back = Color_fg;
2298	}	2317	}
…		…
2300	}	2319	}
2301		2320
2302	#ifdef TEXT_BLINK	2321	#ifdef TEXT_BLINK
2303	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))	2322	if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2304	{	2323	{
2305	if (!text_blink_ev.active)	2324	if (!text_blink_ev.is_active ())
2306	{	2325	{
2307	text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);	2326	text_blink_ev.again ();
2308	hidden_text = 0;	2327	hidden_text = 0;
2309	}	2328	}
2310	else if (hidden_text)	2329	else if (hidden_text)
2311	fore = back;	2330	fore = back;
2312	}	2331	}
2313	#endif	2332	#endif
		2333
		2334	#if ENABLE_STYLES
		2335	// "careful" (too wide) character handling
		2336
		2337	// include previous careful character(s) if possible, looks nicer (best effort...)
		2338	while (text > stp
		2339	&& srp[text - stp - 1] & RS_Careful
		2340	&& RS_SAME (rend, srp[text - stp - 1]))
		2341	text--, count++, xpixel -= fwidth;
		2342
		2343	// force redraw after "careful" characters to avoid pixel droppings
		2344	for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
		2345	drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
		2346
		2347	// force redraw before "careful" characters to avoid pixel droppings
		2348	for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
		2349	drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
		2350	#endif
2314	}	2351	}
2315		2352
2316	/*	2353	/*
2317	* Actually do the drawing of the string here	2354	* Actually do the drawing of the string here
2318	*/	2355	*/
2319	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];	2356	rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320		2357
2321	if (back == fore)	2358	if (expect_true (have_bg && back == Color_bg))
2322	font->clear_rect (*drawable, xpixel, ypixel,
2323	fwidth * count, fheight,
2324	back);
2325	else if (back == Color_bg)
2326	{	2359	{
2327	if (must_clear)	2360	// this is very ugly, maybe push it into ->draw?
2328	{
2329	CLEAR_CHARS (xpixel, ypixel, count);
2330		2361
2331	for (i = 0; i < count; i++) /* don't draw empty strings */	2362	for (i = 0; i < count; i++) /* don't draw empty strings */
2332	if (text[i] != ' ')	2363	if (text[i] != ' ')
2333	{	2364	{
2334	font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);	2365	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335	break;	2366	goto did_clear;
2336	}
2337	}	2367	}
2338	else	2368
2339	font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);	2369	CLEAR_CHARS (xpixel, ypixel, count);
		2370	did_clear: ;
2340	}	2371	}
2341	else	2372	else
2342	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2373	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343		2374
2344	if (rend & RS_Uline && font->descent > 1 && fore != back)	2375	if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2345	{	2376	{
2346	#if ENABLE_FRILLS	2377	#if ENABLE_FRILLS
2347	if (ISSET_PIXCOLOR (Color_underline))	2378	if (ISSET_PIXCOLOR (Color_underline))
2348	XSetForeground (xdisp, gc, pix_colors[Color_underline]);	2379	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349	else	2380	else
2350	#endif	2381	#endif
2351	XSetForeground (xdisp, gc, pix_colors[fore]);	2382	XSetForeground (dpy, gc, pix_colors[fore]);
2352		2383
2353	XDrawLine (xdisp, drawBuffer, gc,	2384	XDrawLine (dpy, vt, gc,
2354	xpixel, ypixel + font->ascent + 1,	2385	xpixel, ypixel + font->ascent + 1,
2355	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);	2386	xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356	}	2387	}
2357	} /* for (col....) */	2388	} /* for (col....) */
2358	} /* for (row....) */	2389	} /* for (row....) */
…		…
2367	*/	2398	*/
2368	if (showcursor)	2399	if (showcursor)
2369	{	2400	{
2370	if (focus)	2401	if (focus)
2371	{	2402	{
2372	if (OPTION (Opt_cursorUnderline))	2403	if (option (Opt_cursorUnderline))
2373	*crp ^= RS_Uline;	2404	*crp ^= RS_Uline;
2374	else	2405	else
2375	{	2406	{
2376	*crp ^= RS_RVid;	2407	*crp ^= RS_RVid;
2377	#ifndef NO_CURSORCOLOR	2408	#ifndef NO_CURSORCOLOR
…		…
2391	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2422	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392	cursorwidth++;	2423	cursorwidth++;
2393		2424
2394	#ifndef NO_CURSORCOLOR	2425	#ifndef NO_CURSORCOLOR
2395	if (ISSET_PIXCOLOR (Color_cursor))	2426	if (ISSET_PIXCOLOR (Color_cursor))
2396	XSetForeground (xdisp, gc, pix_colors[Color_cursor]);	2427	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
		2428	else
2397	#endif	2429	#endif
		2430	XSetForeground (dpy, gc, pix_colors[ccol1]);
2398		2431
2399	XDrawRectangle (xdisp, drawBuffer, gc,	2432	XDrawRectangle (dpy, vt, gc,
2400	Col2Pixel (col),	2433	Col2Pixel (col),
2401	Row2Pixel (oldcursor.row),	2434	Row2Pixel (oldcursor.row),
2402	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2435	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2403	(unsigned int) (Height2Pixel (1) - lineSpace - 1));	2436	(unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404	}	2437	}
…		…
2439	}	2472	}
2440		2473
2441	void	2474	void
2442	rxvt_term::scr_recolour () NOTHROW	2475	rxvt_term::scr_recolour () NOTHROW
2443	{	2476	{
2444	if (1	2477	#ifdef HAVE_BG_PIXMAP
2445	#if TRANSPARENT	2478	bgPixmap.apply ();
2446	&& !am_transparent	2479	#else
2447	#endif	2480
2448	#if XPM_BACKGROUND
2449	&& !bgPixmap.pixmap
2450	#endif
2451	)
2452	{
2453	XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);	2481	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454	XClearWindow (xdisp, parent[0]);	2482	XClearWindow (dpy, parent[0]);
2455	XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);	2483	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456	#if HAVE_SCROLLBARS	2484
2457	if (scrollBar.win)	2485	if (scrollBar.win)
2458	{	2486	{
2459	XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);	2487	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460	scrollBar.setIdle ();	2488	scrollBar.state = STATE_IDLE;
2461	scrollbar_show (0);	2489	scrollBar.show (0);
2462	}
2463	#endif
2464	}	2490	}
2465		2491
		2492	#endif
		2493
		2494	/* bgPixmap.apply () does not do the following : */
2466	scr_clear ();	2495	scr_clear ();
2467	scr_touch (true);	2496	scr_touch (true);
2468	want_refresh = 1;	2497	want_refresh = 1;
2469	}	2498	}
2470		2499
…		…
2477		2506
2478	num_scr_allow = 0;	2507	num_scr_allow = 0;
2479	want_refresh = 1;	2508	want_refresh = 1;
2480		2509
2481	if (really)	2510	if (really)
2482	XClearWindow (xdisp, vt);	2511	XClearWindow (dpy, vt);
2483	}	2512	}
2484		2513
2485	void	2514	void
2486	rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW	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
2487	{	2516	{
…		…
2536	{	2565	{
2537	if (selection.op	2566	if (selection.op
2538	&& current_screen == selection.screen	2567	&& current_screen == selection.screen
2539	&& selection.end.row >= view_start)	2568	&& selection.end.row >= view_start)
2540	{	2569	{
2541	#if ENABLE_FRILLS	2570	#if !ENABLE_MINIMAL
2542	if (selection.rect)	2571	if (selection.rect)
2543	scr_xor_rect (selection.beg.row, selection.beg.col,	2572	scr_xor_rect (selection.beg.row, selection.beg.col,
2544	selection.end.row, selection.end.col,	2573	selection.end.row, selection.end.col,
2545	RS_RVid, RS_RVid | RS_Uline);	2574	RS_RVid, RS_RVid | RS_Uline);
2546	else	2575	else
…		…
2562	{	2591	{
2563	int row, wrote;	2592	int row, wrote;
2564	unsigned int width, towrite;	2593	unsigned int width, towrite;
2565	char r1[] = "\n";	2594	char r1[] = "\n";
2566		2595
2567	for (row = saveLines - nsaved;	2596	for (row = saveLines + top_row;
2568	row < saveLines + nrow - 1; row++)	2597	row < saveLines + nrow - 1; row++)
2569	{	2598	{
2570	width = row_buf[row].l >= 0 ? row_buf[row].l	2599	width = row_buf[row].l >= 0 ? row_buf[row].l
2571	: ncol;	2600	: ncol;
2572	for (towrite = width; towrite; towrite -= wrote)	2601	for (towrite = width; towrite; towrite -= wrote)
…		…
2623	/* convert normal newline chars into common keyboard Return key sequence */	2652	/* convert normal newline chars into common keyboard Return key sequence */
2624	for (unsigned int i = 0; i < len; i++)	2653	for (unsigned int i = 0; i < len; i++)
2625	if (data[i] == C0_LF)	2654	if (data[i] == C0_LF)
2626	data[i] = C0_CR;	2655	data[i] = C0_CR;
2627		2656
		2657	if (priv_modes & PrivMode_BracketPaste)
		2658	tt_printf ("\e[200~");
		2659
2628	tt_write (data, len);	2660	tt_write (data, len);
		2661
		2662	if (priv_modes & PrivMode_BracketPaste)
		2663	tt_printf ("\e[201~");
2629	}	2664	}
2630		2665
2631	/* ------------------------------------------------------------------------- */	2666	/* ------------------------------------------------------------------------- */
2632	/*	2667	/*
2633	* Respond to a notification that a primary selection has been sent	2668	* Respond to a notification that a primary selection has been sent
…		…
2662	}	2697	}
2663		2698
2664	unsigned long bytes_after;	2699	unsigned long bytes_after;
2665	XTextProperty ct;	2700	XTextProperty ct;
2666		2701
2667	if (XGetWindowProperty (xdisp, win, prop,	2702	if (XGetWindowProperty (dpy, win, prop,
2668	0, PROP_SIZE / 4,	2703	0, PROP_SIZE / 4,
2669	delete_prop, AnyPropertyType,	2704	delete_prop, AnyPropertyType,
2670	&ct.encoding, &ct.format,	2705	&ct.encoding, &ct.format,
2671	&ct.nitems, &bytes_after,	2706	&ct.nitems, &bytes_after,
2672	&ct.value) != Success)	2707	&ct.value) != Success)
…		…
2681	if (bytes_after)	2716	if (bytes_after)
2682	{	2717	{
2683	// fetch and append remaining data	2718	// fetch and append remaining data
2684	XTextProperty ct2;	2719	XTextProperty ct2;
2685		2720
2686	if (XGetWindowProperty (xdisp, win, prop,	2721	if (XGetWindowProperty (dpy, win, prop,
2687	ct.nitems / 4, (bytes_after + 3) / 4,	2722	ct.nitems / 4, (bytes_after + 3) / 4,
2688	delete_prop, AnyPropertyType,	2723	delete_prop, AnyPropertyType,
2689	&ct2.encoding, &ct2.format,	2724	&ct2.encoding, &ct2.format,
2690	&ct2.nitems, &bytes_after,	2725	&ct2.nitems, &bytes_after,
2691	&ct2.value) != Success)	2726	&ct2.value) != Success)
…		…
2704		2739
2705	if (ct.encoding == xa[XA_INCR])	2740	if (ct.encoding == xa[XA_INCR])
2706	{	2741	{
2707	// INCR selection, start handshake	2742	// INCR selection, start handshake
2708	if (!delete_prop)	2743	if (!delete_prop)
2709	XDeleteProperty (xdisp, win, prop);	2744	XDeleteProperty (dpy, win, prop);
2710		2745
2711	selection_wait = Sel_incr;	2746	selection_wait = Sel_incr;
2712	incr_buf_fill = 0;	2747	incr_buf_fill = 0;
2713	incr_ev.start (NOW + 10);	2748	incr_ev.start (10);
2714		2749
2715	goto bailout;	2750	goto bailout;
2716	}	2751	}
2717		2752
2718	if (ct.nitems == 0)	2753	if (ct.nitems == 0)
…		…
2727	ct.nitems = incr_buf_fill;	2762	ct.nitems = incr_buf_fill;
2728	incr_buf = 0;	2763	incr_buf = 0;
2729	incr_buf_size = 0;	2764	incr_buf_size = 0;
2730	incr_ev.stop ();	2765	incr_ev.stop ();
2731	}	2766	}
2732	else	2767	else
2733	{	2768	{
2734	if (selection_wait == Sel_normal	2769	if (selection_wait == Sel_normal
2735	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion	2770	&& (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736	{	2771	{
2737	/*	2772	/*
…		…
2744	goto bailout;	2779	goto bailout;
2745	}	2780	}
2746	}	2781	}
2747	else if (selection_wait == Sel_incr)	2782	else if (selection_wait == Sel_incr)
2748	{	2783	{
2749	incr_ev.start (NOW + 10);	2784	incr_ev.start (10);
2750		2785
2751	while (incr_buf_fill + ct.nitems > incr_buf_size)	2786	while (incr_buf_fill + ct.nitems > incr_buf_size)
2752	{	2787	{
2753	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2788	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2754	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2789	incr_buf = (char *)realloc (incr_buf, incr_buf_size);
…		…
2761	}	2796	}
2762		2797
2763	char **cl;	2798	char **cl;
2764	int cr;	2799	int cr;
2765		2800
2766	#if ENABLE_FRILLS	2801	#if !ENABLE_MINIMAL
2767	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	2802	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768	// so recode it manually	2803	// so recode it manually
2769	if (ct.encoding == xa[XA_UTF8_STRING])	2804	if (ct.encoding == xa[XA_UTF8_STRING])
2770	{	2805	{
2771	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);	2806	wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
…		…
2775	paste (s, strlen (s));	2810	paste (s, strlen (s));
2776	free (s);	2811	free (s);
2777	}	2812	}
2778	else	2813	else
2779	#endif	2814	#endif
2780	if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0	2815	if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781	&& cl)	2816	&& cl)
2782	{	2817	{
2783	for (int i = 0; i < cr; i++)	2818	for (int i = 0; i < cr; i++)
2784	paste (cl[i], strlen (cl[i]));	2819	paste (cl[i], strlen (cl[i]));
2785		2820
…		…
2794	if (selection_wait == Sel_normal)	2829	if (selection_wait == Sel_normal)
2795	selection_wait = Sel_none;	2830	selection_wait = Sel_none;
2796	}	2831	}
2797		2832
2798	void	2833	void
2799	rxvt_term::incr_cb (time_watcher &w) NOTHROW	2834	rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2800	{	2835	{
2801	selection_wait = Sel_none;	2836	selection_wait = Sel_none;
2802		2837
2803	incr_buf_size = 0;	2838	incr_buf_size = 0;
2804	free (incr_buf);	2839	free (incr_buf);
…		…
2815	selection_paste (win, prop, true);	2850	selection_paste (win, prop, true);
2816	}	2851	}
2817		2852
2818	/* ------------------------------------------------------------------------- */	2853	/* ------------------------------------------------------------------------- */
2819	/*	2854	/*
2820	* Request the current selection:	2855	* Request the current selection:
2821	* Order: > internal selection if available	2856	* Order: > internal selection if available
2822	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)	2857	* > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823	* > CUT_BUFFER0	2858	* > CUT_BUFFER0
2824	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()	2859	* (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825	* will auto fallback to CUT_BUFFER0	2860	* will auto fallback to CUT_BUFFER0
…		…
2827	*/	2862	*/
2828	void	2863	void
2829	rxvt_term::selection_request (Time tm, int selnum) NOTHROW	2864	rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2830	{	2865	{
2831	if (selection.text && selnum == Sel_Primary)	2866	if (selection.text && selnum == Sel_Primary)
		2867	{
2832	{ /* internal selection */	2868	/* internal selection */
2833	char *str = rxvt_wcstombs (selection.text, selection.len);	2869	char *str = rxvt_wcstombs (selection.text, selection.len);
2834	paste (str, strlen (str));	2870	paste (str, strlen (str));
2835	free (str);	2871	free (str);
2836	return;	2872	return;
2837	}	2873	}
…		…
2867	else if (selnum == Sel_Secondary)	2903	else if (selnum == Sel_Secondary)
2868	sel = XA_SECONDARY;	2904	sel = XA_SECONDARY;
2869	else	2905	else
2870	sel = xa[XA_CLIPBOARD];	2906	sel = xa[XA_CLIPBOARD];
2871		2907
2872	if (XGetSelectionOwner (xdisp, sel) != None)	2908	if (XGetSelectionOwner (dpy, sel) != None)
2873	{	2909	{
2874	XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],	2910	XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875	vt, selection_request_time);	2911	vt, selection_request_time);
2876	return 1;	2912	return 1;
2877	}	2913	}
2878		2914
2879	return 0;	2915	return 0;
…		…
2942		2978
2943	int end_col;	2979	int end_col;
2944		2980
2945	for (; row <= selection.end.row; row++, col = 0)	2981	for (; row <= selection.end.row; row++, col = 0)
2946	{	2982	{
2947	#if ENABLE_FRILLS	2983	#if !ENABLE_MINIMAL
2948	if (selection.rect)	2984	if (selection.rect)
2949	{	2985	{
2950	col = selection.beg.col;	2986	col = selection.beg.col;
2951	end_col = ncol + 1;	2987	end_col = ncol + 1;
2952	}	2988	}
…		…
2955	end_col = ROW(row).l;	2991	end_col = ROW(row).l;
2956		2992
2957	col = max (col, 0);	2993	col = max (col, 0);
2958		2994
2959	if (row == selection.end.row	2995	if (row == selection.end.row
2960	#if ENABLE_FRILLS	2996	#if !ENABLE_MINIMAL
2961	|| selection.rect	2997	|| selection.rect
2962	#endif	2998	#endif
2963	)	2999	)
2964	min_it (end_col, selection.end.col);	3000	min_it (end_col, selection.end.col);
2965		3001
…		…
2988	#endif	3024	#endif
2989	else	3025	else
2990	new_selection_text[ofs++] = *t++;	3026	new_selection_text[ofs++] = *t++;
2991	}	3027	}
2992		3028
2993	#if ENABLE_FRILLS	3029	#if !ENABLE_MINIMAL
2994	if (selection.rect)	3030	if (selection.rect)
2995	{	3031	{
2996	while (ofs	3032	while (ofs
2997	&& new_selection_text[ofs - 1] != C0_LF	3033	&& new_selection_text[ofs - 1] != C0_LF
2998	&& unicode::is_space (new_selection_text[ofs - 1]))	3034	&& unicode::is_space (new_selection_text[ofs - 1]))
…		…
3032	bool	3068	bool
3033	rxvt_term::selection_grab (Time tm) NOTHROW	3069	rxvt_term::selection_grab (Time tm) NOTHROW
3034	{	3070	{
3035	selection_time = tm;	3071	selection_time = tm;
3036		3072
3037	XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);	3073	XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038	if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)	3074	if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039	{	3075	{
3040	display->set_selection_owner (this);	3076	display->set_selection_owner (this);
3041	return true;	3077	return true;
3042	}	3078	}
3043	else	3079	else
…		…
3047	}	3083	}
3048		3084
3049	#if 0	3085	#if 0
3050	XTextProperty ct;	3086	XTextProperty ct;
3051		3087
3052	if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)	3088	if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053	{	3089	{
3054	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);	3090	set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055	XFree (ct.value);	3091	XFree (ct.value);
3056	}	3092	}
3057	#endif	3093	#endif
…		…
3103	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);	3139	selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104		3140
3105	while (selection.mark.col > 0	3141	while (selection.mark.col > 0
3106	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)	3142	&& ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107	--selection.mark.col;	3143	--selection.mark.col;
3108		3144
3109	if (selection.op)	3145	if (selection.op)
		3146	{
3110	{ /* clear the old selection */	3147	/* clear the old selection */
3111	selection.beg.row = selection.end.row = selection.mark.row;	3148	selection.beg.row = selection.end.row = selection.mark.row;
3112	selection.beg.col = selection.end.col = selection.mark.col;	3149	selection.beg.col = selection.end.col = selection.mark.col;
3113	}	3150	}
3114		3151
3115	selection.op = SELECTION_INIT;	3152	selection.op = SELECTION_INIT;
…		…
3304	* a point/word/line which is either the start or end of the selection	3341	* a point/word/line which is either the start or end of the selection
3305	* and it was decided by whichever point/word/line was `fixed' at the	3342	* and it was decided by whichever point/word/line was `fixed' at the
3306	* time of the most recent button3 press	3343	* time of the most recent button3 press
3307	*/	3344	*/
3308	if (button3 && buttonpress)	3345	if (button3 && buttonpress)
		3346	{
3309	{ /* button3 press */	3347	/* button3 press */
3310	/*	3348	/*
3311	* first determine which edge of the selection we are closest to	3349	* first determine which edge of the selection we are closest to
3312	*/	3350	*/
3313	if (ROWCOL_IS_BEFORE (pos, selection.beg)	3351	if (ROWCOL_IS_BEFORE (pos, selection.beg)
3314	|| (!ROWCOL_IS_AFTER (pos, selection.end)	3352	|| (!ROWCOL_IS_AFTER (pos, selection.end)
…		…
3332	selection.mark.row = selection.beg.row;	3370	selection.mark.row = selection.beg.row;
3333	selection.mark.col = selection.beg.col;	3371	selection.mark.col = selection.beg.col;
3334	}	3372	}
3335	}	3373	}
3336	else	3374	else
		3375	{
3337	{ /* button1 drag or button3 drag */	3376	/* button1 drag or button3 drag */
3338	if (ROWCOL_IS_AFTER (selection.mark, pos))	3377	if (ROWCOL_IS_AFTER (selection.mark, pos))
3339	{	3378	{
3340	if (selection.mark.row == selection.end.row	3379	if (selection.mark.row == selection.end.row
3341	&& selection.mark.col == selection.end.col	3380	&& selection.mark.col == selection.end.col
3342	&& clickchange	3381	&& clickchange
…		…
3359		3398
3360	if (selection.clicks == 1)	3399	if (selection.clicks == 1)
3361	{	3400	{
3362	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN	3401	if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363	&& !ROW(selection.beg.row).is_longer ()	3402	&& !ROW(selection.beg.row).is_longer ()
3364	#if ENABLE_FRILLS	3403	#if !ENABLE_MINIMAL
3365	&& !selection.rect	3404	&& !selection.rect
3366	#endif	3405	#endif
3367	)	3406	)
3368	selection.beg.col = ncol;	3407	selection.beg.col = ncol;
3369		3408
3370	if (	3409	if (
3371	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN	3410	selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372	&& !ROW(selection.end.row).is_longer ()	3411	&& !ROW(selection.end.row).is_longer ()
3373	#if ENABLE_FRILLS	3412	#if !ENABLE_MINIMAL
3374	&& !selection.rect	3413	&& !selection.rect
3375	#endif	3414	#endif
3376	)	3415	)
3377	selection.end.col = ncol;	3416	selection.end.col = ncol;
3378	}	3417	}
…		…
3385	selection_delimit_word (DN, &selection.end, &selection.end);	3424	selection_delimit_word (DN, &selection.end, &selection.end);
3386	}	3425	}
3387	else if (selection.clicks == 3)	3426	else if (selection.clicks == 3)
3388	{	3427	{
3389	#if ENABLE_FRILLS	3428	#if ENABLE_FRILLS
3390	if (OPTION (Opt_tripleclickwords))	3429	if (option (Opt_tripleclickwords))
3391	{	3430	{
3392	selection_delimit_word (UP, &selection.beg, &selection.beg);	3431	selection_delimit_word (UP, &selection.beg, &selection.beg);
3393		3432
3394	for (int end_row = selection.mark.row; end_row < nrow; end_row++)	3433	for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3395	{	3434	{
3396	if (!ROW(end_row).is_longer ())	3435	if (!ROW(end_row).is_longer ())
3397	{	3436	{
3398	selection.end.row = end_row;	3437	selection.end.row = end_row;
3399	selection.end.col = ROW(end_row).l;	3438	selection.end.col = ROW(end_row).l;
		3439	# if !ENABLE_MINIMAL
3400	selection_remove_trailing_spaces ();	3440	selection_remove_trailing_spaces ();
		3441	# endif
3401	break;	3442	break;
3402	}	3443	}
3403	}	3444	}
3404	}	3445	}
3405	else	3446	else
…		…
3421	selection.end.row++;	3462	selection.end.row++;
3422	}	3463	}
3423	}	3464	}
3424		3465
3425	if (button3 && buttonpress)	3466	if (button3 && buttonpress)
		3467	{
3426	{ /* mark may need to be changed */	3468	/* mark may need to be changed */
3427	if (closeto == LEFT)	3469	if (closeto == LEFT)
3428	{	3470	{
3429	selection.mark.row = selection.end.row;	3471	selection.mark.row = selection.end.row;
3430	selection.mark.col = selection.end.col - (selection.clicks == 2);	3472	selection.mark.col = selection.end.col - (selection.clicks == 2);
3431	}	3473	}
…		…
3434	selection.mark.row = selection.beg.row;	3476	selection.mark.row = selection.beg.row;
3435	selection.mark.col = selection.beg.col;	3477	selection.mark.col = selection.beg.col;
3436	}	3478	}
3437	}	3479	}
3438		3480
3439	#if ENABLE_FRILLS	3481	#if !ENABLE_MINIMAL
3440	if (selection.rect && selection.beg.col > selection.end.col)	3482	if (selection.rect && selection.beg.col > selection.end.col)
3441	::swap (selection.beg.col, selection.end.col);	3483	::swap (selection.beg.col, selection.end.col);
3442	#endif	3484	#endif
3443	}	3485	}
3444		3486
3445	#if ENABLE_FRILLS	3487	#if !ENABLE_MINIMAL
3446	void	3488	void
3447	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3489	rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448	{	3490	{
3449	int32_t end_col, end_row;	3491	int32_t end_col, end_row;
3450	text_t *stp;	3492	text_t *stp;
…		…
3528	*target++ = xa[XA_COMPOUND_TEXT];	3570	*target++ = xa[XA_COMPOUND_TEXT];
3529	#if X_HAVE_UTF8_STRING	3571	#if X_HAVE_UTF8_STRING
3530	*target++ = xa[XA_UTF8_STRING];	3572	*target++ = xa[XA_UTF8_STRING];
3531	#endif	3573	#endif
3532		3574
3533	XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,	3575	XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534	32, PropModeReplace,	3576	32, PropModeReplace,
3535	(unsigned char *)target_list, target - target_list);	3577	(unsigned char *)target_list, target - target_list);
3536	ev.property = rq.property;	3578	ev.property = rq.property;
3537	}	3579	}
3538	#if TODO // TODO	3580	#if TODO // TODO
…		…
3541	/* TODO: Handle MULTIPLE */	3583	/* TODO: Handle MULTIPLE */
3542	}	3584	}
3543	#endif	3585	#endif
3544	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)	3586	else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545	{	3587	{
3546	XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,	3588	XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547	32, PropModeReplace, (unsigned char *)&selection_time, 1);	3589	32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548	ev.property = rq.property;	3590	ev.property = rq.property;
3549	}	3591	}
3550	else if (rq.target == XA_STRING	3592	else if (rq.target == XA_STRING
3551	|| rq.target == xa[XA_TEXT]	3593	|| rq.target == xa[XA_TEXT]
…		…
3575	style = enc_string;	3617	style = enc_string;
3576	else if (target == xa[XA_TEXT])	3618	else if (target == xa[XA_TEXT])
3577	style = enc_text;	3619	style = enc_text;
3578	else if (target == xa[XA_COMPOUND_TEXT])	3620	else if (target == xa[XA_COMPOUND_TEXT])
3579	style = enc_compound_text;	3621	style = enc_compound_text;
3580	#if ENABLE_FRILLS	3622	#if !ENABLE_MINIMAL
3581	else if (target == xa[XA_UTF8_STRING])	3623	else if (target == xa[XA_UTF8_STRING])
3582	style = enc_utf8;	3624	style = enc_utf8;
3583	#endif	3625	#endif
3584	else	3626	else
3585	{	3627	{
…		…
3596	{	3638	{
3597	cl = L"";	3639	cl = L"";
3598	selectlen = 0;	3640	selectlen = 0;
3599	}	3641	}
3600		3642
3601	#if ENABLE_FRILLS	3643	#if !ENABLE_MINIMAL
3602	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it	3644	// xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603	// so recode it manually	3645	// so recode it manually
3604	if (style == enc_utf8)	3646	if (style == enc_utf8)
3605	{	3647	{
3606	freect = 1;	3648	freect = 1;
…		…
3609	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);	3651	ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610	ct.nitems = strlen ((char *)ct.value);	3652	ct.nitems = strlen ((char *)ct.value);
3611	}	3653	}
3612	else	3654	else
3613	#endif	3655	#endif
3614	if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)	3656	if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615	freect = 1;	3657	freect = 1;
3616	else	3658	else
3617	{	3659	{
3618	/* if we failed to convert then send it raw */	3660	/* if we failed to convert then send it raw */
3619	ct.value = (unsigned char *)cl;	3661	ct.value = (unsigned char *)cl;
3620	ct.nitems = selectlen;	3662	ct.nitems = selectlen;
3621	ct.encoding = target;	3663	ct.encoding = target;
3622	}	3664	}
3623		3665
3624	XChangeProperty (xdisp, rq.requestor, rq.property,	3666	XChangeProperty (dpy, rq.requestor, rq.property,
3625	ct.encoding, 8, PropModeReplace,	3667	ct.encoding, 8, PropModeReplace,
3626	ct.value, (int)ct.nitems);	3668	ct.value, (int)ct.nitems);
3627	ev.property = rq.property;	3669	ev.property = rq.property;
3628		3670
3629	if (freect)	3671	if (freect)
3630	XFree (ct.value);	3672	XFree (ct.value);
3631	}	3673	}
3632		3674
3633	XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);	3675	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634	}
3635
3636	/* ------------------------------------------------------------------------- *
3637	* MOUSE ROUTINES *
3638	* ------------------------------------------------------------------------- */
3639
3640	/*
3641	* return col/row values corresponding to x/y pixel values
3642	*/
3643	void
3644	rxvt_term::pixel_position (int *x, int *y) NOTHROW
3645	{
3646	*x = Pixel2Col (*x);
3647	/* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3648	*y = Pixel2Row (*y);
3649	/* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3650	}	3676	}
3651		3677
3652	/* ------------------------------------------------------------------------- */	3678	/* ------------------------------------------------------------------------- */
3653	#ifdef USE_XIM	3679	#ifdef USE_XIM
3654	void	3680	void
3655	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3681	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656	{	3682	{
3657	XWindowAttributes xwa;	3683	XWindowAttributes xwa;
3658		3684
3659	XGetWindowAttributes (xdisp, vt, &xwa);	3685	XGetWindowAttributes (dpy, vt, &xwa);
3660		3686
3661	pos.x = xwa.x + Col2Pixel (screen.cur.col);	3687	pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;	3688	pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663	}	3689	}
3664	#endif	3690	#endif

Diff Legend

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