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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC vs.
Revision 1.450 by mikachu, Sat Dec 6 09:20:13 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	dst.l = common_col;
396	}	407	}
397		408
398	for (int row = prev_nrow; row < nrow; row++)	409	for (int row = prev_nrow; row < nrow; row++)
399	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	410	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
400		411
…		…
704		715
705	// finally move the view window, if desired	716	// finally move the view window, if desired
706	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
707	&& view_start != 0	718	&& view_start != 0
708	&& view_start != -saveLines)	719	&& view_start != -saveLines)
709	scr_page (UP, count);	720	scr_page (count);
710		721
711	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
712	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));
713	}	724	}
714	else	725	else
…		…
1229	* direction should be UP or DN	1240	* direction should be UP or DN
1230	*/	1241	*/
1231	void	1242	void
1232	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1243	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1233	{	1244	{
1234	int dirn;
1235
1236	want_refresh = 1;	1245	want_refresh = 1;
1237	ZERO_SCROLLBACK ();	1246	ZERO_SCROLLBACK ();
1238		1247
1239	dirn = ((direction == UP) ? 1 : -1);
1240
1241	screen.flags &= ~Screen_WrapNext;	1248	screen.flags &= ~Screen_WrapNext;
1242		1249
1243	if ((screen.cur.row == screen.bscroll && direction == UP)	1250	if ((screen.cur.row == screen.bscroll && direction == UP)
1244	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1251	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1245	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1252	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1246	else	1253	else
1247	screen.cur.row += dirn;	1254	screen.cur.row += direction;
1248		1255
1249	clamp_it (screen.cur.row, 0, nrow - 1);	1256	clamp_it (screen.cur.row, 0, nrow - 1);
1250	selection_check (0);	1257	selection_check (0);
1251	}	1258	}
1252		1259
…		…
1890	* the top of the screen	1897	* the top of the screen
1891	*/	1898	*/
1892	void	1899	void
1893	rxvt_term::scr_move_to (int y, int len) NOTHROW	1900	rxvt_term::scr_move_to (int y, int len) NOTHROW
1894	{	1901	{
1895	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);
1896	}	1904	}
1897		1905
1898	/* ------------------------------------------------------------------------- */	1906	/* ------------------------------------------------------------------------- */
1899	/*	1907	/*
1900	* Page the screen up/down nlines	1908	* Page the screen up/down nlines
1901	* direction should be UP or DN	1909	* direction should be UP or DN
1902	*/	1910	*/
1903	bool	1911	bool
1904	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1912	rxvt_term::scr_page (int nlines) NOTHROW
1905	{	1913	{
1906	int new_view_start =
1907	direction == UP ? view_start - nlines
1908	: view_start + nlines;
1909
1910	return scr_changeview (new_view_start);	1914	return scr_changeview (view_start - nlines);
1911	}	1915	}
1912		1916
1913	bool	1917	bool
1914	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1918	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1915	{	1919	{
…		…
2033	rxvt_term::scr_refresh () NOTHROW	2037	rxvt_term::scr_refresh () NOTHROW
2034	{	2038	{
2035	int16_t col, row, /* column/row we're processing */	2039	int16_t col, row, /* column/row we're processing */
2036	ocrow; /* old cursor row */	2040	ocrow; /* old cursor row */
2037	int i; /* tmp */	2041	int i; /* tmp */
2038	#ifndef NO_CURSORCOLOR
2039	rend_t cc1; /* store colours at cursor position (s) */
2040	#endif
2041	rend_t *crp; // cursor rendition pointer
2042	rend_t ccol1, /* Cursor colour */	2042	rend_t ccol1, /* Cursor colour */
2043	ccol2; /* Cursor colour2 */	2043	ccol2; /* Cursor colour2 */
		2044	rend_t cur_rend;
		2045	int cur_col;
		2046	int cursorwidth;
2044		2047
2045	want_refresh = 0; /* screen is current */	2048	want_refresh = 0; /* screen is current */
2046		2049
2047	if (refresh_type == NO_REFRESH \|\| !mapped)	2050	if (refresh_type == NO_REFRESH \|\| !mapped)
2048	return;	2051	return;
…		…
2073		2076
2074	/*	2077	/*
2075	* C: set the cursor character (s)	2078	* C: set the cursor character (s)
2076	*/	2079	*/
2077	{	2080	{
2078	bool setoldcursor;
2079
2080	#ifdef CURSOR_BLINK	2081	#ifdef CURSOR_BLINK
2081	if (hidden_cursor)	2082	if (hidden_cursor)
2082	showcursor = 0;	2083	showcursor = 0;
2083	#endif	2084	#endif
2084		2085
…		…
2087	int col = screen.cur.col;	2088	int col = screen.cur.col;
2088		2089
2089	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2090	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090	col--;	2091	col--;
2091		2092
		2093	cursorwidth = 1;
		2094	while (col + cursorwidth < ncol
		2095	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2096	cursorwidth++;
		2097
2092	crp = &ROW(screen.cur.row).r[col];	2098	cur_rend = ROW(screen.cur.row).r[col];
		2099	cur_col = col;
2093		2100
2094	#ifndef NO_CURSORCOLOR	2101	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2102	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2103	ccol1 = Color_cursor;
2098	else	2104	else
2099	#endif	2105	#endif
2100	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2106	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2112	ccol2 = bgcolor_of (rstyle);	2118	ccol2 = bgcolor_of (rstyle);
2113	#else	2119	#else
2114	ccol2 = Color_bg;	2120	ccol2 = Color_bg;
2115	#endif	2121	#endif
2116		2122
2117	if (focus)	2123	if (focus && cursor_type != 2)
2118	{	2124	{
2119	if (option (Opt_cursorUnderline))	2125	rend_t rend = cur_rend;
		2126
		2127	if (cursor_type == 1)
2120	*crp ^= RS_Uline;	2128	rend ^= RS_Uline;
2121	else	2129	else
2122	{	2130	{
2123	*crp ^= RS_RVid;	2131	rend ^= RS_RVid;
2124	crp = SET_FGCOLOR (crp, ccol1);	2132	rend = SET_FGCOLOR (rend, ccol1);
2125	crp = SET_BGCOLOR (crp, ccol2);	2133	rend = SET_BGCOLOR (rend, ccol2);
2126	}	2134	}
		2135
		2136	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127	}	2137	}
2128	}	2138	}
2129		2139
2130	/* make sure no outline cursor is left around */	2140	/* make sure no outline cursor is left around */
2131	setoldcursor = 0;
2132	if (ocrow != -1)	2141	if (ocrow != -1)
2133	{	2142	{
2134	if (screen.cur.row - view_start != ocrow	2143	if (screen.cur.row - view_start != ocrow
2135	\|\| screen.cur.col != oldcursor.col)	2144	\|\| screen.cur.col != oldcursor.col \|\| !showcursor)
2136	{	2145	{
2137	if (ocrow < nrow	2146	if (ocrow < nrow
2138	&& oldcursor.col < ncol)	2147	&& oldcursor.col < ncol)
2139	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);	2148	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2140
2141	if (focus \|\| !showcursor)
2142	oldcursor.row = -1;
2143	else
2144	setoldcursor = 1;
2145	}	2149	}
2146	}	2150	}
2147	else if (!focus)
2148	setoldcursor = 1;
2149		2151
2150	if (setoldcursor)	2152	// save the current cursor coordinates if the cursor is visible
		2153	// and either the window is unfocused or the cursor style is
		2154	// vertical bar, so as to clear the outline cursor in the next
		2155	// refresh if the cursor moves or becomes invisible
		2156	if (showcursor && (!focus \|\| cursor_type == 2) && screen.cur.row - view_start < nrow)
2151	{	2157	{
2152	if (screen.cur.row - view_start >= nrow)
2153	oldcursor.row = -1;
2154	else
2155	{
2156	oldcursor.row = screen.cur.row - view_start;	2158	oldcursor.row = screen.cur.row - view_start;
2157	oldcursor.col = screen.cur.col;	2159	oldcursor.col = screen.cur.col;
2158	}
2159	}	2160	}
		2161	else
		2162	oldcursor.row = -1;
2160	}	2163	}
2161		2164
2162	#ifndef NO_SLOW_LINK_SUPPORT	2165	#ifndef NO_SLOW_LINK_SUPPORT
2163	/*	2166	/*
2164	* D: CopyArea pass - very useful for slower links	2167	* D: CopyArea pass - very useful for slower links
…		…
2245	int ypixel = (int)Row2Pixel (row);	2248	int ypixel = (int)Row2Pixel (row);
2246		2249
2247	for (col = 0; col < ncol; col++)	2250	for (col = 0; col < ncol; col++)
2248	{	2251	{
2249	/* compare new text with old - if exactly the same then continue */	2252	/* compare new text with old - if exactly the same then continue */
2250	if (stp[col] == dtp[col] /* Must match characters to skip. */	2253	if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2251	&& (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2252	\|\| (stp[col] == ' ' /* space w/ no background change */
2253	&& GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2254	continue;	2254	continue;
2255		2255
2256	// redraw one or more characters	2256	// redraw one or more characters
2257		2257
2258	// seek to the beginning of wide characters	2258	// seek to the beginning of wide characters
…		…
2430	else	2430	else
2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432		2432
2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434	{	2434	{
		2435	if (showcursor && focus && row == screen.cur.row
		2436	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2437	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2438	else
2435	#if ENABLE_FRILLS	2439	#if ENABLE_FRILLS
2436	if (ISSET_PIXCOLOR (Color_underline))	2440	if (ISSET_PIXCOLOR (Color_underline))
2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2441	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438	else	2442	else
2439	#endif	2443	#endif
…		…
2451	*/	2455	*/
2452	if (showcursor)	2456	if (showcursor)
2453	{	2457	{
2454	if (focus)	2458	if (focus)
2455	{	2459	{
2456	if (option (Opt_cursorUnderline))	2460	if (cursor_type != 2)
2457	*crp ^= RS_Uline;	2461	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458	else	2462	else if (oldcursor.row >= 0)
2459	{	2463	{
2460	*crp ^= RS_RVid;	2464	XSetForeground (dpy, gc, pix_colors[ccol1]);
2461	#ifndef NO_CURSORCOLOR	2465	XFillRectangle (dpy, vt, gc,
2462	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2466	Col2Pixel (cur_col),
2463	#endif	2467	Row2Pixel (oldcursor.row),
		2468	1,
		2469	Height2Pixel (1));
2464	}	2470	}
2465	}	2471	}
2466	else if (oldcursor.row >= 0)	2472	else if (oldcursor.row >= 0)
2467	{	2473	{
2468	int cursorwidth = 1;
2469	int col = oldcursor.col;
2470
2471	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2472	col--;
2473
2474	while (col + cursorwidth < ncol
2475	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2476	cursorwidth++;
2477
2478	#ifndef NO_CURSORCOLOR
2479	if (ISSET_PIXCOLOR (Color_cursor))
2480	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2481	else
2482	#endif
2483	XSetForeground (dpy, gc, pix_colors[ccol1]);	2474	XSetForeground (dpy, gc, pix_colors[ccol1]);
2484		2475
2485	XDrawRectangle (dpy, vt, gc,	2476	XDrawRectangle (dpy, vt, gc,
2486	Col2Pixel (col),	2477	Col2Pixel (cur_col),
2487	Row2Pixel (oldcursor.row),	2478	Row2Pixel (oldcursor.row),
2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2479	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2489	(unsigned int) (Height2Pixel (1) - 1));	2480	(unsigned int) (Height2Pixel (1) - 1));
2490	}	2481	}
2491	}	2482	}
…		…
2560	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2551	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561	}	2552	}
2562		2553
2563	XClearWindow (dpy, parent);	2554	XClearWindow (dpy, parent);
2564		2555
2565	if (scrollBar.win)	2556	if (scrollBar.state)
2566	{	2557	{
2567	if (transparent)	2558	if (transparent)
2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2559	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569	else	2560	else
2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);	2561	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
…		…
2692	\|\| (check_more == 1	2683	\|\| (check_more == 1
2693	&& current_screen == selection.screen	2684	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2685	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2686	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696	CLEAR_ALL_SELECTION ();	2687	CLEAR_ALL_SELECTION ();
		2688	}
		2689
		2690	void
		2691	rxvt_term::selection_changed () NOTHROW
		2692	{
		2693	line_t &r1 = ROW (selection.beg.row);
		2694	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2695	++selection.beg.col;
		2696
		2697	line_t &r2 = ROW (selection.end.row);
		2698	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2699	++selection.end.col;
		2700
		2701	want_refresh = 1;
2697	}	2702	}
2698		2703
2699	/* ------------------------------------------------------------------------- */	2704	/* ------------------------------------------------------------------------- */
2700	/*	2705	/*
2701	* Paste a selection direct to the command fd	2706	* Paste a selection direct to the command fd
…		…
3004	* Word select: select text for 2 clicks	3009	* Word select: select text for 2 clicks
3005	* We now only find out the boundary in one direction	3010	* We now only find out the boundary in one direction
3006	*/	3011	*/
3007		3012
3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3013	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009	#define DELIMIT_TEXT(x) \	3014	#define DELIMIT_TEXT(x) \
3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3015	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011	#define DELIMIT_REND(x) 1	3016	#define DELIMIT_REND(x) 1
3012		3017
3013	void ecb_cold	3018	void ecb_cold
3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3019	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3135	{	3140	{
3136	row_col_t pos;	3141	row_col_t pos;
3137	enum {	3142	enum {
3138	LEFT, RIGHT	3143	LEFT, RIGHT
3139	} closeto = RIGHT;	3144	} closeto = RIGHT;
3140
3141	want_refresh = 1;
3142		3145
3143	switch (selection.op)	3146	switch (selection.op)
3144	{	3147	{
3145	case SELECTION_INIT:	3148	case SELECTION_INIT:
3146	CLEAR_SELECTION ();	3149	CLEAR_SELECTION ();
…		…
3326		3329
3327	#if !ENABLE_MINIMAL	3330	#if !ENABLE_MINIMAL
3328	if (selection.rect && selection.beg.col > selection.end.col)	3331	if (selection.rect && selection.beg.col > selection.end.col)
3329	::swap (selection.beg.col, selection.end.col);	3332	::swap (selection.beg.col, selection.end.col);
3330	#endif	3333	#endif
		3334
		3335	selection_changed ();
3331	}	3336	}
3332		3337
3333	#if !ENABLE_MINIMAL	3338	#if !ENABLE_MINIMAL
3334	void ecb_cold	3339	void ecb_cold
3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3340	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.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC vs. Revision 1.450 by mikachu, Sat Dec 6 09:20:13 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 2013 UTC vs.
Revision 1.450 by mikachu, Sat Dec 6 09:20:13 2014 UTC