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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.417 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 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
…		…
161	{	171	{
162	int tsize = sizeof (text_t) * ncol;	172	int tsize = sizeof (text_t) * ncol;
163	int rsize = sizeof (rend_t) * ncol;	173	int rsize = sizeof (rend_t) * ncol;
164		174
165	// we assume that rend_t size is a sufficient alignment	175	// we assume that rend_t size is a sufficient alignment
166	// factor for tetx_t and line_t values, and we only	176	// factor for text_t and line_t values, and we only
167	// need to adjust tsize.	177	// need to adjust tsize.
168	tsize = (tsize + sizeof (rend_t) - 1);	178	tsize = (tsize + sizeof (rend_t) - 1);
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 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--; )
…		…
426	tt_winch ();	439	tt_winch ();
427		440
428	HOOK_INVOKE ((this, HOOK_RESET, DT_END));	441	HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429	}	442	}
430		443
431	/* ------------------------------------------------------------------------- */
432	/*
433	* Free everything. That way malloc debugging can find leakage.
434	*/
435	void ecb_cold	444	void ecb_cold
436	rxvt_term::scr_release () NOTHROW	445	rxvt_term::scr_release () NOTHROW
437	{	446	{
438	free (chunk);	447	chunk_free (chunk, chunk_size);
		448	chunk = 0;
		449	row_buf = 0;
		450
439	free (tabs);	451	free (tabs);
		452	tabs = 0;
440	}	453	}
441		454
442	/* ------------------------------------------------------------------------- */	455	/* ------------------------------------------------------------------------- */
443	/*	456	/*
444	* Hard/Soft reset	457	* Hard/Soft reset
…		…
446	void ecb_cold	459	void ecb_cold
447	rxvt_term::scr_poweron ()	460	rxvt_term::scr_poweron ()
448	{	461	{
449	scr_release ();	462	scr_release ();
450		463
451	row_buf = 0;
452	tabs = 0;
453	prev_nrow = prev_ncol = 0;	464	prev_nrow = prev_ncol = 0;
454	rvideo_mode = false;	465	rvideo_mode = false;
455	scr_soft_reset ();	466	scr_soft_reset ();
456	scr_reset ();	467	scr_reset ();
457		468
…		…
1707	if (rvideo_state != on)	1718	if (rvideo_state != on)
1708	{	1719	{
1709	rvideo_state = on;	1720	rvideo_state = on;
1710		1721
1711	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1722	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712	#ifdef HAVE_BG_PIXMAP	1723	#ifdef HAVE_IMG
1713	if (bg_pixmap == None)	1724	if (bg_img == 0)
1714	#endif	1725	#endif
1715	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1726	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716		1727
1717	XGCValues gcvalue;	1728	XGCValues gcvalue;
1718	gcvalue.foreground = pix_colors[Color_fg];	1729	gcvalue.foreground = pix_colors[Color_fg];
…		…
2033	rxvt_term::scr_refresh () NOTHROW	2044	rxvt_term::scr_refresh () NOTHROW
2034	{	2045	{
2035	int16_t col, row, /* column/row we're processing */	2046	int16_t col, row, /* column/row we're processing */
2036	ocrow; /* old cursor row */	2047	ocrow; /* old cursor row */
2037	int i; /* tmp */	2048	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 */	2049	rend_t ccol1, /* Cursor colour */
2043	ccol2; /* Cursor colour2 */	2050	ccol2; /* Cursor colour2 */
		2051	rend_t cur_rend;
		2052	int cur_col;
		2053	int cursorwidth;
