[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.358 by sf-exg, Tue Jan 4 18:22:11 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++;
…		…
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
…		…
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;
…		…
3064		3071
3065	extra -= (len - 1);	3072	extra -= (len - 1);
3066		3073
3067	if (extra < 0)	3074	if (extra < 0)
3068	{	3075	{
3069	extra += i;	3076	extra += size;
3070	i += i;	3077	size += size;
3071	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (i + 4) sizeof (wchar_t));	3078	new_selection_text = (wchar_t )rxvt_realloc (new_selection_text, (size + 4) sizeof (wchar_t));
3072	}	3079	}
3073		3080
3074	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);	3081	ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075	}	3082	}
3076	#endif	3083	#endif
…		…
3088		3095
3089	new_selection_text[ofs++] = C0_LF;	3096	new_selection_text[ofs++] = C0_LF;
3090	}	3097	}
3091	else	3098	else
3092	#endif	3099	#endif
3093	if (!ROW(row).is_longer () && row != selection.end.row)	3100	if (!ROW(row).is_longer () && row != selection.end.row
		3101	&& (row != selection.beg.row \|\| selection.beg.col < ncol))
3094	new_selection_text[ofs++] = C0_LF;	3102	new_selection_text[ofs++] = C0_LF;
3095	}	3103	}
3096		3104
3097	if (end_col != selection.end.col)	3105	if (end_col != selection.end.col)
3098	new_selection_text[ofs++] = C0_LF;	3106	new_selection_text[ofs++] = C0_LF;

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.358 by sf-exg, Tue Jan 4 18:22:11 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.358 by sf-exg, Tue Jan 4 18:22:11 2011 UTC