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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

…		…
2	* File: screen.C	2	* File: screen.C
3	---------------------------------------------------------------------------	3	---------------------------------------------------------------------------
4	*	4	*
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	* Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7	*	8	*
8	* This program is free software; you can redistribute it and/or modify	9	* 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	10	* 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	11	* the Free Software Foundation; either version 3 of the License, or
11	* (at your option) any later version.	12	* (at your option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
…		…
150	l.r[col] = rend;	151	l.r[col] = rend;
151	col++;	152	col++;
152	} while (col < ncol && l.t[col] == NOCHAR);	153	} while (col < ncol && l.t[col] == NOCHAR);
153	}	154	}
154		155
		156	// set the rendition of a single wide character beginning at the given column
		157	void
		158	rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
		159	{
		160	do {
		161	l.r[col] = rend;
		162	col++;
		163	} while (col < ncol && l.t[col] == NOCHAR);
		164	}
		165
155	/* ------------------------------------------------------------------------- *	166	/* ------------------------------------------------------------------------- *
156	* SCREEN INITIALISATION *	167	* SCREEN INITIALISATION *
157	* ------------------------------------------------------------------------- */	168	* ------------------------------------------------------------------------- */
158		169
159	void	170	void
…		…
188	drawn_buf = (line_t *)chunk;	199	drawn_buf = (line_t *)chunk;
189	swap_buf = drawn_buf + nrow;	200	swap_buf = drawn_buf + nrow;
190	row_buf = swap_buf + nrow;	201	row_buf = swap_buf + nrow;
191	}	202	}
192		203
		204	void
		205	rxvt_term::copy_line (line_t &dst, line_t &src)
		206	{
		207	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
		208	dst.l = min (src.l, ncol);
		209	memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
		210	memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
		211	dst.f = src.f;
		212	}
		213
