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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.366 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

…		…
144	col--;	144	col--;
145		145
146	rend_t rend = l.r[col] & ~RS_baseattrMask;	146	rend_t rend = l.r[col] & ~RS_baseattrMask;
147	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));	147	rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148		148
		149	l.touch ();
		150
149	// found start, nuke	151	// found start, nuke
150	do {	152	do {
151	l.t[col] = ' ';	153	l.t[col] = ' ';
152	l.r[col] = rend;	154	l.r[col] = rend;
153	col++;	155	col++;
…		…
398	}	400	}
399		401
400	free (tabs);	402	free (tabs);
401	tabs = (char *)rxvt_malloc (ncol);	403	tabs = (char *)rxvt_malloc (ncol);
402		404
403	for (int col = ncol; --col; )	405	for (int col = ncol; col--; )
404	tabs [col] = col % TABSIZE == 0;	406	tabs [col] = col % TABSIZE == 0;
405		407
406	CLEAR_ALL_SELECTION ();	408	CLEAR_ALL_SELECTION ();
407		409
408	prev_nrow = nrow;	410	prev_nrow = nrow;
…		…
898	# else	900	# else
899	c = 0xfffd;	901	c = 0xfffd;
900	# endif	902	# endif
901	#endif	903	#endif
902		904
903	// nuke the character at this position, if required
904	if (expect_false (
905	line->t[screen.cur.col] == NOCHAR
906	\|\| (screen.cur.col < ncol - 1
907	&& line->t[screen.cur.col + 1] == NOCHAR)
908	))
909	scr_kill_char (*line, screen.cur.col);
910
911	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));	905	rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912		906
913	// if the character doesn't fit into the remaining columns...	907	// if the character doesn't fit into the remaining columns...
914	if (expect_false (screen.cur.col > ncol - width && ncol >= width))	908	if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915	{	909	{
…		…
922	}	916	}
923	else	917	else
924	screen.cur.col = ncol - width;	918	screen.cur.col = ncol - width;
925	}	919	}
926		920
		921	// nuke the character at this position, if required
		922	// due to wonderful coincidences everywhere else in this loop
		923	// we never have to check for overwriting a wide char itself,
		924	// only its tail.
		925	if (expect_false (line->t[screen.cur.col] == NOCHAR))
		926	scr_kill_char (*line, screen.cur.col);
		927
927	line->touch ();	928	line->touch ();
928		929
929	do	930	do
930	{	931	{
931	line->t[screen.cur.col] = c;	932	line->t[screen.cur.col] = c;
…		…
936	else	937	else
937	{	938	{
938	line->l = ncol;	939	line->l = ncol;
939	if (screen.flags & Screen_Autowrap)	940	if (screen.flags & Screen_Autowrap)
940	screen.flags \|= Screen_WrapNext;	941	screen.flags \|= Screen_WrapNext;
941	break;	942
		943	goto end_of_line;
942	}	944	}
943		945
944	c = NOCHAR;	946	c = NOCHAR;
945	}	947	}
946	while (expect_false (--width > 0));	948	while (expect_false (--width > 0));
947		949
948	// pad with spaces when overwriting wide character with smaller one	950	// pad with spaces when overwriting wide character with smaller one
949	if (expect_false (!width))	951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950	{	952	{
951	line->touch ();
952
953	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954	{
955	line->t[c] = ' ';	953	line->t[c] = ' ';
956	line->r[c] = rend;	954	line->r[c] = rend;
957	}
958	}	955	}
		956
		957	end_of_line:
		958	;
959	}	959	}
960	#if ENABLE_COMBINING	960	#if ENABLE_COMBINING
961	else // width == 0	961	else // width == 0
962	{	962	{
963	if (c != 0xfeff) // ignore BOM	963	if (c != 0xfeff) // ignore BOM
…		…
1026		1026
1027	want_refresh = 1;	1027	want_refresh = 1;
1028	#endif	1028	#endif
1029	}	1029	}
1030	}	1030	}
1031	#ifdef TERMCAP_HAS_BW
1032	else if (screen.flags & Screen_WrapNext)	1031	else if (screen.flags & Screen_WrapNext)
1033	screen.flags &= ~Screen_WrapNext;	1032	screen.flags &= ~Screen_WrapNext;
1034	#endif
1035	else	1033	else
1036	scr_gotorc (0, -1, RELATIVE);	1034	scr_gotorc (0, -1, RELATIVE);
1037	}	1035	}
1038		1036
1039	/* ------------------------------------------------------------------------- */	1037	/* ------------------------------------------------------------------------- */
…		…
1687	{	1685	{
1688	rvideo_state = on;	1686	rvideo_state = on;
1689		1687
1690	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);	1688	::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691	#ifdef HAVE_BG_PIXMAP	1689	#ifdef HAVE_BG_PIXMAP
1692	if (bgPixmap.pixmap == None)	1690	if (bg_pixmap == None)
1693	#endif	1691	#endif
1694	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);	1692	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695		1693
1696	XGCValues gcvalue;	1694	XGCValues gcvalue;
1697	gcvalue.foreground = pix_colors[Color_fg];	1695	gcvalue.foreground = pix_colors[Color_fg];
…		…
2033	refresh_count = 0;	2031	refresh_count = 0;
2034		2032
2035	unsigned int old_screen_flags = screen.flags;	2033	unsigned int old_screen_flags = screen.flags;
2036	char have_bg = 0;	2034	char have_bg = 0;
2037	#ifdef HAVE_BG_PIXMAP	2035	#ifdef HAVE_BG_PIXMAP
2038	have_bg = bgPixmap.pixmap != None;	2036	have_bg = bg_pixmap != None;
2039	#endif	2037	#endif
2040	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */	2038	ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041		2039
2042	/*	2040	/*
2043	* B: reverse any characters which are selected	2041	* B: reverse any characters which are selected
…		…
2510	scr_remap_chars (swap_buf [i]);	2508	scr_remap_chars (swap_buf [i]);
2511	}	2509	}
2512	}	2510	}
2513		2511
2514	void	2512	void
2515	rxvt_term::scr_recolour () NOTHROW	2513	rxvt_term::scr_recolour (bool refresh) NOTHROW
2516	{	2514	{
		2515	bool transparent = false;
		2516
2517	#ifdef HAVE_BG_PIXMAP	2517	#ifdef HAVE_BG_PIXMAP
2518	bgPixmap.apply ();	2518	if (bg_pixmap != None)
2519	#else	2519	{
		2520	# ifdef ENABLE_TRANSPARENCY
		2521	if (bg_flags & BG_IS_TRANSPARENT)
		2522	{
		2523	XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
		2524	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2520		2525
		2526	transparent = true;
		2527	}
		2528	else
		2529	# endif
		2530	{
		2531	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
		2532	XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
		2533	}
		2534	}
		2535	else
		2536	#endif
		2537	{
2521	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);	2538	XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
		2539	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
		2540	}
		2541
2522	XClearWindow (dpy, parent[0]);	2542	XClearWindow (dpy, parent[0]);
2523	XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2524		2543
2525	if (scrollBar.win)	2544	if (scrollBar.win)
2526	{	2545	{
		2546	if (transparent)
		2547	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
		2548	else
2527	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);	2549	XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2528	scrollBar.state = STATE_IDLE;	2550	scrollBar.state = STATE_IDLE;
2529	scrollBar.show (0);	2551	scrollBar.show (0);
2530	}	2552	}
2531		2553
2532	#endif	2554	if (refresh)
2533		2555	{
2534	/* bgPixmap.apply () does not do the following : */
2535	scr_clear ();	2556	scr_clear ();
2536	scr_touch (true);	2557	scr_touch (true);
		2558	}
2537	want_refresh = 1;	2559	want_refresh = 1;
2538	}	2560	}
2539		2561
2540	/* ------------------------------------------------------------------------- */	2562	/* ------------------------------------------------------------------------- */
2541	void	2563	void
…		…
2629	void	2651	void
2630	rxvt_term::scr_dump (int fd) NOTHROW	2652	rxvt_term::scr_dump (int fd) NOTHROW
2631	{	2653	{
2632	int row, wrote;	2654	int row, wrote;
2633	unsigned int width, towrite;	2655	unsigned int width, towrite;
2634	char r1[] = "\n";	2656	const char r1[] = "\n";
2635		2657
2636	for (row = saveLines + top_row;	2658	for (row = saveLines + top_row;
2637	row < saveLines + nrow - 1; row++)	2659	row < saveLines + nrow - 1; row++)
2638	{	2660	{
2639	width = row_buf[row].l >= 0 ? row_buf[row].l	2661	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2774	&ct2.nitems, &bytes_after,	2796	&ct2.nitems, &bytes_after,
2775	&ct2.value) != Success)	2797	&ct2.value) != Success)
2776	goto bailout;	2798	goto bailout;
2777		2799
2778	// realloc should be compatible to XFree, here, and elsewhere, too	2800	// realloc should be compatible to XFree, here, and elsewhere, too
2779	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);	2801	ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2780	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);	2802	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2781	ct.nitems += ct2.nitems;	2803	ct.nitems += ct2.nitems;
2782		2804
2783	XFree (ct2.value);	2805	XFree (ct2.value);
2784	}	2806	}
…		…
2833	incr_ev.start (10);	2855	incr_ev.start (10);
2834		2856
2835	while (incr_buf_fill + ct.nitems > incr_buf_size)	2857	while (incr_buf_fill + ct.nitems > incr_buf_size)
2836	{	2858	{
2837	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2859	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2838	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2860	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2839	}	2861	}
2840		2862
2841	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2863	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2842	incr_buf_fill += ct.nitems;	2864	incr_buf_fill += ct.nitems;
2843		2865
…		…
3000	* EXT: button 1 or 3 release	3022	* EXT: button 1 or 3 release
3001	*/	3023	*/
3002	void	3024	void
3003	rxvt_term::selection_make (Time tm)	3025	rxvt_term::selection_make (Time tm)
3004	{	3026	{
3005	int i;	3027	int size;
3006	wchar_t *new_selection_text;	3028	wchar_t *new_selection_text;
3007	text_t *t;	3029	text_t *t;
3008		3030
3009	switch (selection.op)	3031	switch (selection.op)
3010	{	3032	{
…		…
3026	return; /* nothing selected, go away */	3048	return; /* nothing selected, go away */
3027		3049
3028	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3050	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3029	return;	3051	return;
3030		3052
3031	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3053	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032	new_selection_text = (wchar_t )rxvt_malloc ((i + 4) sizeof (wchar_t));	3054	new_selection_text = (wchar_t )rxvt_malloc ((size + 4) sizeof (wchar_t));
3033		3055
3034	int ofs = 0;	3056	int ofs = 0;
3035	int extra = 0;	3057	int extra = 0;
3036		3058
3037	int col = selection.beg.col;	3059	int col = selection.beg.col;
…		…
3043	{	3065	{
3044	#if !ENABLE_MINIMAL	3066	#if !ENABLE_MINIMAL
3045	if (selection.rect)	3067	if (selection.rect)
3046	{	3068	{
3047	col = selection.beg.col;	3069	col = selection.beg.col;
3048	end_col = ncol + 1;	3070	end_col = selection.end.col;
3049	}	3071	}
3050	else	3072	else
3051	#endif	3073	#endif
3052	end_col = ROW(row).l;	3074	end_col = ROW(row).l;
3053		3075
3054	col = max (col, 0);	3076	col = max (col, 0);
3055		3077
3056	if (row == selection.end.row	3078	if (row == selection.end.row)
3057	#if !ENABLE_MINIMAL
3058	\|\| selection.rect
3059	#endif
3060	)
3061	min_it (end_col, selection.end.col);	3079	min_it (end_col, selection.end.col);
3062		3080
3063	t = ROW(row).t + col;	3081	t = ROW(row).t + col;
3064		3082
3065	for (; col < end_col; col++)	3083	for (; col < end_col; col++)
…		…
3073		3091
3074	extra -= (len - 1);	3092	extra -= (len - 1);
3075		3093
3076	if (extra < 0)	3094	if (extra < 0)
3077	{	3095	{
3078	extra += i;	3096	extra += size;
3079	i += i;	3097	size += size;
3080	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3098	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3081	}	3099	}
3082		3100
3083	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3101	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084	}	3102	}
3085	#endif	3103	#endif
…		…
3097		3115
3098	new_selection_text[ofs++] = C0_LF;	3116	new_selection_text[ofs++] = C0_LF;
3099	}	3117	}
3100	else	3118	else
3101	#endif	3119	#endif
3102	if (!ROW(row).is_longer () && row != selection.end.row)	3120	if (!ROW(row).is_longer ()
		3121	&& (row != selection.end.row \|\| end_col != selection.end.col)
		3122	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3103	new_selection_text[ofs++] = C0_LF;	3123	new_selection_text[ofs++] = C0_LF;
3104	}	3124	}
3105
3106	if (end_col != selection.end.col)
3107	new_selection_text[ofs++] = C0_LF;
3108		3125
3109	new_selection_text[ofs] = 0;	3126	new_selection_text[ofs] = 0;
3110		3127
3111	if (ofs == 0)	3128	if (ofs == 0)
3112	{	3129	{

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC vs. Revision 1.366 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.366 by sf-exg, Fri Jan 28 00:08:58 2011 UTC