2044		2054
2045	want_refresh = 0; /* screen is current */	2055	want_refresh = 0; /* screen is current */
2046		2056
2047	if (refresh_type == NO_REFRESH \|\| !mapped)	2057	if (refresh_type == NO_REFRESH \|\| !mapped)
2048	return;	2058	return;
…		…
2052	*/	2062	*/
2053	refresh_count = 0;	2063	refresh_count = 0;
2054		2064
2055	unsigned int old_screen_flags = screen.flags;	2065	unsigned int old_screen_flags = screen.flags;
2056	bool have_bg = 0;	2066	bool have_bg = 0;
2057	#ifdef HAVE_BG_PIXMAP	2067	#ifdef HAVE_IMG
2058	have_bg = bg_pixmap != None;	2068	have_bg = bg_img != 0;
2059	#endif	2069	#endif
2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2070	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061		2071
2062	/*	2072	/*
2063	* B: reverse any characters which are selected	2073	* B: reverse any characters which are selected
…		…
2073		2083
2074	/*	2084	/*
2075	* C: set the cursor character (s)	2085	* C: set the cursor character (s)
2076	*/	2086	*/
2077	{	2087	{
2078	bool setoldcursor;
2079
2080	#ifdef CURSOR_BLINK	2088	#ifdef CURSOR_BLINK
2081	if (hidden_cursor)	2089	if (hidden_cursor)
2082	showcursor = 0;	2090	showcursor = 0;
2083	#endif	2091	#endif
2084		2092
…		…
2087	int col = screen.cur.col;	2095	int col = screen.cur.col;
2088		2096
2089	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2097	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090	col--;	2098	col--;
2091		2099
		2100	cursorwidth = 1;
		2101	while (col + cursorwidth < ncol
		2102	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2103	cursorwidth++;
		2104
2092	crp = &ROW(screen.cur.row).r[col];	2105	cur_rend = ROW(screen.cur.row).r[col];
		2106	cur_col = col;
2093		2107
2094	#ifndef NO_CURSORCOLOR	2108	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2109	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2110	ccol1 = Color_cursor;
2098	else	2111	else
2099	#endif	2112	#endif
2100	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2113	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2114	ccol2 = Color_bg;	2127	ccol2 = Color_bg;
2115	#endif	2128	#endif
2116		2129
2117	if (focus)	2130	if (focus)
2118	{	2131	{
		2132	rend_t rend = cur_rend;
		2133
2119	if (option (Opt_cursorUnderline))	2134	if (option (Opt_cursorUnderline))
2120	*crp ^= RS_Uline;	2135	rend ^= RS_Uline;
2121	else	2136	else
2122	{	2137	{
2123	*crp ^= RS_RVid;	2138	rend ^= RS_RVid;
2124	crp = SET_FGCOLOR (crp, ccol1);	2139	rend = SET_FGCOLOR (rend, ccol1);
2125	crp = SET_BGCOLOR (crp, ccol2);	2140	rend = SET_BGCOLOR (rend, ccol2);
2126	}	2141	}
		2142
		2143	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127	}	2144	}
2128	}	2145	}
2129		2146
2130	/* make sure no outline cursor is left around */	2147	/* make sure no outline cursor is left around */
2131	setoldcursor = 0;
2132	if (ocrow != -1)	2148	if (ocrow != -1)
2133	{	2149	{
2134	if (screen.cur.row - view_start != ocrow	2150	if (screen.cur.row - view_start != ocrow
2135	\|\| screen.cur.col != oldcursor.col)	2151	\|\| screen.cur.col != oldcursor.col)
2136	{	2152	{
2137	if (ocrow < nrow	2153	if (ocrow < nrow
2138	&& oldcursor.col < ncol)	2154	&& oldcursor.col < ncol)
2139	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);	2155	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	}	2156	}
2146	}	2157	}
2147	else if (!focus)
2148	setoldcursor = 1;
2149		2158
2150	if (setoldcursor)	2159	// save the current cursor coordinates if the cursor is visible
		2160	// and the window is unfocused, so as to clear the outline cursor
		2161	// in the next refresh if the cursor moves
		2162	if (showcursor && !focus && screen.cur.row - view_start < nrow)
2151	{	2163	{
2152	if (screen.cur.row - view_start >= nrow)
2153	oldcursor.row = -1;
2154	else
2155	{
2156	oldcursor.row = screen.cur.row - view_start;	2164	oldcursor.row = screen.cur.row - view_start;
2157	oldcursor.col = screen.cur.col;	2165	oldcursor.col = screen.cur.col;
2158	}
2159	}	2166	}
		2167	else
		2168	oldcursor.row = -1;
