devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

text viewer: can select the indent spaces when the line mode is reflow.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26763 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Yoshihisa Uchida 2010-06-11 11:13:02 +00:00
parent 1b613f583d
commit a784938b78
6 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/plugins/text_viewer/tv_text_processor.c
View file

@ -41,12 +41,6 @@ enum tv_text_type {
#define TV_MAX_BLOCKS 5
/*
* number of spaces to indent first paragraph
* (this value uses the line mode is REFLOW only)
*/
#define TV_INDENT_SPACES 2
static const struct tv_preferences *prefs;
static enum tv_text_type text_type = TV_TEXT_UNKNOWN;
@ -434,7 +428,7 @@ static int tv_parse_text(const unsigned char *src, unsigned short *ucs,
is_indent = false;
if (prefs->line_mode == REFLOW && is_indent)
gw = tv_glyph_width(ch) * TV_INDENT_SPACES;
gw = tv_glyph_width(ch) * prefs->indent_spaces;
else
gw = tv_glyph_width(ch);
@ -451,12 +445,13 @@ static int tv_parse_text(const unsigned char *src, unsigned short *ucs,
break;
}
if (prefs->line_mode == REFLOW && is_indent)
if (prefs->line_mode != REFLOW || !is_indent)
ucs[chars++] = ch;
else
{
for (i = 1; i < TV_INDENT_SPACES; i++)
for (i = 0; i < prefs->indent_spaces; i++)
ucs[chars++] = ch;
}
ucs[chars++] = ch;
if (tv_is_line_break_char(ch))
{
@ -518,6 +513,9 @@ int tv_create_formed_text(const unsigned char *src, ssize_t bufsize,
tv_get_ucs(src, &ch);
is_indent = (tv_isspace(ch) && !is_break_line);
if (is_indent && prefs->indent_spaces == 0 && (expand_extra_line = !expand_extra_line) == true)
return 0;
for (i = 0; i < block_count; i++)
{
size += tv_parse_text(src + size, ucsbuf[i], &chars[i], is_indent);