len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 20:55:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Text viewer: Documentation and code cosmetics (no functional changes)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25509 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2010-04-07 17:04:30 +00:00
parent 4e8704c387
commit 1709d72eb4
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/plugins/viewer.c
View file

@ -635,6 +635,7 @@ static int bookmark_count;
static bool is_bom = false;
/* calculate the width of a UCS character (zero width for diacritics) */
static int glyph_width(int ch)
{
if (ch == 0)
@ -647,6 +648,7 @@ static int glyph_width(int ch)
#endif
}
/* get UCS character from string */
static unsigned char* get_ucs(const unsigned char* str, unsigned short* ch)
{
unsigned char utf8_tmp[6];
@ -659,6 +661,7 @@ static unsigned char* get_ucs(const unsigned char* str, unsigned short* ch)
rb->iso_decode(str, utf8_tmp, prefs.encoding, count);
rb->utf8decode(utf8_tmp, ch);
/* return a pointer after the parsed section of the string */
#ifdef HAVE_LCD_BITMAP
if (prefs.encoding >= SJIS && *str >= 0x80
&& !(prefs.encoding == SJIS && *str > 0xA0 && *str < 0xE0))
@ -668,6 +671,7 @@ static unsigned char* get_ucs(const unsigned char* str, unsigned short* ch)
return (unsigned char*)str+1;
}
/* decode UCS string into UTF-8 string */
static unsigned char *decode2utf8(const unsigned char *src, unsigned char *dst,
int skip_width, int disp_width)
{
@ -677,6 +681,7 @@ static unsigned char *decode2utf8(const unsigned char *src, unsigned char *dst,
unsigned char *utf8 = dst;
int width = 0;
/* skip the skip_width */
while (*str != '\0')
{
oldstr = str;
@ -688,6 +693,8 @@ static unsigned char *decode2utf8(const unsigned char *src, unsigned char *dst,
break;
}
}
/* decode until string end or disp_width reached */
width = 0;
while(*str != '\0')
{
@ -699,9 +706,11 @@ static unsigned char *decode2utf8(const unsigned char *src, unsigned char *dst,
utf8 = rb->utf8encode(ch, utf8);
}
/* return a pointer after the dst string ends */
return utf8;
}
/* set max_columns and max_width */
static void calc_max_width(void)
{
if (prefs.view_mode == NARROW)
@ -2869,8 +2878,7 @@ enum plugin_status plugin_start(const void* file)
case VIEWER_SCREEN_LEFT | BUTTON_REPEAT:
if (prefs.view_mode == WIDE) {
/* Screen left */
col -= draw_columns;
col = col_limit(col);
col = col_limit(col - draw_columns);
}
else { /* prefs.view_mode == NARROW */
/* Top of file */
@ -2884,8 +2892,7 @@ enum plugin_status plugin_start(const void* file)
case VIEWER_SCREEN_RIGHT | BUTTON_REPEAT:
if (prefs.view_mode == WIDE) {
/* Screen right */
col += draw_columns;
col = col_limit(col);
col = col_limit(col + draw_columns);
}
else { /* prefs.view_mode == NARROW */
/* Bottom of file */
@ -2918,8 +2925,7 @@ enum plugin_status plugin_start(const void* file)
case VIEWER_COLUMN_LEFT | BUTTON_REPEAT:
if (prefs.view_mode == WIDE) {
/* Scroll left one column */
col -= glyph_width('o');
col = col_limit(col);
col = col_limit(col - glyph_width('o'));
viewer_draw(col);
}
break;
@ -2928,8 +2934,7 @@ enum plugin_status plugin_start(const void* file)
case VIEWER_COLUMN_RIGHT | BUTTON_REPEAT:
if (prefs.view_mode == WIDE) {
/* Scroll right one column */
col += glyph_width('o');
col = col_limit(col);
col = col_limit(col + glyph_width('o'));
viewer_draw(col);
}
break;