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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs.
Revision 1.443 by sf-exg, Sun Mar 31 22:31:45 2013 UTC

…		…
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
…		…
169	tsize -= tsize % sizeof (rend_t);	179	tsize -= tsize % sizeof (rend_t);
170		180
171	int all_rows = total_rows + nrow + nrow;	181	int all_rows = total_rows + nrow + nrow;
172		182
173	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;	183	chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174	chunk = rxvt_malloc (chunk_size);	184	chunk = chunk_alloc (chunk_size, 0);
175		185
176	char base = (char )chunk + sizeof (line_t) * all_rows;	186	char base = (char )chunk + sizeof (line_t) * all_rows;
177		187
178	for (int row = 0; row < all_rows; ++row)	188	for (int row = 0; row < all_rows; ++row)
179	{	189	{
…		…
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--; )
…		…
429	}	442	}
430		443
431	void ecb_cold	444	void ecb_cold
432	rxvt_term::scr_release () NOTHROW	445	rxvt_term::scr_release () NOTHROW
433	{	446	{
434	free (chunk); chunk = 0; row_buf = 0;	447	chunk_free (chunk, chunk_size);
435	free (tabs); tabs = 0;	448	chunk = 0;
		449	row_buf = 0;
		450
		451	free (tabs);
		452	tabs = 0;
436	}	453	}
437		454
438	/* ------------------------------------------------------------------------- */	455	/* ------------------------------------------------------------------------- */
439	/*	456	/*
440	* Hard/Soft reset	457	* Hard/Soft reset
…		…
698		715
699	// finally move the view window, if desired	716	// finally move the view window, if desired
700	if (option (Opt_scrollWithBuffer)	717	if (option (Opt_scrollWithBuffer)
701	&& view_start != 0	718	&& view_start != 0
702	&& view_start != -saveLines)	719	&& view_start != -saveLines)
703	scr_page (UP, count);	720	scr_page (count);
704		721
705	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	722	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
706	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));
707	}	724	}
708	else	725	else
…		…
1223	* direction should be UP or DN	1240	* direction should be UP or DN
1224	*/	1241	*/
1225	void	1242	void
1226	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1243	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1227	{	1244	{
1228	int dirn;
1229
1230	want_refresh = 1;	1245	want_refresh = 1;
1231	ZERO_SCROLLBACK ();	1246	ZERO_SCROLLBACK ();
1232		1247
1233	dirn = ((direction == UP) ? 1 : -1);
1234
1235	screen.flags &= ~Screen_WrapNext;	1248	screen.flags &= ~Screen_WrapNext;
1236		1249
1237	if ((screen.cur.row == screen.bscroll && direction == UP)	1250	if ((screen.cur.row == screen.bscroll && direction == UP)
1238	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1251	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1239	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1252	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1240	else	1253	else
1241	screen.cur.row += dirn;	1254	screen.cur.row += direction;
1242		1255
1243	clamp_it (screen.cur.row, 0, nrow - 1);	1256	clamp_it (screen.cur.row, 0, nrow - 1);
1244	selection_check (0);	1257	selection_check (0);
1245	}	1258	}
1246		1259
…		…
1701	if (rvideo_state != on)	1714	if (rvideo_state != on)
1702	{	1715	{
1703	rvideo_state = on;	1716	rvideo_state = on;
1704		1717
1705	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1718	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1706	#ifdef HAVE_BG_PIXMAP	1719	#ifdef HAVE_IMG
1707	if (bg_img == 0)	1720	if (bg_img == 0)
1708	#endif	1721	#endif
1709	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1722	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1710		1723
1711	XGCValues gcvalue;	1724	XGCValues gcvalue;
…		…
1893	/*	1906	/*
1894	* Page the screen up/down nlines	1907	* Page the screen up/down nlines
1895	* direction should be UP or DN	1908	* direction should be UP or DN
1896	*/	1909	*/
1897	bool	1910	bool
1898	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1911	rxvt_term::scr_page (int nlines) NOTHROW
1899	{	1912	{
1900	int new_view_start =
1901	direction == UP ? view_start - nlines
1902	: view_start + nlines;
1903
1904	return scr_changeview (new_view_start);	1913	return scr_changeview (view_start - nlines);
1905	}	1914	}
1906		1915
1907	bool	1916	bool
1908	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1917	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1909	{	1918	{
…		…
2027	rxvt_term::scr_refresh () NOTHROW	2036	rxvt_term::scr_refresh () NOTHROW
2028	{	2037	{
2029	int16_t col, row, /* column/row we're processing */	2038	int16_t col, row, /* column/row we're processing */
2030	ocrow; /* old cursor row */	2039	ocrow; /* old cursor row */
2031	int i; /* tmp */	2040	int i; /* tmp */
2032	#ifndef NO_CURSORCOLOR
2033	rend_t cc1; /* store colours at cursor position (s) */
2034	#endif
2035	rend_t *crp; // cursor rendition pointer
2036	rend_t ccol1, /* Cursor colour */	2041	rend_t ccol1, /* Cursor colour */
2037	ccol2; /* Cursor colour2 */	2042	ccol2; /* Cursor colour2 */
		2043	rend_t cur_rend;
		2044	int cur_col;
		2045	int cursorwidth;
2038		2046
2039	want_refresh = 0; /* screen is current */	2047	want_refresh = 0; /* screen is current */
2040		2048
2041	if (refresh_type == NO_REFRESH \|\| !mapped)	2049	if (refresh_type == NO_REFRESH \|\| !mapped)
2042	return;	2050	return;
…		…
2046	*/	2054	*/
2047	refresh_count = 0;	2055	refresh_count = 0;
2048		2056
2049	unsigned int old_screen_flags = screen.flags;	2057	unsigned int old_screen_flags = screen.flags;
2050	bool have_bg = 0;	2058	bool have_bg = 0;
2051	#ifdef HAVE_BG_PIXMAP	2059	#ifdef HAVE_IMG
2052	have_bg = bg_img != 0;	2060	have_bg = bg_img != 0;
2053	#endif	2061	#endif
2054	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2062	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2055		2063
2056	/*	2064	/*
…		…
2067		2075
2068	/*	2076	/*
2069	* C: set the cursor character (s)	2077	* C: set the cursor character (s)
2070	*/	2078	*/
2071	{	2079	{
2072	bool setoldcursor;
2073
2074	#ifdef CURSOR_BLINK	2080	#ifdef CURSOR_BLINK
2075	if (hidden_cursor)	2081	if (hidden_cursor)
2076	showcursor = 0;	2082	showcursor = 0;
2077	#endif	2083	#endif
2078		2084
…		…
2081	int col = screen.cur.col;	2087	int col = screen.cur.col;
2082		2088
2083	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2089	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2084	col--;	2090	col--;
2085		2091
		2092	cursorwidth = 1;
		2093	while (col + cursorwidth < ncol
		2094	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2095	cursorwidth++;
		2096
2086	crp = &ROW(screen.cur.row).r[col];	2097	cur_rend = ROW(screen.cur.row).r[col];
		2098	cur_col = col;
2087		2099
2088	#ifndef NO_CURSORCOLOR	2100	#ifndef NO_CURSORCOLOR
2089	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2090	if (ISSET_PIXCOLOR (Color_cursor))	2101	if (ISSET_PIXCOLOR (Color_cursor))
2091	ccol1 = Color_cursor;	2102	ccol1 = Color_cursor;
2092	else	2103	else
2093	#endif	2104	#endif
2094	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2105	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2108	ccol2 = Color_bg;	2119	ccol2 = Color_bg;
2109	#endif	2120	#endif
2110		2121
2111	if (focus)	2122	if (focus)
2112	{	2123	{
		2124	rend_t rend = cur_rend;
		2125
2113	if (option (Opt_cursorUnderline))	2126	if (option (Opt_cursorUnderline))
2114	*crp ^= RS_Uline;	2127	rend ^= RS_Uline;
2115	else	2128	else
2116	{	2129	{
2117	*crp ^= RS_RVid;	2130	rend ^= RS_RVid;
2118	crp = SET_FGCOLOR (crp, ccol1);	2131	rend = SET_FGCOLOR (rend, ccol1);
2119	crp = SET_BGCOLOR (crp, ccol2);	2132	rend = SET_BGCOLOR (rend, ccol2);
2120	}	2133	}
		2134
		2135	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2121	}	2136	}
2122	}	2137	}
2123		2138
2124	/* make sure no outline cursor is left around */	2139	/* make sure no outline cursor is left around */
2125	setoldcursor = 0;
2126	if (ocrow != -1)	2140	if (ocrow != -1)
2127	{	2141	{
2128	if (screen.cur.row - view_start != ocrow	2142	if (screen.cur.row - view_start != ocrow
2129	\|\| screen.cur.col != oldcursor.col)	2143	\|\| screen.cur.col != oldcursor.col)
2130	{	2144	{
2131	if (ocrow < nrow	2145	if (ocrow < nrow
2132	&& oldcursor.col < ncol)	2146	&& oldcursor.col < ncol)
2133	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);	2147	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
2134
2135	if (focus \|\| !showcursor)
2136	oldcursor.row = -1;
2137	else
2138	setoldcursor = 1;
2139	}	2148	}
2140	}	2149	}
2141	else if (!focus)
2142	setoldcursor = 1;
2143		2150
2144	if (setoldcursor)	2151	// save the current cursor coordinates if the cursor is visible
		2152	// and the window is unfocused, so as to clear the outline cursor
		2153	// in the next refresh if the cursor moves
		2154	if (showcursor && !focus && screen.cur.row - view_start < nrow)
2145	{	2155	{
2146	if (screen.cur.row - view_start >= nrow)
2147	oldcursor.row = -1;
2148	else
2149	{
2150	oldcursor.row = screen.cur.row - view_start;	2156	oldcursor.row = screen.cur.row - view_start;
2151	oldcursor.col = screen.cur.col;	2157	oldcursor.col = screen.cur.col;
2152	}
2153	}	2158	}
		2159	else
		2160	oldcursor.row = -1;
2154	}	2161	}
2155		2162
2156	#ifndef NO_SLOW_LINK_SUPPORT	2163	#ifndef NO_SLOW_LINK_SUPPORT
2157	/*	2164	/*
2158	* D: CopyArea pass - very useful for slower links	2165	* D: CopyArea pass - very useful for slower links
…		…
2424	else	2431	else
2425	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2432	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2426		2433
2427	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2434	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2428	{	2435	{
		2436	if (showcursor && focus && row == screen.cur.row
		2437	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2438	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2439	else
2429	#if ENABLE_FRILLS	2440	#if ENABLE_FRILLS
2430	if (ISSET_PIXCOLOR (Color_underline))	2441	if (ISSET_PIXCOLOR (Color_underline))
2431	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2442	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2432	else	2443	else
2433	#endif	2444	#endif
…		…
2444	* G: cleanup cursor and display outline cursor if necessary	2455	* G: cleanup cursor and display outline cursor if necessary
2445	*/	2456	*/
2446	if (showcursor)	2457	if (showcursor)
2447	{	2458	{
2448	if (focus)	2459	if (focus)
2449	{	2460	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2450	if (option (Opt_cursorUnderline))
2451	*crp ^= RS_Uline;
2452	else
2453	{
2454	*crp ^= RS_RVid;
2455	#ifndef NO_CURSORCOLOR
2456	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2457	#endif
2458	}
2459	}
2460	else if (oldcursor.row >= 0)	2461	else if (oldcursor.row >= 0)
2461	{	2462	{
2462	int cursorwidth = 1;
2463	int col = oldcursor.col;
2464
2465	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2466	col--;
2467
2468	while (col + cursorwidth < ncol
2469	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2470	cursorwidth++;
2471
2472	#ifndef NO_CURSORCOLOR
2473	if (ISSET_PIXCOLOR (Color_cursor))
2474	XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2475	else
2476	#endif
2477	XSetForeground (dpy, gc, pix_colors[ccol1]);	2463	XSetForeground (dpy, gc, pix_colors[ccol1]);
2478		2464
2479	XDrawRectangle (dpy, vt, gc,	2465	XDrawRectangle (dpy, vt, gc,
2480	Col2Pixel (col),	2466	Col2Pixel (cur_col),
2481	Row2Pixel (oldcursor.row),	2467	Row2Pixel (oldcursor.row),
2482	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2468	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2483	(unsigned int) (Height2Pixel (1) - 1));	2469	(unsigned int) (Height2Pixel (1) - 1));
2484	}	2470	}
2485	}	2471	}
…		…
2527	void ecb_cold	2513	void ecb_cold
2528	rxvt_term::scr_recolour (bool refresh) NOTHROW	2514	rxvt_term::scr_recolour (bool refresh) NOTHROW
2529	{	2515	{
2530	bool transparent = false;	2516	bool transparent = false;
2531		2517
2532	#ifdef HAVE_BG_PIXMAP	2518	#ifdef HAVE_IMG
2533	if (bg_img != 0)	2519	if (bg_img != 0)
2534	{	2520	{
2535	# if ENABLE_TRANSPARENCY	2521	# if ENABLE_TRANSPARENCY
2536	if (bg_flags & BG_IS_TRANSPARENT)	2522	if (bg_flags & BG_IS_TRANSPARENT)
2537	{	2523	{
…		…
2559	if (scrollBar.win)	2545	if (scrollBar.win)
2560	{	2546	{
2561	if (transparent)	2547	if (transparent)
2562	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2548	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563	else	2549	else
2564	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2550	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2565	scrollBar.state = SB_STATE_IDLE;	2551	scrollBar.state = SB_STATE_IDLE;
2566	scrollBar.show (0);	2552	scrollBar.show (0);
2567	}	2553	}
2568		2554
2569	if (refresh)	2555	if (refresh)
…		…
2686	\|\| (check_more == 1	2672	\|\| (check_more == 1
2687	&& current_screen == selection.screen	2673	&& current_screen == selection.screen
2688	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2674	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2689	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2675	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2690	CLEAR_ALL_SELECTION ();	2676	CLEAR_ALL_SELECTION ();
		2677	}
		2678
		2679	void
		2680	rxvt_term::selection_changed () NOTHROW
		2681	{
		2682	line_t &r1 = ROW (selection.beg.row);
		2683	while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
		2684	--selection.beg.col;
		2685
		2686	line_t &r2 = ROW (selection.end.row);
		2687	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2688	++selection.end.col;
		2689
		2690	want_refresh = 1;
2691	}	2691	}
2692		2692
2693	/* ------------------------------------------------------------------------- */	2693	/* ------------------------------------------------------------------------- */
2694	/*	2694	/*
2695	* Paste a selection direct to the command fd	2695	* Paste a selection direct to the command fd
…		…
2998	* Word select: select text for 2 clicks	2998	* Word select: select text for 2 clicks
2999	* We now only find out the boundary in one direction	2999	* We now only find out the boundary in one direction
3000	*/	3000	*/
3001		3001
3002	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3002	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3003	#define DELIMIT_TEXT(x) \	3003	#define DELIMIT_TEXT(x) \
3004	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3004	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3005	#define DELIMIT_REND(x) 1	3005	#define DELIMIT_REND(x) 1
3006		3006
3007	void ecb_cold	3007	void ecb_cold
3008	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3008	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3129	{	3129	{
3130	row_col_t pos;	3130	row_col_t pos;
3131	enum {	3131	enum {
3132	LEFT, RIGHT	3132	LEFT, RIGHT
3133	} closeto = RIGHT;	3133	} closeto = RIGHT;
3134
3135	want_refresh = 1;
3136		3134
3137	switch (selection.op)	3135	switch (selection.op)
3138	{	3136	{
3139	case SELECTION_INIT:	3137	case SELECTION_INIT:
3140	CLEAR_SELECTION ();	3138	CLEAR_SELECTION ();
…		…
3320		3318
3321	#if !ENABLE_MINIMAL	3319	#if !ENABLE_MINIMAL
3322	if (selection.rect && selection.beg.col > selection.end.col)	3320	if (selection.rect && selection.beg.col > selection.end.col)
3323	::swap (selection.beg.col, selection.end.col);	3321	::swap (selection.beg.col, selection.end.col);
3324	#endif	3322	#endif
		3323
		3324	selection_changed ();
3325	}	3325	}
3326		3326
3327	#if !ENABLE_MINIMAL	3327	#if !ENABLE_MINIMAL
3328	void ecb_cold	3328	void ecb_cold
3329	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3329	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.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs. Revision 1.443 by sf-exg, Sun Mar 31 22:31:45 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC vs.
Revision 1.443 by sf-exg, Sun Mar 31 22:31:45 2013 UTC