[ViewVC] Diff of: cvs/rxvt-unicode/src/screen.C

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

…		…
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-2007 Marc Lehmann <schmorp@schmorp.de>	6	* Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
		7	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7	*	8	*
8	* This program is free software; you can redistribute it and/or modify	9	* 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	10	* 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	11	* the Free Software Foundation; either version 3 of the License, or
11	* (at your option) any later version.	12	* (at your option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
150	l.r[col] = rend;	151	l.r[col] = rend;
151	col++;	152	col++;
152	} while (col < ncol && l.t[col] == NOCHAR);	153	} while (col < ncol && l.t[col] == NOCHAR);
153	}	154	}
154		155
		156	// set the rendition of a single wide character beginning at the given column
		157	void
		158	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		159	{
		160	do {
		161	l.r[col] = rend;
		162	col++;
		163	} while (col < ncol && l.t[col] == NOCHAR);
		164	}
		165
155	/* ------------------------------------------------------------------------- *	166	/* ------------------------------------------------------------------------- *
156	* SCREEN INITIALISATION *	167	* SCREEN INITIALISATION *
157	* ------------------------------------------------------------------------- */	168	* ------------------------------------------------------------------------- */
158		169
159	void	170	void
…		…
188	drawn_buf = (line_t *)chunk;	199	drawn_buf = (line_t *)chunk;
189	swap_buf = drawn_buf + nrow;	200	swap_buf = drawn_buf + nrow;
190	row_buf = swap_buf + nrow;	201	row_buf = swap_buf + nrow;
191	}	202	}
192		203
		204	void
		205	rxvt_term::copy_line (line_t &dst, line_t &src)
		206	{
		207	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		208	dst.l = min (src.l, ncol);
		209	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		210	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		211	dst.f = src.f;
		212	}
		213
