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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC vs.
Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 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	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);	301
286	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);	302	copy_line (swap_buf [row], prev_swap_buf [row]);
287	}	303	}
288		304
289	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
290	int pend = MOD (term_start + top_row , prev_total_rows);	306	int pend = MOD (term_start + top_row , prev_total_rows);
291	int q = total_rows; // rewrapped row	307	int q = total_rows; // rewrapped row
…		…
386	for (int row = min (nrow, prev_nrow); row--; )	402	for (int row = min (nrow, prev_nrow); row--; )
387	{	403	{
388	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)];
389	line_t &dst = row_buf [row];	405	line_t &dst = row_buf [row];
390		406
391	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);	407	copy_line (dst, src);
392
393	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395	}	408	}
396		409
397	for (int row = prev_nrow; row < nrow; row++)	410	for (int row = prev_nrow; row < nrow; row++)
398	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	411	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399		412
…		…
602	* Change the colour for following text	615	* Change the colour for following text
603	*/	616	*/
604	void	617	void
605	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW	618	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
606	{	619	{
607	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	620	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
608	color = fgbg;	621	color = fgbg;
609		622
610	if (fgbg == Color_fg)	623	if (fgbg == Color_fg)
611	rstyle = SET_FGCOLOR (rstyle, color);	624	rstyle = SET_FGCOLOR (rstyle, color);
612	else	625	else
…		…
703		716
704	// finally move the view window, if desired	717	// finally move the view window, if desired
705	if (option (Opt_scrollWithBuffer)	718	if (option (Opt_scrollWithBuffer)
706	&& view_start != 0	719	&& view_start != 0
707	&& view_start != -saveLines)	720	&& view_start != -saveLines)
708	scr_page (UP, count);	721	scr_page (count);
709		722
710	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	723	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
711	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));
712	}	725	}
713	else	726	else
…		…
999	}	1012	}
1000	else if (screen.cur.row > 0	1013	else if (screen.cur.row > 0
1001	&& ROW(screen.cur.row - 1).is_longer ())	1014	&& ROW(screen.cur.row - 1).is_longer ())
1002	{	1015	{
1003	linep = &ROW(screen.cur.row - 1);	1016	linep = &ROW(screen.cur.row - 1);
1004	tp = line->t + ncol - 1;	1017	tp = linep->t + ncol - 1;
1005	rp = line->r + ncol - 1;	1018	rp = linep->r + ncol - 1;
1006	}	1019	}
1007	else	1020	else
1008	continue;	1021	continue;
1009		1022
1010	linep->touch ();	1023	linep->touch ();
…		…
1228	* direction should be UP or DN	1241	* direction should be UP or DN
1229	*/	1242	*/
1230	void	1243	void
1231	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1244	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1232	{	1245	{
1233	int dirn;
1234
1235	want_refresh = 1;	1246	want_refresh = 1;
1236	ZERO_SCROLLBACK ();	1247	ZERO_SCROLLBACK ();
1237		1248
1238	dirn = ((direction == UP) ? 1 : -1);
1239
1240	screen.flags &= ~Screen_WrapNext;	1249	screen.flags &= ~Screen_WrapNext;
1241		1250
1242	if ((screen.cur.row == screen.bscroll && direction == UP)	1251	if ((screen.cur.row == screen.bscroll && direction == UP)
1243	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1252	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1244	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1253	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1245	else	1254	else
1246	screen.cur.row += dirn;	1255	screen.cur.row += direction;
1247		1256
1248	clamp_it (screen.cur.row, 0, nrow - 1);	1257	clamp_it (screen.cur.row, 0, nrow - 1);
1249	selection_check (0);	1258	selection_check (0);
1250	}	1259	}
1251		1260
…		…
1706	if (rvideo_state != on)	1715	if (rvideo_state != on)
1707	{	1716	{
1708	rvideo_state = on;	1717	rvideo_state = on;
1709		1718
1710	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1719	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711	#ifdef HAVE_BG_PIXMAP	1720	#ifdef HAVE_IMG
1712	if (bg_img == 0)	1721	if (bg_img == 0)
1713	#endif	1722	#endif
1714	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1723	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715		1724
1716	XGCValues gcvalue;	1725	XGCValues gcvalue;
…		…
1889	* the top of the screen	1898	* the top of the screen
1890	*/	1899	*/
1891	void	1900	void
1892	rxvt_term::scr_move_to (int y, int len) NOTHROW	1901	rxvt_term::scr_move_to (int y, int len) NOTHROW
1893	{	1902	{
1894	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1903	// lerp (y, 0, len, top_row, nrow - 1)
		1904	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1895	}	1905	}
1896		1906
1897	/* ------------------------------------------------------------------------- */	1907	/* ------------------------------------------------------------------------- */
1898	/*	1908	/*
1899	* Page the screen up/down nlines	1909	* Page the screen up/down nlines
1900	* direction should be UP or DN	1910	* direction should be UP or DN
1901	*/	1911	*/
1902	bool	1912	bool
1903	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1913	rxvt_term::scr_page (int nlines) NOTHROW
1904	{	1914	{
1905	int new_view_start =
1906	direction == UP ? view_start - nlines
1907	: view_start + nlines;
1908
1909	return scr_changeview (new_view_start);	1915	return scr_changeview (view_start - nlines);
1910	}	1916	}
1911		1917
1912	bool	1918	bool
1913	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1919	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1914	{	1920	{
…		…
2032	rxvt_term::scr_refresh () NOTHROW	2038	rxvt_term::scr_refresh () NOTHROW
2033	{	2039	{
2034	int16_t col, row, /* column/row we're processing */	2040	int16_t col, row, /* column/row we're processing */
2035	ocrow; /* old cursor row */	2041	ocrow; /* old cursor row */
2036	int i; /* tmp */	2042	int i; /* tmp */
2037	#ifndef NO_CURSORCOLOR
2038	rend_t cc1; /* store colours at cursor position (s) */
2039	#endif
2040	rend_t *crp; // cursor rendition pointer
2041	rend_t ccol1, /* Cursor colour */	2043	rend_t ccol1, /* Cursor colour */
2042	ccol2; /* Cursor colour2 */	2044	ccol2; /* Cursor colour2 */
		2045	rend_t cur_rend;
		2046	int cur_col;
		2047	int cursorwidth;
2043		2048
2044	want_refresh = 0; /* screen is current */	2049	want_refresh = 0; /* screen is current */
2045		2050
2046	if (refresh_type == NO_REFRESH \|\| !mapped)	2051	if (refresh_type == NO_REFRESH \|\| !mapped)
2047	return;	2052	return;
…		…
2051	*/	2056	*/
2052	refresh_count = 0;	2057	refresh_count = 0;
2053		2058
2054	unsigned int old_screen_flags = screen.flags;	2059	unsigned int old_screen_flags = screen.flags;
2055	bool have_bg = 0;	2060	bool have_bg = 0;
2056	#ifdef HAVE_BG_PIXMAP	2061	#ifdef HAVE_IMG
2057	have_bg = bg_img != 0;	2062	have_bg = bg_img != 0;
2058	#endif	2063	#endif
2059	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2064	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060		2065
2061	/*	2066	/*
…		…
2072		2077
2073	/*	2078	/*
2074	* C: set the cursor character (s)	2079	* C: set the cursor character (s)
2075	*/	2080	*/
2076	{	2081	{
2077	bool setoldcursor;
2078
2079	#ifdef CURSOR_BLINK	2082	#ifdef CURSOR_BLINK
2080	if (hidden_cursor)	2083	if (hidden_cursor)
2081	showcursor = 0;	2084	showcursor = 0;
2082	#endif	2085	#endif
2083		2086
…		…
2086	int col = screen.cur.col;	2089	int col = screen.cur.col;
2087		2090
2088	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2091	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2089	col--;	2092	col--;
2090		2093
		2094	cursorwidth = 1;
		2095	while (col + cursorwidth < ncol
		2096	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2097	cursorwidth++;
		2098
2091	crp = &ROW(screen.cur.row).r[col];	2099	cur_rend = ROW(screen.cur.row).r[col];
		2100	cur_col = col;
2092		2101
2093	#ifndef NO_CURSORCOLOR	2102	#ifndef NO_CURSORCOLOR
2094	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2095	if (ISSET_PIXCOLOR (Color_cursor))	2103	if (ISSET_PIXCOLOR (Color_cursor))
2096	ccol1 = Color_cursor;	2104	ccol1 = Color_cursor;
2097	else	2105	else
2098	#endif	2106	#endif
2099	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2107	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2111	ccol2 = bgcolor_of (rstyle);	2119	ccol2 = bgcolor_of (rstyle);
2112	#else	2120	#else
2113	ccol2 = Color_bg;	2121	ccol2 = Color_bg;
2114	#endif	2122	#endif
2115		2123
2116	if (focus)	2124	if (focus && cursor_type == 0)
2117	{	2125	{
2118	if (option (Opt_cursorUnderline))	2126	rend_t rend = cur_rend;
2119	*crp ^= RS_Uline;	2127
2120	else
2121	{
2122	*crp ^= RS_RVid;	2128	rend ^= RS_RVid;
2123	crp = SET_FGCOLOR (crp, ccol1);	2129	rend = SET_FGCOLOR (rend, ccol1);
2124	crp = SET_BGCOLOR (crp, ccol2);	2130	rend = SET_BGCOLOR (rend, ccol2);
2125	}	2131
		2132	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2126	}	2133	}
2127	}	2134	}
2128		2135
2129	/* make sure no outline cursor is left around */	2136	/* make sure no outline cursor is left around */
2130	setoldcursor = 0;	2137	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2131	if (ocrow != -1)	2138	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
		2139
		2140	// save the current cursor coordinates if the cursor is visible
		2141	// and either the window is unfocused or the cursor style is
		2142	// underline or vertical bar, so as to clear the outline cursor in
		2143	// the next refresh if the cursor moves or becomes invisible
		2144	if (showcursor && (!focus \|\| cursor_type != 0) && screen.cur.row - view_start < nrow)
2132	{	2145	{
2133	if (screen.cur.row - view_start != ocrow	2146	oldcursor.row = screen.cur.row - view_start;
2134	\|\| screen.cur.col != oldcursor.col)	2147	oldcursor.col = screen.cur.col;
2135	{
2136	if (ocrow < nrow
2137	&& oldcursor.col < ncol)
2138	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2139
2140	if (focus \|\| !showcursor)
2141	oldcursor.row = -1;
2142	else
2143	setoldcursor = 1;
2144	}
2145	}	2148	}
2146	else if (!focus)	2149	else
2147	setoldcursor = 1;
2148
2149	if (setoldcursor)
2150	{
2151	if (screen.cur.row - view_start >= nrow)
2152	oldcursor.row = -1;	2150	oldcursor.row = -1;
2153	else
2154	{
2155	oldcursor.row = screen.cur.row - view_start;
2156	oldcursor.col = screen.cur.col;
2157	}
2158	}
2159	}	2151	}
2160		2152
2161	#ifndef NO_SLOW_LINK_SUPPORT	2153	#ifndef NO_SLOW_LINK_SUPPORT
2162	/*	2154	/*
2163	* D: CopyArea pass - very useful for slower links	2155	* D: CopyArea pass - very useful for slower links
…		…
2244	int ypixel = (int)Row2Pixel (row);	2236	int ypixel = (int)Row2Pixel (row);
2245		2237
2246	for (col = 0; col < ncol; col++)	2238	for (col = 0; col < ncol; col++)
2247	{	2239	{
2248	/* compare new text with old - if exactly the same then continue */	2240	/* compare new text with old - if exactly the same then continue */
2249	if (stp[col] == dtp[col] /* Must match characters to skip. */	2241	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2250	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2251	\|\| (stp[col] == ' ' /* space w/ no background change */
2252	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2253	continue;	2242	continue;
2254		2243
2255	// redraw one or more characters	2244	// redraw one or more characters
2256		2245
2257	// seek to the beginning of wide characters	2246	// seek to the beginning of wide characters
…		…
2429	else	2418	else
2430	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2419	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2431		2420
2432	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2421	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2433	{	2422	{
		2423	if (showcursor && focus && row == screen.cur.row
		2424	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2425	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2426	else
2434	#if ENABLE_FRILLS	2427	#if ENABLE_FRILLS
2435	if (ISSET_PIXCOLOR (Color_underline))	2428	if (ISSET_PIXCOLOR (Color_underline))
2436	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2429	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2437	else	2430	else
2438	#endif	2431	#endif
…		…
2450	*/	2443	*/
2451	if (showcursor)	2444	if (showcursor)
2452	{	2445	{
2453	if (focus)	2446	if (focus)
2454	{	2447	{
2455	if (option (Opt_cursorUnderline))	2448	if (cursor_type == 0)
2456	*crp ^= RS_Uline;	2449	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2457	else	2450	else if (oldcursor.row >= 0)
2458	{	2451	{
2459	*crp ^= RS_RVid;	2452	XSetForeground (dpy, gc, pix_colors[ccol1]);
2460	#ifndef NO_CURSORCOLOR	2453	if (cursor_type == 1)
2461	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2454	XFillRectangle (dpy, vt, gc,
2462	#endif	2455	Col2Pixel (cur_col),
		2456	Row2Pixel (oldcursor.row + 1) - 2,
		2457	Width2Pixel (1),
		2458	2);
		2459	else
		2460	XFillRectangle (dpy, vt, gc,
		2461	Col2Pixel (cur_col),
		2462	Row2Pixel (oldcursor.row),
		2463	2,
		2464	Height2Pixel (1));
2463	}	2465	}
2464	}	2466	}
2465	else if (oldcursor.row >= 0)	2467	else if (oldcursor.row >= 0)
2466	{	2468	{
2467	int cursorwidth = 1;
2468	int col = oldcursor.col;
2469
2470	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2471	col--;
2472
2473	while (col + cursorwidth < ncol
2474	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2475	cursorwidth++;
2476
2477	#ifndef NO_CURSORCOLOR
2478	if (ISSET_PIXCOLOR (Color_cursor))
2479	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2480	else
2481	#endif
2482	XSetForeground (dpy, gc, pix_colors[ccol1]);	2469	XSetForeground (dpy, gc, pix_colors[ccol1]);
2483		2470
2484	XDrawRectangle (dpy, vt, gc,	2471	XDrawRectangle (dpy, vt, gc,
2485	Col2Pixel (col),	2472	Col2Pixel (cur_col),
2486	Row2Pixel (oldcursor.row),	2473	Row2Pixel (oldcursor.row),
2487	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2474	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2488	(unsigned int) (Height2Pixel (1) - 1));	2475	(unsigned int) (Height2Pixel (1) - 1));
2489	}	2476	}
2490	}	2477	}
…		…
2528	scr_remap_chars (swap_buf [i]);	2515	scr_remap_chars (swap_buf [i]);
2529	}	2516	}
2530	}	2517	}
2531		2518
2532	void ecb_cold	2519	void ecb_cold
2533	rxvt_term::scr_recolour (bool refresh) NOTHROW	2520	rxvt_term::scr_recolor (bool refresh) NOTHROW
2534	{	2521	{
2535	bool transparent = false;	2522	bool transparent = false;
2536		2523
2537	#ifdef HAVE_BG_PIXMAP	2524	#ifdef HAVE_IMG
2538	if (bg_img != 0)	2525	if (bg_img != 0)
2539	{	2526	{
2540	# if ENABLE_TRANSPARENCY	2527	# if ENABLE_TRANSPARENCY
2541	if (bg_flags & BG_IS_TRANSPARENT)	2528	if (bg_flags & BG_IS_TRANSPARENT)
2542	{	2529	{
…		…
2559	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2546	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2560	}	2547	}
2561		2548
2562	XClearWindow (dpy, parent);	2549	XClearWindow (dpy, parent);
2563		2550
2564	if (scrollBar.win)	2551	if (scrollBar.state && scrollBar.win)
2565	{	2552	{
2566	if (transparent)	2553	if (transparent)
2567	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2554	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568	else	2555	else
2569	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);	2556	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
…		…
2691	\|\| (check_more == 1	2678	\|\| (check_more == 1
2692	&& current_screen == selection.screen	2679	&& current_screen == selection.screen
2693	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2680	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2694	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2681	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2695	CLEAR_ALL_SELECTION ();	2682	CLEAR_ALL_SELECTION ();
		2683	}
		2684
		2685	void
		2686	rxvt_term::selection_changed () NOTHROW
		2687	{
		2688	line_t &r1 = ROW (selection.beg.row);
		2689	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2690	++selection.beg.col;
		2691
		2692	line_t &r2 = ROW (selection.end.row);
		2693	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2694	++selection.end.col;
		2695
		2696	want_refresh = 1;
2696	}	2697	}
2697		2698
2698	/* ------------------------------------------------------------------------- */	2699	/* ------------------------------------------------------------------------- */
2699	/*	2700	/*
2700	* Paste a selection direct to the command fd	2701	* Paste a selection direct to the command fd
…		…
3003	* Word select: select text for 2 clicks	3004	* Word select: select text for 2 clicks
3004	* We now only find out the boundary in one direction	3005	* We now only find out the boundary in one direction
3005	*/	3006	*/
3006		3007
3007	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3008	#define DELIMIT_TEXT(x) \	3009	#define DELIMIT_TEXT(x) \
3009	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3010	#define DELIMIT_REND(x) 1	3011	#define DELIMIT_REND(x) 1
3011		3012
3012	void ecb_cold	3013	void ecb_cold
3013	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3134	{	3135	{
3135	row_col_t pos;	3136	row_col_t pos;
3136	enum {	3137	enum {
3137	LEFT, RIGHT	3138	LEFT, RIGHT
3138	} closeto = RIGHT;	3139	} closeto = RIGHT;
3139
3140	want_refresh = 1;
3141		3140
3142	switch (selection.op)	3141	switch (selection.op)
3143	{	3142	{
3144	case SELECTION_INIT:	3143	case SELECTION_INIT:
3145	CLEAR_SELECTION ();	3144	CLEAR_SELECTION ();
…		…
3325		3324
3326	#if !ENABLE_MINIMAL	3325	#if !ENABLE_MINIMAL
3327	if (selection.rect && selection.beg.col > selection.end.col)	3326	if (selection.rect && selection.beg.col > selection.end.col)
3328	::swap (selection.beg.col, selection.end.col);	3327	::swap (selection.beg.col, selection.end.col);
3329	#endif	3328	#endif
		3329
		3330	selection_changed ();
3330	}	3331	}
3331		3332
3332	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3333	void ecb_cold	3334	void ecb_cold
3334	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3335	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.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC vs. Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC vs.
Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 UTC