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

Diff Legend

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