193	void ecb_cold	214	void ecb_cold
194	rxvt_term::scr_reset ()	215	rxvt_term::scr_reset ()
195	{	216	{
196	#if ENABLE_OVERLAY	217	#if ENABLE_OVERLAY
197	scr_overlay_off ();	218	scr_overlay_off ();
…		…
230	size_t prev_chunk_size = chunk_size;	251	size_t prev_chunk_size = chunk_size;
231	line_t *prev_drawn_buf = drawn_buf;	252	line_t *prev_drawn_buf = drawn_buf;
232	line_t *prev_swap_buf = swap_buf;	253	line_t *prev_swap_buf = swap_buf;
233	line_t *prev_row_buf = row_buf;	254	line_t *prev_row_buf = row_buf;
234		255
235	int common_col = min (prev_ncol, ncol);
236
237	scr_alloc ();	256	scr_alloc ();
238		257
239	if (!prev_row_buf)	258	if (!prev_row_buf)
240	{	259	{
241	/*
242	* first time called (or after scr_release) so just malloc everything: don't rely on realloc
243	*/
244	top_row = 0;	260	top_row = 0;
245	term_start = 0;	261	term_start = 0;
246		262
247	memset (charsets, 'B', sizeof (charsets));	263	memset (charsets, 'B', sizeof (charsets));
248	rstyle = DEFAULT_RSTYLE;	264	rstyle = DEFAULT_RSTYLE;
…		…
273	{	289	{
274	/*	290	/*
275	* add or delete rows as appropriate	291	* add or delete rows as appropriate
276	*/	292	*/
277		293
		294	int common_col = min (prev_ncol, ncol);
		295
278	for (int row = min (nrow, prev_nrow); row--; )	296	for (int row = min (nrow, prev_nrow); row--; )
279	{	297	{
280	scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	298	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);	299	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);	300	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);	301
286	memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);	302	copy_line (swap_buf [row], prev_swap_buf [row]);
287	}	303	}
288		304
289	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row	305	int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
290	int pend = MOD (term_start + top_row , prev_total_rows);	306	int pend = MOD (term_start + top_row , prev_total_rows);
291	int q = total_rows; // rewrapped row	307	int q = total_rows; // rewrapped row
…		…
386	for (int row = min (nrow, prev_nrow); row--; )	402	for (int row = min (nrow, prev_nrow); row--; )
387	{	403	{
388	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];	404	line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
389	line_t &dst = row_buf [row];	405	line_t &dst = row_buf [row];
390		406
391	scr_blank_screen_mem (dst, DEFAULT_RSTYLE);	407	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	}	408	}
396		409
397	for (int row = prev_nrow; row < nrow; row++)	410	for (int row = prev_nrow; row < nrow; row++)
398	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);	411	scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
399		412
…		…
409	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);	422	if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);	423	if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);	424	if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412	}	425	}
413		426
414	printf ("pc %p\n", prev_chunk);//D
415	chunk_free (prev_chunk, prev_chunk_size);	427	chunk_free (prev_chunk, prev_chunk_size);
416		428
417	free (tabs);	429	free (tabs);
418	tabs = (char *)rxvt_malloc (ncol);	430	tabs = (char *)rxvt_malloc (ncol);
419		431
…		…
603	* Change the colour for following text	615	* Change the colour for following text
604	*/	616	*/
605	void	617	void
606	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW	618	rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
607	{	619	{
608	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))	620	if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
609	color = fgbg;	621	color = fgbg;
610		622
611	if (fgbg == Color_fg)	623	if (fgbg == Color_fg)
612	rstyle = SET_FGCOLOR (rstyle, color);	624	rstyle = SET_FGCOLOR (rstyle, color);
613	else	625	else
…		…
704		716
705	// finally move the view window, if desired	717	// finally move the view window, if desired
706	if (option (Opt_scrollWithBuffer)	718	if (option (Opt_scrollWithBuffer)
707	&& view_start != 0	719	&& view_start != 0
708	&& view_start != -saveLines)	720	&& view_start != -saveLines)
709	scr_page (UP, count);	721	scr_page (count);
710		722
711	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))	723	if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
712	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));	724	HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
713	}	725	}
714	else	726	else
…		…
1000	}	1012	}
1001	else if (screen.cur.row > 0	1013	else if (screen.cur.row > 0
1002	&& ROW(screen.cur.row - 1).is_longer ())	1014	&& ROW(screen.cur.row - 1).is_longer ())
1003	{	1015	{
1004	linep = &ROW(screen.cur.row - 1);	1016	linep = &ROW(screen.cur.row - 1);
1005	tp = line->t + ncol - 1;	1017	tp = linep->t + ncol - 1;
1006	rp = line->r + ncol - 1;	1018	rp = linep->r + ncol - 1;
1007	}	1019	}
1008	else	1020	else
1009	continue;	1021	continue;
1010		1022
1011	linep->touch ();	1023	linep->touch ();
…		…
1229	* direction should be UP or DN	1241	* direction should be UP or DN
1230	*/	1242	*/
1231	void	1243	void
1232	rxvt_term::scr_index (enum page_dirn direction) NOTHROW	1244	rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1233	{	1245	{
1234	int dirn;
1235
1236	want_refresh = 1;	1246	want_refresh = 1;
1237	ZERO_SCROLLBACK ();	1247	ZERO_SCROLLBACK ();
1238		1248
1239	dirn = ((direction == UP) ? 1 : -1);
1240
1241	screen.flags &= ~Screen_WrapNext;	1249	screen.flags &= ~Screen_WrapNext;
1242		1250
1243	if ((screen.cur.row == screen.bscroll && direction == UP)	1251	if ((screen.cur.row == screen.bscroll && direction == UP)
1244	\|\| (screen.cur.row == screen.tscroll && direction == DN))	1252	\|\| (screen.cur.row == screen.tscroll && direction == DN))
1245	scr_scroll_text (screen.tscroll, screen.bscroll, dirn);	1253	scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1246	else	1254	else
1247	screen.cur.row += dirn;	1255	screen.cur.row += direction;
1248		1256
1249	clamp_it (screen.cur.row, 0, nrow - 1);	1257	clamp_it (screen.cur.row, 0, nrow - 1);
1250	selection_check (0);	1258	selection_check (0);
1251	}	1259	}
1252		1260
…		…
1706		1714
1707	if (rvideo_state != on)	1715	if (rvideo_state != on)
1708	{	1716	{
1709	rvideo_state = on;	1717	rvideo_state = on;
1710		1718
		1719	#if OFF_FOCUS_FADING
		1720	if (rs[Rs_fade])
		1721	{
		1722	::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
		1723	::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
		1724	}
		1725	else
		1726	#endif
1711	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1727	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712	#ifdef HAVE_BG_PIXMAP	1728	#ifdef HAVE_IMG
1713	if (bg_img == 0)	1729	if (bg_img == 0)
1714	#endif	1730	#endif
1715	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1731	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716		1732
1717	XGCValues gcvalue;	1733	XGCValues gcvalue;
…		…
1890	* the top of the screen	1906	* the top of the screen
1891	*/	1907	*/
1892	void	1908	void
1893	rxvt_term::scr_move_to (int y, int len) NOTHROW	1909	rxvt_term::scr_move_to (int y, int len) NOTHROW
1894	{	1910	{
1895	scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));	1911	// lerp (y, 0, len, top_row, nrow - 1)
		1912	scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1896	}	1913	}
