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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC vs.
Revision 1.453 by root, Sat Dec 13 12:24:33 2014 UTC

…		…
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	*	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 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
150	l.r[col] = rend;	150	l.r[col] = rend;
151	col++;	151	col++;
152	} while (col < ncol && l.t[col] == NOCHAR);	152	} while (col < ncol && l.t[col] == NOCHAR);
153	}	153	}
154		154
		155	// set the rendition of a single wide character beginning at the given column
		156	void
		157	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		158	{
		159	do {
		160	l.r[col] = rend;
		161	col++;
		162	} while (col < ncol && l.t[col] == NOCHAR);
		163	}
		164
155	/* ------------------------------------------------------------------------- *	165	/* ------------------------------------------------------------------------- *
156	* SCREEN INITIALISATION *	166	* SCREEN INITIALISATION *
157	* ------------------------------------------------------------------------- */	167	* ------------------------------------------------------------------------- */
158		168
159	void	169	void
…		…
188	drawn_buf = (line_t *)chunk;	198	drawn_buf = (line_t *)chunk;
189	swap_buf = drawn_buf + nrow;	199	swap_buf = drawn_buf + nrow;
190	row_buf = swap_buf + nrow;	200	row_buf = swap_buf + nrow;
191	}	201	}
192		202
		203	void
		204	rxvt_term::copy_line (line_t &dst, line_t &src)
		205	{
		206	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		207	dst.l = min (src.l, ncol);
		208	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		209	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		210	dst.f = src.f;
		211	}
		212
