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

check separately if the preferences and the bookmark need to be saved

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15701 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2007-11-19 20:51:42 +00:00
parent 77af93b2cd
commit 2b30bf9eac
1 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

53
apps/plugins/viewer.c
View file

@ -285,7 +285,10 @@ struct preferences {
int autoscroll_speed; int autoscroll_speed;
} prefs; };
struct preferences prefs;
struct preferences old_prefs;
static unsigned char buffer[BUFFER_SIZE + 1]; static unsigned char buffer[BUFFER_SIZE + 1];
static unsigned char line_break[] = {0,0x20,9,0xB,0xC,'-'}; static unsigned char line_break[] = {0,0x20,9,0xB,0xC,'-'};
@ -1093,6 +1096,8 @@ static void viewer_load_settings(void) /* same name as global, but not the same
rb->close(settings_fd); rb->close(settings_fd);
} }
memcpy(&old_prefs, &prefs, sizeof(struct preferences));
data = (struct bookmark_file_data*)buffer; /* grab the text buffer */ data = (struct bookmark_file_data*)buffer; /* grab the text buffer */
data->bookmarked_files_count = 0; data->bookmarked_files_count = 0;
@ -1174,26 +1179,34 @@ static void viewer_save_settings(void)/* same name as global, but not the same f
{ {
int settings_fd; int settings_fd;
/* don't save if the position didn't change */ /* save the viewer settings if they have been changed */
if (file_pos + screen_top_ptr - buffer == start_position) if (rb->memcmp(&prefs, &old_prefs, sizeof(struct preferences)))
return;
settings_fd = rb->creat(SETTINGS_FILE); /* create the settings file */
rb->write (settings_fd, &prefs, sizeof(struct preferences));
rb->close(settings_fd);
settings_fd = rb->open(BOOKMARKS_FILE, O_WRONLY|O_CREAT);
if (settings_fd >= 0 )
{ {
struct bookmarked_file_info b; settings_fd = rb->creat(SETTINGS_FILE); /* create the settings file */
b.file_position = file_pos;
b.top_ptr_pos = screen_top_ptr - buffer; if (settings_fd >= 0 )
rb->memset(&b.filename[0],0,MAX_PATH); {
rb->strcpy(b.filename,file_name); rb->write (settings_fd, &prefs, sizeof(struct preferences));
rb->PREFIX(lseek)(settings_fd,sizeof(signed int),SEEK_SET); rb->close(settings_fd);
rb->write (settings_fd, &b, sizeof(struct bookmarked_file_info)); }
rb->close(settings_fd); }
/* save the bookmark if the position has changed */
if (file_pos + screen_top_ptr - buffer != start_position)
{
settings_fd = rb->open(BOOKMARKS_FILE, O_WRONLY|O_CREAT);
if (settings_fd >= 0 )
{
struct bookmarked_file_info b;
b.file_position = file_pos;
b.top_ptr_pos = screen_top_ptr - buffer;
rb->memset(&b.filename[0],0,MAX_PATH);
rb->strcpy(b.filename,file_name);
rb->PREFIX(lseek)(settings_fd,sizeof(signed int),SEEK_SET);
rb->write (settings_fd, &b, sizeof(struct bookmarked_file_info));
rb->close(settings_fd);
}
} }
} }