[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.437 by sf-exg, Mon Mar 25 12:28:04 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
…		…
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
…		…
409	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);
410	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);
411	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);
412	}	424	}
413		425
414	printf ("pc %p\n", prev_chunk);//D
415	chunk_free (prev_chunk, prev_chunk_size);	426	chunk_free (prev_chunk, prev_chunk_size);
416		427
417	free (tabs);	428	free (tabs);
418	tabs = (char *)rxvt_malloc (ncol);	429	tabs = (char *)rxvt_malloc (ncol);
419		430
…		…
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_img == 0)	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;
…		…
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;
2044		2053
2045	want_refresh = 0; /* screen is current */	2054	want_refresh = 0; /* screen is current */
2046		2055
2047	if (refresh_type == NO_REFRESH \|\| !mapped)	2056	if (refresh_type == NO_REFRESH \|\| !mapped)
2048	return;	2057	return;
…		…
2052	*/	2061	*/
2053	refresh_count = 0;	2062	refresh_count = 0;
2054		2063
2055	unsigned int old_screen_flags = screen.flags;	2064	unsigned int old_screen_flags = screen.flags;
2056	bool have_bg = 0;	2065	bool have_bg = 0;
2057	#ifdef HAVE_BG_PIXMAP	2066	#ifdef HAVE_IMG
2058	have_bg = bg_img != 0;	2067	have_bg = bg_img != 0;
2059	#endif	2068	#endif
2060	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2069	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061		2070
2062	/*	2071	/*
…		…
2087	int col = screen.cur.col;	2096	int col = screen.cur.col;
2088		2097
2089	while (col && ROW(screen.cur.row).t[col] == NOCHAR)	2098	while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090	col--;	2099	col--;
2091		2100
2092	crp = &ROW(screen.cur.row).r[col];	2101	cur_rend = ROW(screen.cur.row).r[col];
		2102	cur_col = col;
2093		2103
2094	#ifndef NO_CURSORCOLOR	2104	#ifndef NO_CURSORCOLOR
2095	cc1 = *crp & (RS_fgMask \| RS_bgMask);
2096	if (ISSET_PIXCOLOR (Color_cursor))	2105	if (ISSET_PIXCOLOR (Color_cursor))
2097	ccol1 = Color_cursor;	2106	ccol1 = Color_cursor;
2098	else	2107	else
2099	#endif	2108	#endif
2100	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR	2109	#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
…		…
2114	ccol2 = Color_bg;	2123	ccol2 = Color_bg;
2115	#endif	2124	#endif
2116		2125
2117	if (focus)	2126	if (focus)
2118	{	2127	{
		2128	rend_t rend = cur_rend;
		2129
2119	if (option (Opt_cursorUnderline))	2130	if (option (Opt_cursorUnderline))
2120	*crp ^= RS_Uline;	2131	rend ^= RS_Uline;
2121	else	2132	else
2122	{	2133	{
2123	*crp ^= RS_RVid;	2134	rend ^= RS_RVid;
2124	crp = SET_FGCOLOR (crp, ccol1);	2135	rend = SET_FGCOLOR (rend, ccol1);
2125	crp = SET_BGCOLOR (crp, ccol2);	2136	rend = SET_BGCOLOR (rend, ccol2);
2126	}	2137	}
		2138
		2139	scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127	}	2140	}
2128	}	2141	}
2129		2142
2130	/* make sure no outline cursor is left around */	2143	/* make sure no outline cursor is left around */
2131	setoldcursor = 0;	2144	setoldcursor = 0;
…		…
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;	2471	int cursorwidth = 1;
2469	int col = oldcursor.col;	2472	int col = oldcursor.col;
2470		2473
…		…
2473		2476
2474	while (col + cursorwidth < ncol	2477	while (col + cursorwidth < ncol
2475	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)	2478	&& drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2476	cursorwidth++;	2479	cursorwidth++;
2477		2480
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]);	2481	XSetForeground (dpy, gc, pix_colors[ccol1]);
2484		2482
2485	XDrawRectangle (dpy, vt, gc,	2483	XDrawRectangle (dpy, vt, gc,
2486	Col2Pixel (col),	2484	Col2Pixel (col),
2487	Row2Pixel (oldcursor.row),	2485	Row2Pixel (oldcursor.row),
2488	(unsigned int) (Width2Pixel (cursorwidth) - 1),	2486	(unsigned int) (Width2Pixel (cursorwidth) - 1),
…		…
2533	void ecb_cold	2531	void ecb_cold
2534	rxvt_term::scr_recolour (bool refresh) NOTHROW	2532	rxvt_term::scr_recolour (bool refresh) NOTHROW
2535	{	2533	{
2536	bool transparent = false;	2534	bool transparent = false;
2537		2535
2538	#ifdef HAVE_BG_PIXMAP	2536	#ifdef HAVE_IMG
2539	if (bg_img != 0)	2537	if (bg_img != 0)
2540	{	2538	{
2541	# if ENABLE_TRANSPARENCY	2539	# if ENABLE_TRANSPARENCY
2542	if (bg_flags & BG_IS_TRANSPARENT)	2540	if (bg_flags & BG_IS_TRANSPARENT)
2543	{	2541	{
…		…
2565	if (scrollBar.win)	2563	if (scrollBar.win)
2566	{	2564	{
2567	if (transparent)	2565	if (transparent)
2568	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);	2566	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569	else	2567	else
2570	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2568	XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571	scrollBar.state = SB_STATE_IDLE;	2569	scrollBar.state = SB_STATE_IDLE;
2572	scrollBar.show (0);	2570	scrollBar.show (0);
2573	}	2571	}
2574		2572
2575	if (refresh)	2573	if (refresh)
…		…
2692	\|\| (check_more == 1	2690	\|\| (check_more == 1
2693	&& current_screen == selection.screen	2691	&& current_screen == selection.screen
2694	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)	2692	&& !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))	2693	&& ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696	CLEAR_ALL_SELECTION ();	2694	CLEAR_ALL_SELECTION ();
		2695	}
		2696
		2697	void
		2698	rxvt_term::selection_changed () NOTHROW
		2699	{
		2700	line_t &r1 = ROW (selection.beg.row);
		2701	while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
		2702	--selection.beg.col;
		2703
		2704	line_t &r2 = ROW (selection.end.row);
		2705	while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
		2706	++selection.end.col;
		2707
		2708	want_refresh = 1;
2697	}	2709	}
2698		2710
2699	/* ------------------------------------------------------------------------- */	2711	/* ------------------------------------------------------------------------- */
2700	/*	2712	/*
2701	* Paste a selection direct to the command fd	2713	* Paste a selection direct to the command fd
…		…
3004	* Word select: select text for 2 clicks	3016	* Word select: select text for 2 clicks
3005	* We now only find out the boundary in one direction	3017	* We now only find out the boundary in one direction
3006	*/	3018	*/
3007		3019
3008	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */	3020	/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009	#define DELIMIT_TEXT(x) \	3021	#define DELIMIT_TEXT(x) \
3010	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))	3022	(unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011	#define DELIMIT_REND(x) 1	3023	#define DELIMIT_REND(x) 1
3012		3024
3013	void ecb_cold	3025	void ecb_cold
3014	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW	3026	rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t mark, row_col_t ret) NOTHROW
…		…
3135	{	3147	{
3136	row_col_t pos;	3148	row_col_t pos;
3137	enum {	3149	enum {
3138	LEFT, RIGHT	3150	LEFT, RIGHT
3139	} closeto = RIGHT;	3151	} closeto = RIGHT;
3140
3141	want_refresh = 1;
3142		3152
3143	switch (selection.op)	3153	switch (selection.op)
3144	{	3154	{
3145	case SELECTION_INIT:	3155	case SELECTION_INIT:
3146	CLEAR_SELECTION ();	3156	CLEAR_SELECTION ();
…		…
3326		3336
3327	#if !ENABLE_MINIMAL	3337	#if !ENABLE_MINIMAL
3328	if (selection.rect && selection.beg.col > selection.end.col)	3338	if (selection.rect && selection.beg.col > selection.end.col)
3329	::swap (selection.beg.col, selection.end.col);	3339	::swap (selection.beg.col, selection.end.col);
3330	#endif	3340	#endif
		3341
		3342	selection_changed ();
3331	}	3343	}
3332		3344
3333	#if !ENABLE_MINIMAL	3345	#if !ENABLE_MINIMAL
3334	void ecb_cold	3346	void ecb_cold
3335	rxvt_term::selection_remove_trailing_spaces () NOTHROW	3347	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.437 by sf-exg, Mon Mar 25 12:28:04 2013 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.437 by sf-exg, Mon Mar 25 12:28:04 2013 UTC