1897		1914
1898	/* ------------------------------------------------------------------------- */	1915	/* ------------------------------------------------------------------------- */
1899	/*	1916	/*
1900	* Page the screen up/down nlines	1917	* Page the screen up/down nlines
1901	* direction should be UP or DN	1918	* direction should be UP or DN
1902	*/	1919	*/
1903	bool	1920	bool
1904	rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW	1921	rxvt_term::scr_page (int nlines) NOTHROW
1905	{	1922	{
1906	int new_view_start =
1907	direction == UP ? view_start - nlines
1908	: view_start + nlines;
1909
1910	return scr_changeview (new_view_start);	1923	return scr_changeview (view_start - nlines);
1911	}	1924	}
1912		1925
1913	bool	1926	bool
1914	rxvt_term::scr_changeview (int new_view_start) NOTHROW	1927	rxvt_term::scr_changeview (int new_view_start) NOTHROW
1915	{	1928	{
…		…
2033	rxvt_term::scr_refresh () NOTHROW	2046	rxvt_term::scr_refresh () NOTHROW
2034	{	2047	{
2035	int16_t col, row, /* column/row we're processing */	2048	int16_t col, row, /* column/row we're processing */
2036	ocrow; /* old cursor row */	2049	ocrow; /* old cursor row */
2037	int i; /* tmp */	2050	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 */	2051	rend_t ccol1, /* Cursor colour */
2043	ccol2; /* Cursor colour2 */	2052	ccol2; /* Cursor colour2 */
		2053	rend_t cur_rend;
		2054	int cur_col;
		2055	int cursorwidth;
2044		2056
2045	want_refresh = 0; /* screen is current */	2057	want_refresh = 0; /* screen is current */
2046		2058
2047	if (refresh_type == NO_REFRESH \|\| !mapped)	2059	if (refresh_type == NO_REFRESH \|\| !mapped)
2048	return;	2060	return;
…		…
2052	*/	2064	*/
2053	refresh_count = 0;	2065	refresh_count = 0;
2054		2066
2055	unsigned int old_screen_flags = screen.flags;	2067	unsigned int old_screen_flags = screen.flags;
2056	bool have_bg = 0;	2068	bool have_bg = 0;
2057	#ifdef HAVE_BG_PIXMAP	2069	#ifdef HAVE_IMG
2058	have_bg = bg_img != 0;	2070	have_bg = bg_img != 0;
2059	#endif	2071	#endif
2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2072	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061		2073
2062	/*	2074	/*
…		…
2073		2085
2074	/*	2086	/*
2075	* C: set the cursor character (s)	2087	* C: set the cursor character (s)
2076	*/	2088	*/
2077	{	2089	{
2078	bool setoldcursor;
2079
2080	#ifdef CURSOR_BLINK	2090	#ifdef CURSOR_BLINK
2081	if (hidden_cursor)	2091	if (hidden_cursor)
2082	showcursor = 0;	2092	showcursor = 0;
2083	#endif	2093	#endif
2084		2094
…		…
2087	int col = screen.cur.col;	2097	int col = screen.cur.col;
2088		2098
2089	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2099	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090	col--;	2100	col--;
2091		2101
		2102	cursorwidth = 1;
		2103	while (col + cursorwidth < ncol
		2104	&& ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
		2105	cursorwidth++;
		2106
2092	crp = &ROW(screen.cur.row).r[col];	2107	cur_rend = ROW(screen.cur.row).r[col];
		2108	cur_col = col;
2093		2109
2094	#ifndef NO_CURSORCOLOR	2110	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2111	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2112	ccol1 = Color_cursor;
2098	else	2113	else
2099	#endif	2114	#endif
2100	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2115	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2112	ccol2 = bgcolor_of (rstyle);	2127	ccol2 = bgcolor_of (rstyle);
2113	#else	2128	#else
2114	ccol2 = Color_bg;	2129	ccol2 = Color_bg;
2115	#endif	2130	#endif
2116		2131
2117	if (focus)	2132	if (focus && cursor_type == 0)
2118	{	2133	{
2119	if (option (Opt_cursorUnderline))	2134	rend_t rend = cur_rend;
2120	*crp ^= RS_Uline;	2135
2121	else
2122	{
2123	*crp ^= RS_RVid;	2136	rend ^= RS_RVid;
2124	crp = SET_FGCOLOR (crp, ccol1);	2137	rend = SET_FGCOLOR (rend, ccol1);
2125	crp = SET_BGCOLOR (crp, ccol2);	2138	rend = SET_BGCOLOR (rend, ccol2);
2126	}	2139
		2140	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127	}	2141	}
2128	}	2142	}
2129		2143
2130	/* make sure no outline cursor is left around */	2144	/* make sure no outline cursor is left around */
2131	setoldcursor = 0;	2145	if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2132	if (ocrow != -1)	2146	drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid \| RS_Uline);
		2147
		2148	// save the current cursor coordinates if the cursor is visible
		2149	// and either the window is unfocused or the cursor style is
		2150	// underline or vertical bar, so as to clear the outline cursor in
		2151	// the next refresh if the cursor moves or becomes invisible
		2152	if (showcursor && (!focus \|\| cursor_type != 0) && screen.cur.row - view_start < nrow)
2133	{	2153	{
2134	if (screen.cur.row - view_start != ocrow	2154	oldcursor.row = screen.cur.row - view_start;
2135	\|\| screen.cur.col != oldcursor.col)	2155	oldcursor.col = screen.cur.col;
2136	{
2137	if (ocrow < nrow
2138	&& oldcursor.col < ncol)
2139	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	}
2146	}	2156	}
2147	else if (!focus)	2157	else
2148	setoldcursor = 1;
2149
2150	if (setoldcursor)
2151	{
2152	if (screen.cur.row - view_start >= nrow)
2153	oldcursor.row = -1;	2158	oldcursor.row = -1;
2154	else
2155	{
2156	oldcursor.row = screen.cur.row - view_start;
2157	oldcursor.col = screen.cur.col;
2158	}
2159	}
2160	}	2159	}
2161		2160
2162	#ifndef NO_SLOW_LINK_SUPPORT	2161	#ifndef NO_SLOW_LINK_SUPPORT
2163	/*	2162	/*
2164	* D: CopyArea pass - very useful for slower links	2163	* D: CopyArea pass - very useful for slower links
…		…
2245	int ypixel = (int)Row2Pixel (row);	2244	int ypixel = (int)Row2Pixel (row);
2246		2245
2247	for (col = 0; col < ncol; col++)	2246	for (col = 0; col < ncol; col++)
2248	{	2247	{
2249	/* compare new text with old - if exactly the same then continue */	2248	/* compare new text with old - if exactly the same then continue */
2250	if (stp[col] == dtp[col] /* Must match characters to skip. */	2249	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;	2250	continue;
2255		2251
2256	// redraw one or more characters	2252	// redraw one or more characters
2257		2253
2258	// seek to the beginning of wide characters	2254	// seek to the beginning of wide characters
…		…
2430	else	2426	else
2431	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);	2427	font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432		2428
2433	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))	2429	if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434	{	2430	{
		2431	if (showcursor && focus && row == screen.cur.row
		2432	&& IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
		2433	XSetForeground (dpy, gc, pix_colors[ccol1]);
		2434	else
2435	#if ENABLE_FRILLS	2435	#if ENABLE_FRILLS
2436	if (ISSET_PIXCOLOR (Color_underline))	2436	if (ISSET_PIXCOLOR (Color_underline))
2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);	2437	XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438	else	2438	else
2439	#endif	2439	#endif
…		…
2451	*/	2451	*/
2452	if (showcursor)	2452	if (showcursor)
2453	{	2453	{
2454	if (focus)	2454	if (focus)
2455	{	2455	{
2456	if (option (Opt_cursorUnderline))	2456	if (cursor_type == 0)
2457	*crp ^= RS_Uline;	2457	scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458	else	2458	else if (oldcursor.row >= 0)
2459	{	2459	{
2460	*crp ^= RS_RVid;	2460	XSetForeground (dpy, gc, pix_colors[ccol1]);
2461	#ifndef NO_CURSORCOLOR	2461	if (cursor_type == 1)
2462	crp = (crp & ~ (RS_fgMask \| RS_bgMask)) \| cc1;	2462	XFillRectangle (dpy, vt, gc,
2463	#endif	2463	Col2Pixel (cur_col),
		2464	Row2Pixel (oldcursor.row + 1) - 2,
		2465	Width2Pixel (1),
		2466	2);
		2467	else
		2468	XFillRectangle (dpy, vt, gc,
		2469	Col2Pixel (cur_col),
		2470	Row2Pixel (oldcursor.row),
		2471	2,
		2472	Height2Pixel (1));
2464	}	2473	}
2465	}	2474	}
2466	else if (oldcursor.row >= 0)	2475	else if (oldcursor.row >= 0)
2467	{	2476	{
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]);	2477	XSetForeground (dpy, gc, pix_colors[ccol1]);
2484		2478
2485	XDrawRectangle (dpy, vt, gc,	2479	XDrawRectangle (dpy, vt, gc,
2486	Col2Pixel (col),	2480	Col2Pixel (cur_col),
2487	Row2Pixel (oldcursor.row),	2481	Row2Pixel (oldcursor.row),
2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2482	(unsigned int) (Width2Pixel (cursorwidth) - 1),
2489	(unsigned int) (Height2Pixel (1) - 1));	2483	(unsigned int) (Height2Pixel (1) - 1));
2490	}	2484	}
2491	}	2485	}
…		…
2529	scr_remap_chars (swap_buf [i]);	2523	scr_remap_chars (swap_buf [i]);
2530	}	2524	}
2531	}	2525	}
2532		2526
2533	void ecb_cold	2527	void ecb_cold
2534	rxvt_term::scr_recolour (bool refresh) NOTHROW	2528	rxvt_term::scr_recolor (bool refresh) NOTHROW
2535	{	2529	{
2536	bool transparent = false;	2530	bool transparent = false;
2537		2531
2538	#ifdef HAVE_BG_PIXMAP	2532	#ifdef HAVE_IMG
2539	if (bg_img != 0)	2533	if (bg_img != 0)
2540	{	2534	{
2541	# if ENABLE_TRANSPARENCY	2535	# if ENABLE_TRANSPARENCY
2542	if (bg_flags & BG_IS_TRANSPARENT)	2536	if (bg_flags & BG_IS_TRANSPARENT)
2543	{	2537	{
…		…
2560	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	2554	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561	}	2555	}
2562		2556
2563	XClearWindow (dpy, parent);	2557	XClearWindow (dpy, parent);
2564		2558
2565	if (scrollBar.win)	2559	if (scrollBar.state && scrollBar.win)
2566	{	2560	{
2567	if (transparent)	2561	if (transparent)
2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2562	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569	else	2563	else
2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2564	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571	scrollBar.state = SB_STATE_IDLE;	2565	scrollBar.state = SB_STATE_IDLE;
2572	scrollBar.show (0);	2566	scrollBar.show (0);
2573	}	2567	}
2574		2568
2575	if (refresh)	2569	if (refresh)
…		…
2692	\|\| (check_more == 1	2686	\|\| (check_more == 1
2693	&& current_screen == selection.screen	2687	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2688	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2689	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696	CLEAR_ALL_SELECTION ();	2690	CLEAR_ALL_SELECTION ();
		2691	}
		2692
		2693	void
		2694	rxvt_term::selection_changed () NOTHROW
		2695	{
		2696	line_t &r1 = ROW (selection.beg.row);
		2697	while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
		2698	++selection.beg.col;
		2699
		2700	line_t &r2 = ROW (selection.end.row);
		2701	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2702	++selection.end.col;
		2703
		2704	want_refresh = 1;
2697	}	2705	}
2698		2706
2699	/* ------------------------------------------------------------------------- */	2707	/* ------------------------------------------------------------------------- */
2700	/*	2708	/*
2701	* Paste a selection direct to the command fd	2709	* Paste a selection direct to the command fd
…		…
3004	* Word select: select text for 2 clicks	3012	* Word select: select text for 2 clicks
3005	* We now only find out the boundary in one direction	3013	* We now only find out the boundary in one direction
3006	*/	3014	*/
3007		3015
3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3016	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009	#define DELIMIT_TEXT(x) \	3017	#define DELIMIT_TEXT(x) \
3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3018	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011	#define DELIMIT_REND(x) 1	3019	#define DELIMIT_REND(x) 1
3012		3020
3013	void ecb_cold	3021	void ecb_cold
3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3022	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3135	{	3143	{
3136	row_col_t pos;	3144	row_col_t pos;
3137	enum {	3145	enum {
3138	LEFT, RIGHT	3146	LEFT, RIGHT
3139	} closeto = RIGHT;	3147	} closeto = RIGHT;
3140
3141	want_refresh = 1;
3142		3148
3143	switch (selection.op)	3149	switch (selection.op)
3144	{	3150	{
3145	case SELECTION_INIT:	3151	case SELECTION_INIT:
3146	CLEAR_SELECTION ();	3152	CLEAR_SELECTION ();
…		…
3326		3332
3327	#if !ENABLE_MINIMAL	3333	#if !ENABLE_MINIMAL
3328	if (selection.rect && selection.beg.col > selection.end.col)	3334	if (selection.rect && selection.beg.col > selection.end.col)
3329	::swap (selection.beg.col, selection.end.col);	3335	::swap (selection.beg.col, selection.end.col);
3330	#endif	3336	#endif
		3337
		3338	selection_changed ();
3331	}	3339	}
3332		3340
3333	#if !ENABLE_MINIMAL	3341	#if !ENABLE_MINIMAL
3334	void ecb_cold	3342	void ecb_cold
3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3343	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.424 by root, Fri Jun 29 22:10:09 2012 UTC vs. Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC vs.
Revision 1.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC