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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.425 by root, Fri Jun 29 22:10:18 2012 UTC vs.
Revision 1.452 by root, Sat Dec 13 09:49:48 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 ();
…		…
230	size_t prev_chunk_size = chunk_size;	250	size_t prev_chunk_size = chunk_size;
231	line_t *prev_drawn_buf = drawn_buf;	251	line_t *prev_drawn_buf = drawn_buf;
232	line_t *prev_swap_buf = swap_buf;	252	line_t *prev_swap_buf = swap_buf;
233	line_t *prev_row_buf = row_buf;	253	line_t *prev_row_buf = row_buf;
234		254
235	int common_col = min (prev_ncol, ncol);
236
237	scr_alloc ();	255	scr_alloc ();
238		256
239	if (!prev_row_buf)	257	if (!prev_row_buf)
240	{	258	{
241	/*
242	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
243	*/
244	top_row = 0;	259	top_row = 0;
245	term_start = 0;	260	term_start = 0;
246		261
247	memset (charsets, 'B', sizeof (charsets));	262	memset (charsets, 'B', sizeof (charsets));
248	rstyle = DEFAULT_RSTYLE;	263	rstyle = DEFAULT_RSTYLE;
…		…
273	{	288	{
274	/*	289	/*
275	* add or delete rows as appropriate	290	* add or delete rows as appropriate
276	*/	291	*/
277		292
		293	int common_col = min (prev_ncol, ncol);
		294
278	for (int row = min (nrow, prev_nrow); row--; )	295	for (int row = min (nrow, prev_nrow); row--; )
279	{	296	{
280	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	297	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);	298	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);	299	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);	300
286	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]);
287	}	302	}
288		303
289	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
290	int pend = MOD (term_start + top_row , prev_total_rows);	305	int pend = MOD (term_start + top_row , prev_total_rows);
291	int q = total_rows; // rewrapped row	306	int q = total_rows; // rewrapped row
…		…
386	for (int row = min (nrow, prev_nrow); row--; )	401	for (int row = min (nrow, prev_nrow); row--; )
387	{	402	{
388	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)];
389	line_t &dst = row_buf [row];	404	line_t &dst = row_buf [row];
390		405
391	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);	406	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	}	407	}
396		408
397	for (int row = prev_nrow; row < nrow; row++)	409	for (int row = prev_nrow; row < nrow; row++)
398	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	410	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399		411
…		…
703		715
704	// finally move the view window, if desired	716	// finally move the view window, if desired
705	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
706	&& view_start != 0	718	&& view_start != 0
707	&& view_start != -saveLines)	719	&& view_start != -saveLines)
708	scr_page (UP, count);	720	scr_page (count);
709		721
710	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
711	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));
712	}	724	}
713	else	725	else
…		…
1228	* direction should be UP or DN	1240	* direction should be UP or DN
1229	*/	1241	*/
1230	void	1242	void
1231	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1243	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1232	{	1244	{
1233	int dirn;
1234
1235	want_refresh = 1;	1245	want_refresh = 1;
1236	ZERO_SCROLLBACK ();	1246	ZERO_SCROLLBACK ();
1237		1247
1238	dirn = ((direction == UP) ? 1 : -1);
1239
1240	screen.flags &= ~Screen_WrapNext;	1248	screen.flags &= ~Screen_WrapNext;
1241		1249
1242	if ((screen.cur.row == screen.bscroll && direction == UP)	1250	if ((screen.cur.row == screen.bscroll && direction == UP)
1243	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1251	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1244	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1252	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1245	else	1253	else
1246	screen.cur.row += dirn;	1254	screen.cur.row += direction;
1247		1255
1248	clamp_it (screen.cur.row, 0, nrow - 1);	1256	clamp_it (screen.cur.row, 0, nrow - 1);
1249	selection_check (0);	1257	selection_check (0);
1250	}	1258	}
1251		1259
…		…
1706	if (rvideo_state != on)	1714	if (rvideo_state != on)
1707	{	1715	{
1708	rvideo_state = on;	1716	rvideo_state = on;
1709		1717
1710	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1718	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1711	#ifdef HAVE_BG_PIXMAP	1719	#ifdef HAVE_IMG
1712	if (bg_img == 0)	1720	if (bg_img == 0)
1713	#endif	1721	#endif
1714	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1722	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1715		1723
1716	XGCValues gcvalue;	1724	XGCValues gcvalue;
…		…
1889	* the top of the screen	1897	* the top of the screen
1890	*/	1898	*/
1891	void	1899	void
1892	rxvt_term::scr_move_to (int y, int len) NOTHROW	1900	rxvt_term::scr_move_to (int y, int len) NOTHROW
1893	{	1901	{
1894	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);
1895	}	1904	}
1896		1905
1897	/* ------------------------------------------------------------------------- */	1906	/* ------------------------------------------------------------------------- */
1898	/*	1907	/*
1899	* Page the screen up/down nlines	1908	* Page the screen up/down nlines
1900	* direction should be UP or DN	1909	* direction should be UP or DN
1901	*/	1910	*/
1902	bool	1911	bool
1903	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1912	rxvt_term::scr_page (int nlines) NOTHROW
1904	{	1913	{
1905	int new_view_start =
1906	direction == UP ? view_start - nlines
1907	: view_start + nlines;
1908
1909	return scr_changeview (new_view_start);	1914	return scr_changeview (view_start - nlines);
1910	}	1915	}
1911		1916
1912	bool	1917	bool
1913	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1918	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1914	{	1919	{
…		…
2032	rxvt_term::scr_refresh () NOTHROW	2037	rxvt_term::scr_refresh () NOTHROW
2033	{	2038	{
2034	int16_t col, row, /* column/row we're processing */	2039	int16_t col, row, /* column/row we're processing */
2035	ocrow; /* old cursor row */	2040	ocrow; /* old cursor row */
2036	int i; /* tmp */	2041	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 */	2042	rend_t ccol1, /* Cursor colour */
2042	ccol2; /* Cursor colour2 */	2043	ccol2; /* Cursor colour2 */
		2044	rend_t cur_rend;
		2045	int cur_col;
		2046	int cursorwidth;
2043		2047
2044	want_refresh = 0; /* screen is current */	2048	want_refresh = 0; /* screen is current */
2045		2049
2046	if (refresh_type == NO_REFRESH \|\| !mapped)	2050	if (refresh_type == NO_REFRESH \|\| !mapped)
2047	return;	2051	return;
…		…
2051	*/	2055	*/
2052	refresh_count = 0;	2056	refresh_count = 0;
2053		2057
2054	unsigned int old_screen_flags = screen.flags;	2058	unsigned int old_screen_flags = screen.flags;
2055	bool have_bg = 0;	2059	bool have_bg = 0;
2056	#ifdef HAVE_BG_PIXMAP	2060	#ifdef HAVE_IMG
2057	have_bg = bg_img != 0;	2061	have_bg = bg_img != 0;
2058	#endif	2062	#endif
2059	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2063	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2060		2064
2061	/*	2065	/*
…		…
2072		2076
2073	/*	2077	/*
2074	* C: set the cursor character (s)	2078	* C: set the cursor character (s)
2075	*/	2079	*/
2076	{	2080	{
2077	bool setoldcursor;
2078
2079	#ifdef CURSOR_BLINK	2081	#ifdef CURSOR_BLINK
2080	if (hidden_cursor)	2082	if (hidden_cursor)
2081	showcursor = 0;	2083	showcursor = 0;
2082	#endif	2084	#endif
2083		2085
…		…
2086	int col = screen.cur.col;	2088	int col = screen.cur.col;
2087		2089
2088	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2090	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2089	col--;	2091	col--;
2090		2092
		2093	cursorwidth = 1;
		2094	while (col + cursorwidth < ncol
		2095	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2096	cursorwidth++;
		2097
2091	crp = &ROW(screen.cur.row).r[col];	2098	cur_rend = ROW(screen.cur.row).r[col];
		2099	cur_col = col;
2092		2100
2093	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2094	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2095	if (ISSET_PIXCOLOR (Color_cursor))	2102	if (ISSET_PIXCOLOR (Color_cursor))
2096	ccol1 = Color_cursor;	2103	ccol1 = Color_cursor;
2097	else	2104	else
2098	#endif	2105	#endif
2099	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2111	ccol2 = bgcolor_of (rstyle);	2118	ccol2 = bgcolor_of (rstyle);
2112	#else	2119	#else
2113	ccol2 = Color_bg;	2120	ccol2 = Color_bg;
2114	#endif	2121	#endif
2115		2122
2116	if (focus)	2123	if (focus && cursor_type != 2)
2117	{	2124	{
2118	if (option (Opt_cursorUnderline))	2125	rend_t rend = cur_rend;
		2126
		2127	if (cursor_type == 1)
2119	*crp ^= RS_Uline;	2128	rend ^= RS_Uline;
2120	else	2129	else
2121	{	2130	{
2122	*crp ^= RS_RVid;	2131	rend ^= RS_RVid;
2123	crp = SET_FGCOLOR (crp, ccol1);	2132	rend = SET_FGCOLOR (rend, ccol1);
2124	crp = SET_BGCOLOR (crp, ccol2);	2133	rend = SET_BGCOLOR (rend, ccol2);
2125	}	2134	}
		2135
		2136	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2126	}	2137	}
2127	}	2138	}
2128		2139
2129	/* make sure no outline cursor is left around */	2140	/* make sure no outline cursor is left around */
2130	setoldcursor = 0;	2141	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2131	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)
2132	{	2149	{
2133	if (screen.cur.row - view_start != ocrow	2150	oldcursor.row = screen.cur.row - view_start;
2134	\|\| screen.cur.col != oldcursor.col)	2151	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	}	2152	}
2146	else if (!focus)	2153	else
2147	setoldcursor = 1;
2148
2149	if (setoldcursor)
2150	{
2151	if (screen.cur.row - view_start >= nrow)
2152	oldcursor.row = -1;	2154	oldcursor.row = -1;
2153	else
2154	{
2155	oldcursor.row = screen.cur.row - view_start;
2156	oldcursor.col = screen.cur.col;
2157	}
2158	}
2159	}	2155	}
2160		2156
2161	#ifndef NO_SLOW_LINK_SUPPORT	2157	#ifndef NO_SLOW_LINK_SUPPORT
2162	/*	2158	/*
2163	* D: CopyArea pass - very useful for slower links	2159	* D: CopyArea pass - very useful for slower links
…		…
2244	int ypixel = (int)Row2Pixel (row);	2240	int ypixel = (int)Row2Pixel (row);
2245		2241
2246	for (col = 0; col < ncol; col++)	2242	for (col = 0; col < ncol; col++)
2247	{	2243	{
2248	/* compare new text with old - if exactly the same then continue */	2244	/* compare new text with old - if exactly the same then continue */
2249	if (stp[col] == dtp[col] /* Must match characters to skip. */	2245	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;	2246	continue;
2254		2247
2255	// redraw one or more characters	2248	// redraw one or more characters
2256		2249
2257	// seek to the beginning of wide characters	2250	// seek to the beginning of wide characters
…		…
2429	else	2422	else
2430	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2423	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2431		2424
2432	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2425	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2433	{	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
2434	#if ENABLE_FRILLS	2431	#if ENABLE_FRILLS
2435	if (ISSET_PIXCOLOR (Color_underline))	2432	if (ISSET_PIXCOLOR (Color_underline))
2436	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2433	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2437	else	2434	else
2438	#endif	2435	#endif
…		…
2450	*/	2447	*/
2451	if (showcursor)	2448	if (showcursor)
2452	{	2449	{
2453	if (focus)	2450	if (focus)
2454	{	2451	{
2455	if (option (Opt_cursorUnderline))	2452	if (cursor_type != 2)
2456	*crp ^= RS_Uline;	2453	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2457	else	2454	else if (oldcursor.row >= 0)
2458	{	2455	{
2459	*crp ^= RS_RVid;	2456	XSetForeground (dpy, gc, pix_colors[ccol1]);
2460	#ifndef NO_CURSORCOLOR	2457	XFillRectangle (dpy, vt, gc,
2461	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2458	Col2Pixel (cur_col),
2462	#endif	2459	Row2Pixel (oldcursor.row),
		2460	1,
		2461	Height2Pixel (1));
2463	}	2462	}
2464	}	2463	}
2465	else if (oldcursor.row >= 0)	2464	else if (oldcursor.row >= 0)
2466	{	2465	{
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]);	2466	XSetForeground (dpy, gc, pix_colors[ccol1]);
2483		2467
2484	XDrawRectangle (dpy, vt, gc,	2468	XDrawRectangle (dpy, vt, gc,
2485	Col2Pixel (col),	2469	Col2Pixel (cur_col),
2486	Row2Pixel (oldcursor.row),	2470	Row2Pixel (oldcursor.row),
2487	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2471	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2488	(unsigned int) (Height2Pixel (1) - 1));	2472	(unsigned int) (Height2Pixel (1) - 1));
2489	}	2473	}
2490	}	2474	}
…		…
2532	void ecb_cold	2516	void ecb_cold
2533	rxvt_term::scr_recolour (bool refresh) NOTHROW	2517	rxvt_term::scr_recolour (bool refresh) NOTHROW
2534	{	2518	{
2535	bool transparent = false;	2519	bool transparent = false;
2536		2520
2537	#ifdef HAVE_BG_PIXMAP	2521	#ifdef HAVE_IMG
2538	if (bg_img != 0)	2522	if (bg_img != 0)
2539	{	2523	{
2540	# if ENABLE_TRANSPARENCY	2524	# if ENABLE_TRANSPARENCY
2541	if (bg_flags & BG_IS_TRANSPARENT)	2525	if (bg_flags & BG_IS_TRANSPARENT)
2542	{	2526	{
…		…
2559	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2543	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2560	}	2544	}
2561		2545
2562	XClearWindow (dpy, parent);	2546	XClearWindow (dpy, parent);
2563		2547
2564	if (scrollBar.win)	2548	if (scrollBar.state && scrollBar.win)
2565	{	2549	{
2566	if (transparent)	2550	if (transparent)
2567	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2551	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568	else	2552	else
2569	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2553	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2570	scrollBar.state = SB_STATE_IDLE;	2554	scrollBar.state = SB_STATE_IDLE;
2571	scrollBar.show (0);	2555	scrollBar.show (0);
2572	}	2556	}
2573		2557
2574	if (refresh)	2558	if (refresh)
…		…
2691	\|\| (check_more == 1	2675	\|\| (check_more == 1
2692	&& current_screen == selection.screen	2676	&& current_screen == selection.screen
2693	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2677	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2694	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2678	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2695	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;
2696	}	2694	}
2697		2695
2698	/* ------------------------------------------------------------------------- */	2696	/* ------------------------------------------------------------------------- */
2699	/*	2697	/*
2700	* Paste a selection direct to the command fd	2698	* Paste a selection direct to the command fd
…		…
3003	* Word select: select text for 2 clicks	3001	* Word select: select text for 2 clicks
3004	* We now only find out the boundary in one direction	3002	* We now only find out the boundary in one direction
3005	*/	3003	*/
3006		3004
3007	/* 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 */
3008	#define DELIMIT_TEXT(x) \	3006	#define DELIMIT_TEXT(x) \
3009	(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)))
3010	#define DELIMIT_REND(x) 1	3008	#define DELIMIT_REND(x) 1
3011		3009
3012	void ecb_cold	3010	void ecb_cold
3013	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
…		…
3134	{	3132	{
3135	row_col_t pos;	3133	row_col_t pos;
3136	enum {	3134	enum {
3137	LEFT, RIGHT	3135	LEFT, RIGHT
3138	} closeto = RIGHT;	3136	} closeto = RIGHT;
3139
3140	want_refresh = 1;
3141		3137
3142	switch (selection.op)	3138	switch (selection.op)
3143	{	3139	{
3144	case SELECTION_INIT:	3140	case SELECTION_INIT:
3145	CLEAR_SELECTION ();	3141	CLEAR_SELECTION ();
…		…
3325		3321
3326	#if !ENABLE_MINIMAL	3322	#if !ENABLE_MINIMAL
3327	if (selection.rect && selection.beg.col > selection.end.col)	3323	if (selection.rect && selection.beg.col > selection.end.col)
3328	::swap (selection.beg.col, selection.end.col);	3324	::swap (selection.beg.col, selection.end.col);
3329	#endif	3325	#endif
		3326
		3327	selection_changed ();
3330	}	3328	}
3331		3329
3332	#if !ENABLE_MINIMAL	3330	#if !ENABLE_MINIMAL
3333	void ecb_cold	3331	void ecb_cold
3334	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.425 by root, Fri Jun 29 22:10:18 2012 UTC vs. Revision 1.452 by root, Sat Dec 13 09:49:48 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.425 by root, Fri Jun 29 22:10:18 2012 UTC vs.
Revision 1.452 by root, Sat Dec 13 09:49:48 2014 UTC