1
0
Fork 0
forked from len0rd/rockbox

text viewer: can selected scroll by column/scroll by screen for the horizontal screen.

Viewer Options: "Scrollbar", "Overlap Pages", "Auto-Scroll Speed" move to Scroll Settings > Vertical.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26654 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Yoshihisa Uchida 2010-06-07 11:04:09 +00:00
parent 04fd0ce374
commit 1ce70a679c
9 changed files with 134 additions and 72 deletions

View file

@ -47,7 +47,8 @@
* scroll_mode 1
* autoscroll_speed 1
* horizontal_scrollbar 1
* (reserved) 15
* horizontal_scroll_mode 1
* (reserved) 14
* font name MAX_PATH
*/
@ -55,7 +56,7 @@
#define TV_GLOBAL_SETTINGS_FILE VIEWERS_DIR "/tv_global.dat"
#define TV_GLOBAL_SETTINGS_HEADER "\x54\x56\x47\x53" /* "TVGS" */
#define TV_GLOBAL_SETTINGS_VERSION 0x34
#define TV_GLOBAL_SETTINGS_VERSION 0x35
#define TV_GLOBAL_SETTINGS_HEADER_SIZE 5
#define TV_GLOBAL_SETTINGS_FIRST_VERSION 0x31
@ -86,7 +87,8 @@
* scroll_mode 1
* autoscroll_speed 1
* horizontal_scrollbar 1
* (reserved) 15
* horizontal_scroll_mode 1
* (reserved) 14
* font name MAX_PATH
* bookmark count 1
* [1st bookmark]
@ -108,7 +110,7 @@
#define TV_SETTINGS_TMP_FILE VIEWERS_DIR "/tv_file.tmp"
#define TV_SETTINGS_HEADER "\x54\x56\x53" /* "TVS" */
#define TV_SETTINGS_VERSION 0x35
#define TV_SETTINGS_VERSION 0x36
#define TV_SETTINGS_HEADER_SIZE 4
#define TV_SETTINGS_FIRST_VERSION 0x32
@ -149,17 +151,22 @@ static bool tv_read_preferences(int pfd, int version, struct tv_preferences *pre
prefs->vertical_scrollbar = *p++;
/* skip need_scrollbar */
p++;
prefs->page_mode = *p++;
prefs->header_mode = *p++;
prefs->footer_mode = *p++;
prefs->scroll_mode = *p++;
prefs->autoscroll_speed = *p++;
prefs->page_mode = *p++;
prefs->header_mode = *p++;
prefs->footer_mode = *p++;
prefs->vertical_scroll_mode = *p++;
prefs->autoscroll_speed = *p++;
if (version > 2)
prefs->horizontal_scrollbar = *p;
else
prefs->horizontal_scrollbar = SB_OFF;
if (version > 3)
prefs->horizontal_scroll_mode = *p++;
else
prefs->horizontal_scroll_mode = SCREEN;
rb->memcpy(prefs->font_name, buf + read_size - MAX_PATH, MAX_PATH);
#ifdef HAVE_LCD_BITMAP
@ -185,9 +192,10 @@ static bool tv_write_preferences(int pfd, const struct tv_preferences *prefs)
*p++ = prefs->page_mode;
*p++ = prefs->header_mode;
*p++ = prefs->footer_mode;
*p++ = prefs->scroll_mode;
*p++ = prefs->vertical_scroll_mode;
*p++ = prefs->autoscroll_speed;
*p++ = prefs->horizontal_scrollbar;
*p++ = prefs->horizontal_scroll_mode;
rb->memcpy(buf + 28, prefs->font_name, MAX_PATH);