193	void ecb_cold	214	void ecb_cold
194	rxvt_term::scr_reset ()	215	rxvt_term::scr_reset ()
195	{	216	{
196	#if ENABLE_OVERLAY	217	#if ENABLE_OVERLAY
197	scr_overlay_off ();	218	scr_overlay_off ();
…		…
230	size_t prev_chunk_size = chunk_size;	251	size_t prev_chunk_size = chunk_size;
231	line_t *prev_drawn_buf = drawn_buf;	252	line_t *prev_drawn_buf = drawn_buf;
232	line_t *prev_swap_buf = swap_buf;	253	line_t *prev_swap_buf = swap_buf;
233	line_t *prev_row_buf = row_buf;	254	line_t *prev_row_buf = row_buf;
234		255
235	int common_col = min (prev_ncol, ncol);
236
237	scr_alloc ();	256	scr_alloc ();
238		257
239	if (!prev_row_buf)	258	if (!prev_row_buf)
240	{	259	{
241	/*
242	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
243	*/
244	top_row = 0;	260	top_row = 0;
245	term_start = 0;	261	term_start = 0;
246		262
247	memset (charsets, 'B', sizeof (charsets));	263	memset (charsets, 'B', sizeof (charsets));
248	rstyle = DEFAULT_RSTYLE;	264	rstyle = DEFAULT_RSTYLE;
…		…
273	{	289	{
274	/*	290	/*
275	* add or delete rows as appropriate	291	* add or delete rows as appropriate
276	*/	292	*/
277		293
		294	int common_col = min (prev_ncol, ncol);
		295
278	for (int row = min (nrow, prev_nrow); row--; )	296	for (int row = min (nrow, prev_nrow); row--; )
279	{	297	{
280	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	298	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
281	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
282
283	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);	299	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);	300	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285		301
286	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288	swap_buf [row].l = prev_swap_buf [row].l;	302	copy_line (swap_buf [row], prev_swap_buf [row]);
289	}	303	}
290		304
291	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	305	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
292	int pend = MOD (term_start + top_row , prev_total_rows);	306	int pend = MOD (term_start + top_row , prev_total_rows);
293	int q = total_rows; // rewrapped row	307	int q = total_rows; // rewrapped row
…		…
388	for (int row = min (nrow, prev_nrow); row--; )	402	for (int row = min (nrow, prev_nrow); row--; )
389	{	403	{
390	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];	404	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
391	line_t &dst = row_buf [row];	405	line_t &dst = row_buf [row];
392		406
393	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);	407	copy_line (dst, src);
394
395	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397	dst.l = common_col;
398	}	408	}
399		409
400	for (int row = prev_nrow; row < nrow; row++)	410	for (int row = prev_nrow; row < nrow; row++)
401	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	411	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
402		412
…		…
605	* Change the colour for following text	615	* Change the colour for following text
606	*/	616	*/
607	void	617	void
608	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW	618	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
609	{	619	{
610	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	620	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
611	color = fgbg;	621	color = fgbg;
612		622
613	if (fgbg == Color_fg)	623	if (fgbg == Color_fg)
614	rstyle = SET_FGCOLOR (rstyle, color);	624	rstyle = SET_FGCOLOR (rstyle, color);
615	else	625	else
…		…
706		716
707	// finally move the view window, if desired	717	// finally move the view window, if desired
708	if (option (Opt_scrollWithBuffer)	718	if (option (Opt_scrollWithBuffer)
709	&& view_start != 0	719	&& view_start != 0
710	&& view_start != -saveLines)	720	&& view_start != -saveLines)
711	scr_page (UP, count);	721	scr_page (count);
712		722
713	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	723	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
714	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	724	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
715	}	725	}
716	else	726	else
…		…
1002	}	1012	}
1003	else if (screen.cur.row > 0	1013	else if (screen.cur.row > 0
1004	&& ROW(screen.cur.row - 1).is_longer ())	1014	&& ROW(screen.cur.row - 1).is_longer ())
1005	{	1015	{
1006	linep = &ROW(screen.cur.row - 1);	1016	linep = &ROW(screen.cur.row - 1);
1007	tp = line->t + ncol - 1;	1017	tp = linep->t + ncol - 1;
1008	rp = line->r + ncol - 1;	1018	rp = linep->r + ncol - 1;
1009	}	1019	}
1010	else	1020	else
1011	continue;	1021	continue;
1012		1022
1013	linep->touch ();	1023	linep->touch ();
…		…
1231	* direction should be UP or DN	1241	* direction should be UP or DN
1232	*/	1242	*/
1233	void	1243	void
1234	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1244	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1235	{	1245	{
1236	int dirn;
1237
1238	want_refresh = 1;	1246	want_refresh = 1;
1239	ZERO_SCROLLBACK ();	1247	ZERO_SCROLLBACK ();
1240		1248
1241	dirn = ((direction == UP) ? 1 : -1);
1242
1243	screen.flags &= ~Screen_WrapNext;	1249	screen.flags &= ~Screen_WrapNext;
1244		1250
1245	if ((screen.cur.row == screen.bscroll && direction == UP)	1251	if ((screen.cur.row == screen.bscroll && direction == UP)
1246	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1252	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1247	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1253	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1248	else	1254	else
1249	screen.cur.row += dirn;	1255	screen.cur.row += direction;
1250		1256
1251	clamp_it (screen.cur.row, 0, nrow - 1);	1257	clamp_it (screen.cur.row, 0, nrow - 1);
1252	selection_check (0);	1258	selection_check (0);
1253	}	1259	}
1254		1260
…		…
1708		1714
1709	if (rvideo_state != on)	1715	if (rvideo_state != on)
1710	{	1716	{
1711	rvideo_state = on;	1717	rvideo_state = on;
1712		1718
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
		1723	::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
		1724	}
		1725	else
		1726	#endif
1713	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1727	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1714	#ifdef HAVE_IMG	1728	#ifdef HAVE_IMG
1715	if (bg_img == 0)	1729	if (bg_img == 0)
1716	#endif	1730	#endif
1717	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1731	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
…		…
1892	* the top of the screen	1906	* the top of the screen
1893	*/	1907	*/
1894	void	1908	void
1895	rxvt_term::scr_move_to (int y, int len) NOTHROW	1909	rxvt_term::scr_move_to (int y, int len) NOTHROW
1896	{	1910	{
1897	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1911	// lerp (y, 0, len, top_row, nrow - 1)
		1912	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1898	}	1913	}
1899		1914
1900	/* ------------------------------------------------------------------------- */	1915	/* ------------------------------------------------------------------------- */
1901	/*	1916	/*
1902	* Page the screen up/down nlines	1917	* Page the screen up/down nlines
1903	* direction should be UP or DN	1918	* direction should be UP or DN
1904	*/	1919	*/
1905	bool	1920	bool
1906	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1921	rxvt_term::scr_page (int nlines) NOTHROW
1907	{	1922	{
1908	int new_view_start =
1909	direction == UP ? view_start - nlines
1910	: view_start + nlines;
1911
1912	return scr_changeview (new_view_start);	1923	return scr_changeview (view_start - nlines);
1913	}	1924	}
1914		1925
1915	bool	1926	bool
1916	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1927	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1917	{	1928	{
…		…
2035	rxvt_term::scr_refresh () NOTHROW	2046	rxvt_term::scr_refresh () NOTHROW
2036	{	2047	{
2037	int16_t col, row, /* column/row we're processing */	2048	int16_t col, row, /* column/row we're processing */
2038	ocrow; /* old cursor row */	2049	ocrow; /* old cursor row */
2039	int i; /* tmp */	2050	int i; /* tmp */
2040	#ifndef NO_CURSORCOLOR
2041	rend_t cc1; /* store colours at cursor position (s) */
2042	#endif
2043	rend_t *crp; // cursor rendition pointer
2044	rend_t ccol1, /* Cursor colour */	2051	rend_t ccol1, /* Cursor colour */
2045	ccol2; /* Cursor colour2 */	2052	ccol2; /* Cursor colour2 */
		2053	rend_t cur_rend;
		2054	int cur_col;
		2055	int cursorwidth;
2046		2056
2047	want_refresh = 0; /* screen is current */	2057	want_refresh = 0; /* screen is current */
2048		2058
2049	if (refresh_type == NO_REFRESH \|\| !mapped)	2059	if (refresh_type == NO_REFRESH \|\| !mapped)
2050	return;	2060	return;
…		…
2075		2085
2076	/*	2086	/*
2077	* C: set the cursor character (s)	2087	* C: set the cursor character (s)
2078	*/	2088	*/
2079	{	2089	{
2080	bool setoldcursor;
2081
2082	#ifdef CURSOR_BLINK	2090	#ifdef CURSOR_BLINK
2083	if (hidden_cursor)	2091	if (hidden_cursor)
2084	showcursor = 0;	2092	showcursor = 0;
2085	#endif	2093	#endif
2086		2094
…		…
2089	int col = screen.cur.col;	2097	int col = screen.cur.col;
2090		2098
2091	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2099	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2092	col--;	2100	col--;
2093		2101
		2102	cursorwidth = 1;
		2103	while (col + cursorwidth < ncol
		2104	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2105	cursorwidth++;
		2106
2094	crp = &ROW(screen.cur.row).r[col];	2107	cur_rend = ROW(screen.cur.row).r[col];
		2108	cur_col = col;
2095		2109
2096	#ifndef NO_CURSORCOLOR	2110	#ifndef NO_CURSORCOLOR
2097	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2098	if (ISSET_PIXCOLOR (Color_cursor))	2111	if (ISSET_PIXCOLOR (Color_cursor))
2099	ccol1 = Color_cursor;	2112	ccol1 = Color_cursor;
2100	else	2113	else
2101	#endif	2114	#endif
2102	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2115	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2114	ccol2 = bgcolor_of (rstyle);	2127	ccol2 = bgcolor_of (rstyle);
2115	#else	2128	#else
2116	ccol2 = Color_bg;	2129	ccol2 = Color_bg;
2117	#endif	2130	#endif
2118		2131
2119	if (focus)	2132	if (focus && cursor_type == 0)
2120	{	2133	{
2121	if (option (Opt_cursorUnderline))	2134	rend_t rend = cur_rend;
2122	*crp ^= RS_Uline;	2135
2123	else
2124	{
2125	*crp ^= RS_RVid;	2136	rend ^= RS_RVid;
2126	crp = SET_FGCOLOR (crp, ccol1);	2137	rend = SET_FGCOLOR (rend, ccol1);
2127	crp = SET_BGCOLOR (crp, ccol2);	2138	rend = SET_BGCOLOR (rend, ccol2);
2128	}	2139
		2140	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2129	}	2141	}
2130	}	2142	}
2131		2143
2132	/* make sure no outline cursor is left around */	2144	/* make sure no outline cursor is left around */
2133	setoldcursor = 0;	2145	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2134	if (ocrow != -1)	2146	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
		2147
		2148	// save the current cursor coordinates if the cursor is visible
		2149	// and either the window is unfocused or the cursor style is
		2150	// underline or vertical bar, so as to clear the outline cursor in
		2151	// the next refresh if the cursor moves or becomes invisible
		2152	if (showcursor && (!focus \|\| cursor_type != 0) && screen.cur.row - view_start < nrow)
2135	{	2153	{
2136	if (screen.cur.row - view_start != ocrow	2154	oldcursor.row = screen.cur.row - view_start;
2137	\|\| screen.cur.col != oldcursor.col)	2155	oldcursor.col = screen.cur.col;
2138	{
2139	if (ocrow < nrow
2140	&& oldcursor.col < ncol)
2141	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2142
2143	if (focus \|\| !showcursor)
2144	oldcursor.row = -1;
2145	else
2146	setoldcursor = 1;
2147	}
2148	}	2156	}
2149	else if (!focus)	2157	else
2150	setoldcursor = 1;
2151
2152	if (setoldcursor)
2153	{
2154	if (screen.cur.row - view_start >= nrow)
2155	oldcursor.row = -1;	2158	oldcursor.row = -1;
2156	else
2157	{
2158	oldcursor.row = screen.cur.row - view_start;
2159	oldcursor.col = screen.cur.col;
2160	}
2161	}
2162	}	2159	}
2163		2160
2164	#ifndef NO_SLOW_LINK_SUPPORT	2161	#ifndef NO_SLOW_LINK_SUPPORT
2165	/*	2162	/*
2166	* D: CopyArea pass - very useful for slower links	2163	* D: CopyArea pass - very useful for slower links
…		…
2247	int ypixel = (int)Row2Pixel (row);	2244	int ypixel = (int)Row2Pixel (row);
2248		2245
2249	for (col = 0; col < ncol; col++)	2246	for (col = 0; col < ncol; col++)
2250	{	2247	{
2251	/* compare new text with old - if exactly the same then continue */	2248	/* compare new text with old - if exactly the same then continue */
2252	if (stp[col] == dtp[col] /* Must match characters to skip. */	2249	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2253	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2254	\|\| (stp[col] == ' ' /* space w/ no background change */
2255	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2256	continue;	2250	continue;
2257		2251
2258	// redraw one or more characters	2252	// redraw one or more characters
2259		2253
2260	// seek to the beginning of wide characters	2254	// seek to the beginning of wide characters
…		…
2432	else	2426	else
2433	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2427	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2434		2428
2435	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2429	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2436	{	2430	{
		2431	if (showcursor && focus && row == screen.cur.row
		2432	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2433	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2434	else
2437	#if ENABLE_FRILLS	2435	#if ENABLE_FRILLS
2438	if (ISSET_PIXCOLOR (Color_underline))	2436	if (ISSET_PIXCOLOR (Color_underline))
2439	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2440	else	2438	else
2441	#endif	2439	#endif
…		…
2453	*/	2451	*/
2454	if (showcursor)	2452	if (showcursor)
2455	{	2453	{
2456	if (focus)	2454	if (focus)
2457	{	2455	{
2458	if (option (Opt_cursorUnderline))	2456	if (cursor_type == 0)
2459	*crp ^= RS_Uline;	2457	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2460	else	2458	else if (oldcursor.row >= 0)
2461	{	2459	{
2462	*crp ^= RS_RVid;	2460	XSetForeground (dpy, gc, pix_colors[ccol1]);
2463	#ifndef NO_CURSORCOLOR	2461	if (cursor_type == 1)
2464	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2462	XFillRectangle (dpy, vt, gc,
2465	#endif	2463	Col2Pixel (cur_col),
		2464	Row2Pixel (oldcursor.row + 1) - 2,
		2465	Width2Pixel (1),
		2466	2);
		2467	else
		2468	XFillRectangle (dpy, vt, gc,
		2469	Col2Pixel (cur_col),
		2470	Row2Pixel (oldcursor.row),
		2471	2,
		2472	Height2Pixel (1));
2466	}	2473	}
2467	}	2474	}
2468	else if (oldcursor.row >= 0)	2475	else if (oldcursor.row >= 0)
2469	{	2476	{
2470	int cursorwidth = 1;
2471	int col = oldcursor.col;
2472
2473	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2474	col--;
2475
2476	while (col + cursorwidth < ncol
2477	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2478	cursorwidth++;
2479
2480	#ifndef NO_CURSORCOLOR
2481	if (ISSET_PIXCOLOR (Color_cursor))
2482	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2483	else
2484	#endif
2485	XSetForeground (dpy, gc, pix_colors[ccol1]);	2477	XSetForeground (dpy, gc, pix_colors[ccol1]);
2486		2478
2487	XDrawRectangle (dpy, vt, gc,	2479	XDrawRectangle (dpy, vt, gc,
2488	Col2Pixel (col),	2480	Col2Pixel (cur_col),
2489	Row2Pixel (oldcursor.row),	2481	Row2Pixel (oldcursor.row),
2490	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2482	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2491	(unsigned int) (Height2Pixel (1) - 1));	2483	(unsigned int) (Height2Pixel (1) - 1));
2492	}	2484	}
2493	}	2485	}
…		…
2531	scr_remap_chars (swap_buf [i]);	2523	scr_remap_chars (swap_buf [i]);
2532	}	2524	}
2533	}	2525	}
2534		2526
2535	void ecb_cold	2527	void ecb_cold
2536	rxvt_term::scr_recolour (bool refresh) NOTHROW	2528	rxvt_term::scr_recolor (bool refresh) NOTHROW
2537	{	2529	{
2538	bool transparent = false;	2530	bool transparent = false;
2539		2531
2540	#ifdef HAVE_IMG	2532	#ifdef HAVE_IMG
2541	if (bg_img != 0)	2533	if (bg_img != 0)
…		…
2562	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2554	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563	}	2555	}
2564		2556
2565	XClearWindow (dpy, parent);	2557	XClearWindow (dpy, parent);
2566		2558
2567	if (scrollBar.win)	2559	if (scrollBar.state && scrollBar.win)
2568	{	2560	{
2569	if (transparent)	2561	if (transparent)
2570	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2562	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571	else	2563	else
2572	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);	2564	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
…		…
2694	\|\| (check_more == 1	2686	\|\| (check_more == 1
2695	&& current_screen == selection.screen	2687	&& current_screen == selection.screen
2696	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2688	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2689	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698	CLEAR_ALL_SELECTION ();	2690	CLEAR_ALL_SELECTION ();
		2691	}
		2692
		2693	void
		2694	rxvt_term::selection_changed () NOTHROW
		2695	{
		2696	line_t &r1 = ROW (selection.beg.row);
		2697	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2698	++selection.beg.col;
		2699
		2700	line_t &r2 = ROW (selection.end.row);
		2701	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2702	++selection.end.col;
		2703
		2704	want_refresh = 1;
2699	}	2705	}
2700		2706
2701	/* ------------------------------------------------------------------------- */	2707	/* ------------------------------------------------------------------------- */
2702	/*	2708	/*
2703	* Paste a selection direct to the command fd	2709	* Paste a selection direct to the command fd
…		…
3006	* Word select: select text for 2 clicks	3012	* Word select: select text for 2 clicks
3007	* We now only find out the boundary in one direction	3013	* We now only find out the boundary in one direction
3008	*/	3014	*/
3009		3015
3010	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3016	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011	#define DELIMIT_TEXT(x) \	3017	#define DELIMIT_TEXT(x) \
3012	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3018	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013	#define DELIMIT_REND(x) 1	3019	#define DELIMIT_REND(x) 1
3014		3020
3015	void ecb_cold	3021	void ecb_cold
3016	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3022	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3137	{	3143	{
3138	row_col_t pos;	3144	row_col_t pos;
3139	enum {	3145	enum {
3140	LEFT, RIGHT	3146	LEFT, RIGHT
3141	} closeto = RIGHT;	3147	} closeto = RIGHT;
3142
3143	want_refresh = 1;
3144		3148
3145	switch (selection.op)	3149	switch (selection.op)
3146	{	3150	{
3147	case SELECTION_INIT:	3151	case SELECTION_INIT:
3148	CLEAR_SELECTION ();	3152	CLEAR_SELECTION ();
…		…
3328		3332
3329	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3330	if (selection.rect && selection.beg.col > selection.end.col)	3334	if (selection.rect && selection.beg.col > selection.end.col)
3331	::swap (selection.beg.col, selection.end.col);	3335	::swap (selection.beg.col, selection.end.col);
3332	#endif	3336	#endif
		3337
		3338	selection_changed ();
3333	}	3339	}
3334		3340
3335	#if !ENABLE_MINIMAL	3341	#if !ENABLE_MINIMAL
3336	void ecb_cold	3342	void ecb_cold
3337	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3343	rxvt_term::selection_remove_trailing_spaces () NOTHROW

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC vs. Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC