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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 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	{
		910	if (screen.flags & Screen_Autowrap)
		911	{
916	// ... artificially enlargen the previous one	912	// ... artificially enlargen the previous one
917	c = NOCHAR;	913	c = NOCHAR;
918	// and try the same character next loop iteration	914	// and try the same character next loop iteration
919	--str;	915	--str;
		916	}
		917	else
		918	screen.cur.col = ncol - width;
920	}	919	}
		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);
921		927
922	line->touch ();	928	line->touch ();
923		929
924	do	930	do
925	{	931	{
…		…
931	else	937	else
932	{	938	{
933	line->l = ncol;	939	line->l = ncol;
934	if (screen.flags & Screen_Autowrap)	940	if (screen.flags & Screen_Autowrap)
935	screen.flags \|= Screen_WrapNext;	941	screen.flags \|= Screen_WrapNext;
936	break;	942
		943	goto end_of_line;
937	}	944	}
938		945
939	c = NOCHAR;	946	c = NOCHAR;
940	}	947	}
941	while (expect_false (--width > 0));	948	while (expect_false (--width > 0));
942		949
943	// pad with spaces when overwriting wide character with smaller one	950	// pad with spaces when overwriting wide character with smaller one
944	if (expect_false (!width))	951	for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945	{	952	{
946	line->touch ();
947
948	for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949	{
950	line->t[c] = ' ';	953	line->t[c] = ' ';
951	line->r[c] = rend;	954	line->r[c] = rend;
952	}
953	}	955	}
		956
		957	end_of_line:
		958	;
954	}	959	}
955	#if ENABLE_COMBINING	960	#if ENABLE_COMBINING
956	else // width == 0	961	else // width == 0
957	{	962	{
958	if (c != 0xfeff) // ignore BOM	963	if (c != 0xfeff) // ignore BOM
…		…
1021		1026
1022	want_refresh = 1;	1027	want_refresh = 1;
1023	#endif	1028	#endif
1024	}	1029	}
1025	}	1030	}
		1031	else if (screen.flags & Screen_WrapNext)
		1032	screen.flags &= ~Screen_WrapNext;
1026	else	1033	else
1027	scr_gotorc (0, -1, RELATIVE);	1034	scr_gotorc (0, -1, RELATIVE);
1028	}	1035	}
1029		1036
1030	/* ------------------------------------------------------------------------- */	1037	/* ------------------------------------------------------------------------- */
…		…
2620	void	2627	void
2621	rxvt_term::scr_dump (int fd) NOTHROW	2628	rxvt_term::scr_dump (int fd) NOTHROW
2622	{	2629	{
2623	int row, wrote;	2630	int row, wrote;
2624	unsigned int width, towrite;	2631	unsigned int width, towrite;
2625	char r1[] = "\n";	2632	const char r1[] = "\n";
2626		2633
2627	for (row = saveLines + top_row;	2634	for (row = saveLines + top_row;
2628	row < saveLines + nrow - 1; row++)	2635	row < saveLines + nrow - 1; row++)
2629	{	2636	{
2630	width = row_buf[row].l >= 0 ? row_buf[row].l	2637	width = row_buf[row].l >= 0 ? row_buf[row].l
…		…
2765	&ct2.nitems, &bytes_after,	2772	&ct2.nitems, &bytes_after,
2766	&ct2.value) != Success)	2773	&ct2.value) != Success)
2767	goto bailout;	2774	goto bailout;
2768		2775
2769	// realloc should be compatible to XFree, here, and elsewhere, too	2776	// realloc should be compatible to XFree, here, and elsewhere, too
2770	ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);	2777	ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);	2778	memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772	ct.nitems += ct2.nitems;	2779	ct.nitems += ct2.nitems;
2773		2780
2774	XFree (ct2.value);	2781	XFree (ct2.value);
2775	}	2782	}
…		…
2824	incr_ev.start (10);	2831	incr_ev.start (10);
2825		2832
2826	while (incr_buf_fill + ct.nitems > incr_buf_size)	2833	while (incr_buf_fill + ct.nitems > incr_buf_size)
2827	{	2834	{
2828	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;	2835	incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829	incr_buf = (char *)realloc (incr_buf, incr_buf_size);	2836	incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2830	}	2837	}
2831		2838
2832	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);	2839	memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833	incr_buf_fill += ct.nitems;	2840	incr_buf_fill += ct.nitems;
2834		2841
…		…
2991	* EXT: button 1 or 3 release	2998	* EXT: button 1 or 3 release
2992	*/	2999	*/
2993	void	3000	void
2994	rxvt_term::selection_make (Time tm)	3001	rxvt_term::selection_make (Time tm)
2995	{	3002	{
2996	int i;	3003	int size;
2997	wchar_t *new_selection_text;	3004	wchar_t *new_selection_text;
2998	text_t *t;	3005	text_t *t;
2999		3006
3000	switch (selection.op)	3007	switch (selection.op)
3001	{	3008	{
…		…
3017	return; /* nothing selected, go away */	3024	return; /* nothing selected, go away */
3018		3025
3019	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))	3026	if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3020	return;	3027	return;
3021		3028
3022	i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);	3029	size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023	new_selection_text = (wchar_t )rxvt_malloc ((i + 4) sizeof (wchar_t));	3030	new_selection_text = (wchar_t )rxvt_malloc ((size + 4) sizeof (wchar_t));
3024		3031
3025	int ofs = 0;	3032	int ofs = 0;
3026	int extra = 0;	3033	int extra = 0;
3027		3034
3028	int col = selection.beg.col;	3035	int col = selection.beg.col;
…		…
3034	{	3041	{
3035	#if !ENABLE_MINIMAL	3042	#if !ENABLE_MINIMAL
3036	if (selection.rect)	3043	if (selection.rect)
3037	{	3044	{
3038	col = selection.beg.col;	3045	col = selection.beg.col;
3039	end_col = ncol + 1;	3046	end_col = selection.end.col;
3040	}	3047	}
3041	else	3048	else
3042	#endif	3049	#endif
3043	end_col = ROW(row).l;	3050	end_col = ROW(row).l;
3044		3051
3045	col = max (col, 0);	3052	col = max (col, 0);
3046		3053
3047	if (row == selection.end.row	3054	if (row == selection.end.row)
3048	#if !ENABLE_MINIMAL
3049	\|\| selection.rect
3050	#endif
3051	)
3052	min_it (end_col, selection.end.col);	3055	min_it (end_col, selection.end.col);
3053		3056
3054	t = ROW(row).t + col;	3057	t = ROW(row).t + col;
3055		3058
3056	for (; col < end_col; col++)	3059	for (; col < end_col; col++)
…		…
3064		3067
3065	extra -= (len - 1);	3068	extra -= (len - 1);
3066		3069
3067	if (extra < 0)	3070	if (extra < 0)
3068	{	3071	{
3069	extra += i;	3072	extra += size;
3070	i += i;	3073	size += size;
3071	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3074	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3072	}	3075	}
3073		3076
3074	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3077	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075	}	3078	}
3076	#endif	3079	#endif
…		…
3088		3091
3089	new_selection_text[ofs++] = C0_LF;	3092	new_selection_text[ofs++] = C0_LF;
3090	}	3093	}
3091	else	3094	else
3092	#endif	3095	#endif
3093	if (!ROW(row).is_longer () && row != selection.end.row)	3096	if (!ROW(row).is_longer ()
		3097	&& (row != selection.end.row \|\| end_col != selection.end.col)
		3098	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3094	new_selection_text[ofs++] = C0_LF;	3099	new_selection_text[ofs++] = C0_LF;
3095	}	3100	}
3096
3097	if (end_col != selection.end.col)
3098	new_selection_text[ofs++] = C0_LF;
3099		3101
3100	new_selection_text[ofs] = 0;	3102	new_selection_text[ofs] = 0;
3101		3103
3102	if (ofs == 0)	3104	if (ofs == 0)
3103	{	3105	{

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs. Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC vs.
Revision 1.362 by sf-exg, Sat Jan 8 10:15:36 2011 UTC