193	void ecb_cold	213	void ecb_cold
194	rxvt_term::scr_reset ()	214	rxvt_term::scr_reset ()
195	{	215	{
196	#if ENABLE_OVERLAY	216	#if ENABLE_OVERLAY
197	scr_overlay_off ();	217	scr_overlay_off ();
…		…
225		245
226	screen.tscroll = 0;	246	screen.tscroll = 0;
227	screen.bscroll = nrow - 1;	247	screen.bscroll = nrow - 1;
228		248
229	void *prev_chunk = chunk;	249	void *prev_chunk = chunk;
		250	size_t prev_chunk_size = chunk_size;
230	line_t *prev_drawn_buf = drawn_buf;	251	line_t *prev_drawn_buf = drawn_buf;
231	line_t *prev_swap_buf = swap_buf;	252	line_t *prev_swap_buf = swap_buf;
232	line_t *prev_row_buf = row_buf;	253	line_t *prev_row_buf = row_buf;
233		254
234	int common_col = min (prev_ncol, ncol);
235
236	scr_alloc ();	255	scr_alloc ();
237		256
238	if (!prev_row_buf)	257	if (!prev_row_buf)
239	{	258	{
240	/*
241	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
242	*/
243	top_row = 0;	259	top_row = 0;
244	term_start = 0;	260	term_start = 0;
245		261
246	memset (charsets, 'B', sizeof (charsets));	262	memset (charsets, 'B', sizeof (charsets));
247	rstyle = DEFAULT_RSTYLE;	263	rstyle = DEFAULT_RSTYLE;
…		…
272	{	288	{
273	/*	289	/*
274	* add or delete rows as appropriate	290	* add or delete rows as appropriate
275	*/	291	*/
276		292
		293	int common_col = min (prev_ncol, ncol);
		294
277	for (int row = min (nrow, prev_nrow); row--; )	295	for (int row = min (nrow, prev_nrow); row--; )
278	{	296	{
279	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	297	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280	scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);	298	memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);	299	memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284	memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);	300
285	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);	301	copy_line (swap_buf [row], prev_swap_buf [row]);
286	}	302	}
287		303
288	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	304	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289	int pend = MOD (term_start + top_row , prev_total_rows);	305	int pend = MOD (term_start + top_row , prev_total_rows);
290	int q = total_rows; // rewrapped row	306	int q = total_rows; // rewrapped row
…		…
385	for (int row = min (nrow, prev_nrow); row--; )	401	for (int row = min (nrow, prev_nrow); row--; )
386	{	402	{
387	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];	403	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388	line_t &dst = row_buf [row];	404	line_t &dst = row_buf [row];
389		405
390	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);	406	copy_line (dst, src);
391
392	memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393	memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394	}	407	}
395		408
396	for (int row = prev_nrow; row < nrow; row++)	409	for (int row = prev_nrow; row < nrow; row++)
397	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	410	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398		411
…		…
408	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);	421	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	422	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	423	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411	}	424	}
412		425
413	free (prev_chunk);	426	chunk_free (prev_chunk, prev_chunk_size);
414		427
415	free (tabs);	428	free (tabs);
416	tabs = (char *)rxvt_malloc (ncol);	429	tabs = (char *)rxvt_malloc (ncol);
417		430
418	for (int col = ncol; col--; )	431	for (int col = ncol; col--; )
…		…
702		715
703	// finally move the view window, if desired	716	// finally move the view window, if desired
704	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
705	&& view_start != 0	718	&& view_start != 0
706	&& view_start != -saveLines)	719	&& view_start != -saveLines)
707	scr_page (UP, count);	720	scr_page (count);
708		721
709	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
710	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	723	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
711	}	724	}
712	else	725	else
…		…
1227	* direction should be UP or DN	1240	* direction should be UP or DN
1228	*/	1241	*/
1229	void	1242	void
1230	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1243	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1231	{	1244	{
1232	int dirn;
1233
1234	want_refresh = 1;	1245	want_refresh = 1;
1235	ZERO_SCROLLBACK ();	1246	ZERO_SCROLLBACK ();
1236		1247
1237	dirn = ((direction == UP) ? 1 : -1);
1238
1239	screen.flags &= ~Screen_WrapNext;	1248	screen.flags &= ~Screen_WrapNext;
1240		1249
1241	if ((screen.cur.row == screen.bscroll && direction == UP)	1250	if ((screen.cur.row == screen.bscroll && direction == UP)
1242	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1251	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1243	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1252	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1244	else	1253	else
1245	screen.cur.row += dirn;	1254	screen.cur.row += direction;
1246		1255
1247	clamp_it (screen.cur.row, 0, nrow - 1);	1256	clamp_it (screen.cur.row, 0, nrow - 1);
1248	selection_check (0);	1257	selection_check (0);
1249	}	1258	}
1250		1259
…		…
1705	if (rvideo_state != on)	1714	if (rvideo_state != on)
1706	{	1715	{
1707	rvideo_state = on;	1716	rvideo_state = on;
1708		1717
1709	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1718	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1710	#ifdef HAVE_BG_PIXMAP	1719	#ifdef HAVE_IMG
1711	if (bg_img == 0)	1720	if (bg_img == 0)
1712	#endif	1721	#endif
1713	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1722	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1714		1723
1715	XGCValues gcvalue;	1724	XGCValues gcvalue;
…		…
1888	* the top of the screen	1897	* the top of the screen
1889	*/	1898	*/
1890	void	1899	void
1891	rxvt_term::scr_move_to (int y, int len) NOTHROW	1900	rxvt_term::scr_move_to (int y, int len) NOTHROW
1892	{	1901	{
1893	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1902	// lerp (y, 0, len, top_row, nrow - 1)
		1903	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1894	}	1904	}
1895		1905
1896	/* ------------------------------------------------------------------------- */	1906	/* ------------------------------------------------------------------------- */
1897	/*	1907	/*
1898	* Page the screen up/down nlines	1908	* Page the screen up/down nlines
1899	* direction should be UP or DN	1909	* direction should be UP or DN
1900	*/	1910	*/
1901	bool	1911	bool
1902	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1912	rxvt_term::scr_page (int nlines) NOTHROW
1903	{	1913	{
1904	int new_view_start =
1905	direction == UP ? view_start - nlines
1906	: view_start + nlines;
1907
1908	return scr_changeview (new_view_start);	1914	return scr_changeview (view_start - nlines);
1909	}	1915	}
1910		1916
1911	bool	1917	bool
1912	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1918	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1913	{	1919	{
…		…
2031	rxvt_term::scr_refresh () NOTHROW	2037	rxvt_term::scr_refresh () NOTHROW
2032	{	2038	{
2033	int16_t col, row, /* column/row we're processing */	2039	int16_t col, row, /* column/row we're processing */
2034	ocrow; /* old cursor row */	2040	ocrow; /* old cursor row */
2035	int i; /* tmp */	2041	int i; /* tmp */
2036	#ifndef NO_CURSORCOLOR
2037	rend_t cc1; /* store colours at cursor position (s) */
2038	#endif
2039	rend_t *crp; // cursor rendition pointer
2040	rend_t ccol1, /* Cursor colour */	2042	rend_t ccol1, /* Cursor colour */
2041	ccol2; /* Cursor colour2 */	2043	ccol2; /* Cursor colour2 */
		2044	rend_t cur_rend;
		2045	int cur_col;
		2046	int cursorwidth;
2042		2047
2043	want_refresh = 0; /* screen is current */	2048	want_refresh = 0; /* screen is current */
2044		2049
2045	if (refresh_type == NO_REFRESH \|\| !mapped)	2050	if (refresh_type == NO_REFRESH \|\| !mapped)
2046	return;	2051	return;
…		…
2050	*/	2055	*/
2051	refresh_count = 0;	2056	refresh_count = 0;
2052		2057
2053	unsigned int old_screen_flags = screen.flags;	2058	unsigned int old_screen_flags = screen.flags;
2054	bool have_bg = 0;	2059	bool have_bg = 0;
2055	#ifdef HAVE_BG_PIXMAP	2060	#ifdef HAVE_IMG
2056	have_bg = bg_img != 0;	2061	have_bg = bg_img != 0;
2057	#endif	2062	#endif
2058	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2063	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2059		2064
2060	/*	2065	/*
…		…
2071		2076
2072	/*	2077	/*
2073	* C: set the cursor character (s)	2078	* C: set the cursor character (s)
2074	*/	2079	*/
2075	{	2080	{
2076	bool setoldcursor;
2077
2078	#ifdef CURSOR_BLINK	2081	#ifdef CURSOR_BLINK
2079	if (hidden_cursor)	2082	if (hidden_cursor)
2080	showcursor = 0;	2083	showcursor = 0;
2081	#endif	2084	#endif
2082		2085
…		…
2085	int col = screen.cur.col;	2088	int col = screen.cur.col;
2086		2089
2087	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2090	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2088	col--;	2091	col--;
2089		2092
		2093	cursorwidth = 1;
		2094	while (col + cursorwidth < ncol
		2095	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2096	cursorwidth++;
		2097
2090	crp = &ROW(screen.cur.row).r[col];	2098	cur_rend = ROW(screen.cur.row).r[col];
		2099	cur_col = col;
2091		2100
2092	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2093	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2094	if (ISSET_PIXCOLOR (Color_cursor))	2102	if (ISSET_PIXCOLOR (Color_cursor))
2095	ccol1 = Color_cursor;	2103	ccol1 = Color_cursor;
2096	else	2104	else
2097	#endif	2105	#endif
2098	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2110	ccol2 = bgcolor_of (rstyle);	2118	ccol2 = bgcolor_of (rstyle);
2111	#else	2119	#else
2112	ccol2 = Color_bg;	2120	ccol2 = Color_bg;
2113	#endif	2121	#endif
2114		2122
2115	if (focus)	2123	if (focus && cursor_type != 2)
2116	{	2124	{
2117	if (option (Opt_cursorUnderline))	2125	rend_t rend = cur_rend;
		2126
		2127	if (cursor_type == 1)
2118	*crp ^= RS_Uline;	2128	rend ^= RS_Uline;
2119	else	2129	else
2120	{	2130	{
2121	*crp ^= RS_RVid;	2131	rend ^= RS_RVid;
2122	crp = SET_FGCOLOR (crp, ccol1);	2132	rend = SET_FGCOLOR (rend, ccol1);
2123	crp = SET_BGCOLOR (crp, ccol2);	2133	rend = SET_BGCOLOR (rend, ccol2);
2124	}	2134	}
		2135
		2136	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2125	}	2137	}
2126	}	2138	}
2127		2139
2128	/* make sure no outline cursor is left around */	2140	/* make sure no outline cursor is left around */
2129	setoldcursor = 0;	2141	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2130	if (ocrow != -1)	2142	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
		2143
		2144	// save the current cursor coordinates if the cursor is visible
		2145	// and either the window is unfocused or the cursor style is
		2146	// vertical bar, so as to clear the outline cursor in the next
		2147	// refresh if the cursor moves or becomes invisible
		2148	if (showcursor && (!focus \|\| cursor_type == 2) && screen.cur.row - view_start < nrow)
2131	{	2149	{
2132	if (screen.cur.row - view_start != ocrow	2150	oldcursor.row = screen.cur.row - view_start;
2133	\|\| screen.cur.col != oldcursor.col)	2151	oldcursor.col = screen.cur.col;
2134	{
2135	if (ocrow < nrow
2136	&& oldcursor.col < ncol)
2137	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2138
2139	if (focus \|\| !showcursor)
2140	oldcursor.row = -1;
2141	else
2142	setoldcursor = 1;
2143	}
2144	}	2152	}
2145	else if (!focus)	2153	else
2146	setoldcursor = 1;
2147
2148	if (setoldcursor)
2149	{
2150	if (screen.cur.row - view_start >= nrow)
2151	oldcursor.row = -1;	2154	oldcursor.row = -1;
2152	else
2153	{
2154	oldcursor.row = screen.cur.row - view_start;
2155	oldcursor.col = screen.cur.col;
2156	}
2157	}
2158	}	2155	}
2159		2156
2160	#ifndef NO_SLOW_LINK_SUPPORT	2157	#ifndef NO_SLOW_LINK_SUPPORT
2161	/*	2158	/*
2162	* D: CopyArea pass - very useful for slower links	2159	* D: CopyArea pass - very useful for slower links
…		…
2243	int ypixel = (int)Row2Pixel (row);	2240	int ypixel = (int)Row2Pixel (row);
2244		2241
2245	for (col = 0; col < ncol; col++)	2242	for (col = 0; col < ncol; col++)
2246	{	2243	{
2247	/* compare new text with old - if exactly the same then continue */	2244	/* compare new text with old - if exactly the same then continue */
2248	if (stp[col] == dtp[col] /* Must match characters to skip. */	2245	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2249	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2250	\|\| (stp[col] == ' ' /* space w/ no background change */
2251	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2252	continue;	2246	continue;
2253		2247
2254	// redraw one or more characters	2248	// redraw one or more characters
2255		2249
2256	// seek to the beginning of wide characters	2250	// seek to the beginning of wide characters
…		…
2428	else	2422	else
2429	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2423	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2430		2424
2431	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2425	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2432	{	2426	{
		2427	if (showcursor && focus && row == screen.cur.row
		2428	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2429	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2430	else
2433	#if ENABLE_FRILLS	2431	#if ENABLE_FRILLS
2434	if (ISSET_PIXCOLOR (Color_underline))	2432	if (ISSET_PIXCOLOR (Color_underline))
2435	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2433	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2436	else	2434	else
2437	#endif	2435	#endif
…		…
2449	*/	2447	*/
2450	if (showcursor)	2448	if (showcursor)
2451	{	2449	{
2452	if (focus)	2450	if (focus)
2453	{	2451	{
2454	if (option (Opt_cursorUnderline))	2452	if (cursor_type != 2)
2455	*crp ^= RS_Uline;	2453	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456	else	2454	else if (oldcursor.row >= 0)
2457	{	2455	{
2458	*crp ^= RS_RVid;	2456	XSetForeground (dpy, gc, pix_colors[ccol1]);
2459	#ifndef NO_CURSORCOLOR	2457	XFillRectangle (dpy, vt, gc,
2460	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2458	Col2Pixel (cur_col),
2461	#endif	2459	Row2Pixel (oldcursor.row),
		2460	1,
		2461	Height2Pixel (1));
2462	}	2462	}
2463	}	2463	}
2464	else if (oldcursor.row >= 0)	2464	else if (oldcursor.row >= 0)
2465	{	2465	{
2466	int cursorwidth = 1;
2467	int col = oldcursor.col;
2468
2469	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2470	col--;
2471
2472	while (col + cursorwidth < ncol
2473	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2474	cursorwidth++;
2475
2476	#ifndef NO_CURSORCOLOR
2477	if (ISSET_PIXCOLOR (Color_cursor))
2478	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2479	else
2480	#endif
2481	XSetForeground (dpy, gc, pix_colors[ccol1]);	2466	XSetForeground (dpy, gc, pix_colors[ccol1]);
2482		2467
2483	XDrawRectangle (dpy, vt, gc,	2468	XDrawRectangle (dpy, vt, gc,
2484	Col2Pixel (col),	2469	Col2Pixel (cur_col),
2485	Row2Pixel (oldcursor.row),	2470	Row2Pixel (oldcursor.row),
2486	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2471	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2487	(unsigned int) (Height2Pixel (1) - 1));	2472	(unsigned int) (Height2Pixel (1) - 1));
2488	}	2473	}
2489	}	2474	}
…		…
2527	scr_remap_chars (swap_buf [i]);	2512	scr_remap_chars (swap_buf [i]);
2528	}	2513	}
2529	}	2514	}
2530		2515
2531	void ecb_cold	2516	void ecb_cold
2532	rxvt_term::scr_recolour (bool refresh) NOTHROW	2517	rxvt_term::scr_recolor (bool refresh) NOTHROW
2533	{	2518	{
2534	bool transparent = false;	2519	bool transparent = false;
2535		2520
2536	#ifdef HAVE_BG_PIXMAP	2521	#ifdef HAVE_IMG
2537	if (bg_img != 0)	2522	if (bg_img != 0)
2538	{	2523	{
2539	# if ENABLE_TRANSPARENCY	2524	# if ENABLE_TRANSPARENCY
2540	if (bg_flags & BG_IS_TRANSPARENT)	2525	if (bg_flags & BG_IS_TRANSPARENT)
2541	{	2526	{
…		…
2558	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2543	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559	}	2544	}
2560		2545
2561	XClearWindow (dpy, parent);	2546	XClearWindow (dpy, parent);
2562		2547
2563	if (scrollBar.win)	2548	if (scrollBar.state && scrollBar.win)
2564	{	2549	{
2565	if (transparent)	2550	if (transparent)
2566	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2551	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567	else	2552	else
2568	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2553	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569	scrollBar.state = SB_STATE_IDLE;	2554	scrollBar.state = SB_STATE_IDLE;
2570	scrollBar.show (0);	2555	scrollBar.show (0);
2571	}	2556	}
2572		2557
2573	if (refresh)	2558	if (refresh)
…		…
2690	\|\| (check_more == 1	2675	\|\| (check_more == 1
2691	&& current_screen == selection.screen	2676	&& current_screen == selection.screen
2692	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2677	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2678	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694	CLEAR_ALL_SELECTION ();	2679	CLEAR_ALL_SELECTION ();
		2680	}
		2681
		2682	void
		2683	rxvt_term::selection_changed () NOTHROW
		2684	{
		2685	line_t &r1 = ROW (selection.beg.row);
		2686	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2687	++selection.beg.col;
		2688
		2689	line_t &r2 = ROW (selection.end.row);
		2690	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2691	++selection.end.col;
		2692
		2693	want_refresh = 1;
2695	}	2694	}
2696		2695
2697	/* ------------------------------------------------------------------------- */	2696	/* ------------------------------------------------------------------------- */
2698	/*	2697	/*
2699	* Paste a selection direct to the command fd	2698	* Paste a selection direct to the command fd
…		…
3002	* Word select: select text for 2 clicks	3001	* Word select: select text for 2 clicks
3003	* We now only find out the boundary in one direction	3002	* We now only find out the boundary in one direction
3004	*/	3003	*/
3005		3004
3006	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3005	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3007	#define DELIMIT_TEXT(x) \	3006	#define DELIMIT_TEXT(x) \
3008	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3007	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3009	#define DELIMIT_REND(x) 1	3008	#define DELIMIT_REND(x) 1
3010		3009
3011	void ecb_cold	3010	void ecb_cold
3012	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3011	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3133	{	3132	{
3134	row_col_t pos;	3133	row_col_t pos;
3135	enum {	3134	enum {
3136	LEFT, RIGHT	3135	LEFT, RIGHT
3137	} closeto = RIGHT;	3136	} closeto = RIGHT;
3138
3139	want_refresh = 1;
3140		3137
3141	switch (selection.op)	3138	switch (selection.op)
3142	{	3139	{
3143	case SELECTION_INIT:	3140	case SELECTION_INIT:
3144	CLEAR_SELECTION ();	3141	CLEAR_SELECTION ();
…		…
3324		3321
3325	#if !ENABLE_MINIMAL	3322	#if !ENABLE_MINIMAL
3326	if (selection.rect && selection.beg.col > selection.end.col)	3323	if (selection.rect && selection.beg.col > selection.end.col)
3327	::swap (selection.beg.col, selection.end.col);	3324	::swap (selection.beg.col, selection.end.col);
3328	#endif	3325	#endif
		3326
		3327	selection_changed ();
3329	}	3328	}
3330		3329
3331	#if !ENABLE_MINIMAL	3330	#if !ENABLE_MINIMAL
3332	void ecb_cold	3331	void ecb_cold
3333	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3332	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.422 by root, Thu Jun 28 15:19:15 2012 UTC vs. Revision 1.453 by root, Sat Dec 13 12:24:33 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC vs.
Revision 1.453 by root, Sat Dec 13 12:24:33 2014 UTC