2160	}	2169	}
2161		2170
2162	#ifndef NO_SLOW_LINK_SUPPORT	2171	#ifndef NO_SLOW_LINK_SUPPORT
2163	/*	2172	/*
2164	* D: CopyArea pass - very useful for slower links	2173	* D: CopyArea pass - very useful for slower links
…		…
2430	else	2439	else
2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2440	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432		2441
2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2442	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434	{	2443	{
		2444	if (showcursor && focus && row == screen.cur.row
		2445	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2446	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2447	else
2435	#if ENABLE_FRILLS	2448	#if ENABLE_FRILLS
2436	if (ISSET_PIXCOLOR (Color_underline))	2449	if (ISSET_PIXCOLOR (Color_underline))
2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2450	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438	else	2451	else
2439	#endif	2452	#endif
…		…
2450	* G: cleanup cursor and display outline cursor if necessary	2463	* G: cleanup cursor and display outline cursor if necessary
2451	*/	2464	*/
2452	if (showcursor)	2465	if (showcursor)
2453	{	2466	{
2454	if (focus)	2467	if (focus)
2455	{	2468	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456	if (option (Opt_cursorUnderline))
2457	*crp ^= RS_Uline;
2458	else
2459	{
2460	*crp ^= RS_RVid;
2461	#ifndef NO_CURSORCOLOR
2462	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;
2463	#endif
2464	}
2465	}
2466	else if (oldcursor.row >= 0)	2469	else if (oldcursor.row >= 0)
2467	{	2470	{
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]);	2471	XSetForeground (dpy, gc, pix_colors[ccol1]);
2484		2472
2485	XDrawRectangle (dpy, vt, gc,	2473	XDrawRectangle (dpy, vt, gc,
2486	Col2Pixel (col),	2474	Col2Pixel (cur_col),
2487	Row2Pixel (oldcursor.row),	2475	Row2Pixel (oldcursor.row),
2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2476	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2489	(unsigned int) (Height2Pixel (1) - 1));	2477	(unsigned int) (Height2Pixel (1) - 1));
2490	}	2478	}
2491	}	2479	}
…		…
2533	void ecb_cold	2521	void ecb_cold
2534	rxvt_term::scr_recolour (bool refresh) NOTHROW	2522	rxvt_term::scr_recolour (bool refresh) NOTHROW
2535	{	2523	{
2536	bool transparent = false;	2524	bool transparent = false;
2537		2525
2538	#ifdef HAVE_BG_PIXMAP	2526	#ifdef HAVE_IMG
2539	if (bg_pixmap != None)	2527	if (bg_img != 0)
2540	{	2528	{
2541	# ifdef ENABLE_TRANSPARENCY	2529	# if ENABLE_TRANSPARENCY
2542	if (bg_flags & BG_IS_TRANSPARENT)	2530	if (bg_flags & BG_IS_TRANSPARENT)
2543	{	2531	{
2544	XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);	2532	XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);	2533	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546		2534
2547	transparent = true;	2535	transparent = true;
2548	}	2536	}
2549	else	2537	else
2550	# endif	2538	# endif
2551	{	2539	{
2552	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);	2540	XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);	2541	XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554	}	2542	}
2555	}	2543	}
2556	else	2544	else
2557	#endif	2545	#endif
2558	{	2546	{
…		…
2565	if (scrollBar.win)	2553	if (scrollBar.win)
2566	{	2554	{
2567	if (transparent)	2555	if (transparent)
2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2556	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569	else	2557	else
2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2558	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571	scrollBar.state = SB_STATE_IDLE;	2559	scrollBar.state = SB_STATE_IDLE;
2572	scrollBar.show (0);	2560	scrollBar.show (0);
2573	}	2561	}
2574		2562
2575	if (refresh)	2563	if (refresh)
…		…
2692	\|\| (check_more == 1	2680	\|\| (check_more == 1
2693	&& current_screen == selection.screen	2681	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2682	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2683	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696	CLEAR_ALL_SELECTION ();	2684	CLEAR_ALL_SELECTION ();
		2685	}
		2686
		2687	void
		2688	rxvt_term::selection_changed () NOTHROW
		2689	{
		2690	line_t &r1 = ROW (selection.beg.row);
		2691	while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
		2692	--selection.beg.col;
		2693
		2694	line_t &r2 = ROW (selection.end.row);
		2695	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2696	++selection.end.col;
		2697
		2698	want_refresh = 1;
2697	}	2699	}
2698		2700
2699	/* ------------------------------------------------------------------------- */	2701	/* ------------------------------------------------------------------------- */
2700	/*	2702	/*
2701	* Paste a selection direct to the command fd	2703	* Paste a selection direct to the command fd
…		…
3004	* Word select: select text for 2 clicks	3006	* Word select: select text for 2 clicks
3005	* We now only find out the boundary in one direction	3007	* We now only find out the boundary in one direction
3006	*/	3008	*/
3007		3009
3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3010	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009	#define DELIMIT_TEXT(x) \	3011	#define DELIMIT_TEXT(x) \
3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3012	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011	#define DELIMIT_REND(x) 1	3013	#define DELIMIT_REND(x) 1
3012		3014
3013	void ecb_cold	3015	void ecb_cold
3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3016	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3135	{	3137	{
3136	row_col_t pos;	3138	row_col_t pos;
3137	enum {	3139	enum {
3138	LEFT, RIGHT	3140	LEFT, RIGHT
3139	} closeto = RIGHT;	3141	} closeto = RIGHT;
3140
3141	want_refresh = 1;
3142		3142
3143	switch (selection.op)	3143	switch (selection.op)
3144	{	3144	{
3145	case SELECTION_INIT:	3145	case SELECTION_INIT:
3146	CLEAR_SELECTION ();	3146	CLEAR_SELECTION ();
…		…
3326		3326
3327	#if !ENABLE_MINIMAL	3327	#if !ENABLE_MINIMAL
3328	if (selection.rect && selection.beg.col > selection.end.col)	3328	if (selection.rect && selection.beg.col > selection.end.col)
3329	::swap (selection.beg.col, selection.end.col);	3329	::swap (selection.beg.col, selection.end.col);
3330	#endif	3330	#endif
		3331
		3332	selection_changed ();
3331	}	3333	}
3332		3334
3333	#if !ENABLE_MINIMAL	3335	#if !ENABLE_MINIMAL
3334	void ecb_cold	3336	void ecb_cold
3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3337	rxvt_term::selection_remove_trailing_spaces () NOTHROW
…		…
3532		3534
3533	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);	3535	XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534	}	3536	}
3535		3537
3536	/* ------------------------------------------------------------------------- */	3538	/* ------------------------------------------------------------------------- */
3537	#ifdef USE_XIM	3539	#if USE_XIM
3538	void ecb_cold	3540	void ecb_cold
3539	rxvt_term::im_set_position (XPoint &pos) NOTHROW	3541	rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540	{	3542	{
3541	XWindowAttributes xwa;	3543	XWindowAttributes xwa;
3542		3544

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.417 by root, Mon May 28 16:40:03 2012 UTC vs. Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.417 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC