Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
text viewer: can be selected the number of screens per page.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26613 a1c6a512-1295-4272-9138-f99709370657
+84
-87
-2
apps/plugins/text_viewer/readme.txt
-2
apps/plugins/text_viewer/readme.txt
···
44
44
45
45
- add History feature.
46
46
47
-
- when the WIDE screen, allow to specify the number of screens.
48
-
49
47
- when the line_mode is reflow, allow to specify indent spaces.
50
48
51
49
- for the horizontal scroll, allow the select scroll by screen/scroll by column for the settings menu.
+4
-4
apps/plugins/text_viewer/text_viewer.c
+4
-4
apps/plugins/text_viewer/text_viewer.c
···
108
108
109
109
case TV_SCREEN_LEFT:
110
110
case TV_SCREEN_LEFT | BUTTON_REPEAT:
111
-
if (prefs->view_mode == WIDE)
111
+
if (prefs->windows > 1)
112
112
{
113
113
/* Screen left */
114
114
tv_scroll_left(TV_HORIZONTAL_SCROLL_WINDOW);
115
115
}
116
-
else { /* prefs->view_mode == NARROW */
116
+
else { /* prefs->windows == 1 */
117
117
/* scroll to previous page */
118
118
tv_scroll_up(TV_VERTICAL_SCROLL_PAGE);
119
119
#if 0
···
125
125
126
126
case TV_SCREEN_RIGHT:
127
127
case TV_SCREEN_RIGHT | BUTTON_REPEAT:
128
-
if (prefs->view_mode == WIDE)
128
+
if (prefs->windows > 1)
129
129
{
130
130
/* Screen right */
131
131
tv_scroll_right(TV_HORIZONTAL_SCROLL_WINDOW);
132
132
}
133
-
else { /* prefs->view_mode == NARROW */
133
+
else { /* prefs->windows == 1 */
134
134
/* scroll to next page */
135
135
tv_scroll_down(TV_VERTICAL_SCROLL_PAGE);
136
136
#if 0
+2
-2
apps/plugins/text_viewer/tv_preferences.c
+2
-2
apps/plugins/text_viewer/tv_preferences.c
···
46
46
if ((oldp == NULL) ||
47
47
(oldp->word_mode != newp->word_mode) ||
48
48
(oldp->line_mode != newp->line_mode) ||
49
-
(oldp->view_mode != newp->view_mode) ||
49
+
(oldp->windows != newp->windows) ||
50
50
(oldp->scrollbar_mode != newp->scrollbar_mode) ||
51
51
(oldp->encoding != newp->encoding) ||
52
52
#ifdef HAVE_LCD_BITMAP
···
91
91
{
92
92
p->word_mode = WRAP;
93
93
p->line_mode = NORMAL;
94
-
p->view_mode = NARROW;
94
+
p->windows = 1;
95
95
p->alignment = LEFT;
96
96
p->scroll_mode = PAGE;
97
97
p->page_mode = NO_OVERLAP;
+2
-5
apps/plugins/text_viewer/tv_preferences.h
+2
-5
apps/plugins/text_viewer/tv_preferences.h
···
37
37
} line_mode;
38
38
39
39
enum {
40
-
NARROW = 0,
41
-
WIDE,
42
-
} view_mode;
43
-
44
-
enum {
45
40
LEFT = 0,
46
41
RIGHT,
47
42
} alignment;
···
78
73
} scroll_mode;
79
74
80
75
int autoscroll_speed;
76
+
77
+
int windows;
81
78
82
79
unsigned char font_name[MAX_PATH];
83
80
#ifdef HAVE_LCD_BITMAP
+62
-50
apps/plugins/text_viewer/tv_settings.c
+62
-50
apps/plugins/text_viewer/tv_settings.c
···
30
30
*
31
31
* setting file format
32
32
*
33
-
* part byte count
34
-
* --------------------------------
35
-
* 'TVGS' 4
36
-
* version 1
37
-
* word_mode 1
38
-
* line_mode 1
39
-
* view_mode 1
40
-
* alignment 1
41
-
* encoding 1
42
-
* scrollbar_mode 1
43
-
* (unused) 1 (for compatibility)
44
-
* page_mode 1
45
-
* page_number_mode 1
46
-
* title_mode 1
47
-
* scroll_mode 1
48
-
* autoscroll_speed 1
49
-
* font name MAX_PATH
33
+
* part byte count
34
+
* -------------------------------
35
+
* 'TVGS' 4
36
+
* version 1
37
+
* word_mode 1
38
+
* line_mode 1
39
+
* windows 1 (when version <= 0x32, this value is view_mode)
40
+
* alignment 1
41
+
* encoding 1
42
+
* scrollbar_mode 1
43
+
* (unused) 1 (for compatibility)
44
+
* page_mode 1
45
+
* page_number_mode 1
46
+
* title_mode 1
47
+
* scroll_mode 1
48
+
* autoscroll_speed 1
49
+
* (reserved) 16
50
+
* font name MAX_PATH
50
51
*/
51
52
52
53
#define VIEWER_GLOBAL_SETTINGS_FILE VIEWERS_DIR "/viewer.dat"
53
54
#define TV_GLOBAL_SETTINGS_FILE VIEWERS_DIR "/tv_global.dat"
54
55
55
56
#define TV_GLOBAL_SETTINGS_HEADER "\x54\x56\x47\x53" /* "TVGS" */
56
-
#define TV_GLOBAL_SETTINGS_VERSION 0x32
57
+
#define TV_GLOBAL_SETTINGS_VERSION 0x33
57
58
#define TV_GLOBAL_SETTINGS_HEADER_SIZE 5
58
59
#define TV_GLOBAL_SETTINGS_FIRST_VERSION 0x31
59
60
···
62
63
*
63
64
* setting file format
64
65
*
65
-
* part byte count
66
-
* --------------------------------
67
-
* 'TVS' 3
68
-
* version 1
69
-
* file count 2
66
+
* part byte count
67
+
* -----------------------------------
68
+
* 'TVS' 3
69
+
* version 1
70
+
* file count 2
70
71
* [1st file]
71
-
* file path MAX_PATH
72
-
* next file pos 2 (prefences size + bookmark count * bookmark size + 1)
72
+
* file path MAX_PATH
73
+
* next file pos 2 (prefences size + bookmark count * bookmark size + 1)
73
74
* [preferences]
74
-
* word_mode 1
75
-
* line_mode 1
76
-
* view_mode 1
77
-
* alignment 1
78
-
* encoding 1
79
-
* scrollbar_mode 1
80
-
* (unused) 1 (for compatibility)
81
-
* page_mode 1
82
-
* header_mode 1
83
-
* footer_mode 1
84
-
* scroll_mode 1
85
-
* autoscroll_speed 1
86
-
* font name MAX_PATH
87
-
* bookmark count 1
75
+
* word_mode 1
76
+
* line_mode 1
77
+
* windows 1 (when version <= 0x33, this value is view_mode)
78
+
* alignment 1
79
+
* encoding 1
80
+
* scrollbar_mode 1
81
+
* (unused) 1 (for compatibility)
82
+
* page_mode 1
83
+
* header_mode 1
84
+
* footer_mode 1
85
+
* scroll_mode 1
86
+
* autoscroll_speed 1
87
+
* (reserved) 16
88
+
* font name MAX_PATH
89
+
* bookmark count 1
88
90
* [1st bookmark]
89
-
* file_position 4
90
-
* page 2
91
-
* line 1
92
-
* flag 1
91
+
* file_position 4
92
+
* page 2
93
+
* line 1
94
+
* flag 1
93
95
* [2nd bookmark]
94
96
* ...
95
97
* [last bookmark]
···
104
106
#define TV_SETTINGS_TMP_FILE VIEWERS_DIR "/tv_file.tmp"
105
107
106
108
#define TV_SETTINGS_HEADER "\x54\x56\x53" /* "TVS" */
107
-
#define TV_SETTINGS_VERSION 0x33
109
+
#define TV_SETTINGS_VERSION 0x34
108
110
#define TV_SETTINGS_HEADER_SIZE 4
109
111
#define TV_SETTINGS_FIRST_VERSION 0x32
110
112
111
-
#define TV_PREFERENCES_SIZE (12 + MAX_PATH)
113
+
#define TV_PREFERENCES_SIZE (28 + MAX_PATH)
112
114
113
115
/* ----------------------------------------------------------------------------
114
116
* read/write the preferences
···
122
124
int read_size = TV_PREFERENCES_SIZE;
123
125
124
126
if (version == 0)
125
-
read_size--;
127
+
read_size -= 17;
128
+
else if (version == 1)
129
+
read_size -= 16;
126
130
127
131
if (rb->read(pfd, buf, read_size) < 0)
128
132
return false;
129
133
130
134
prefs->word_mode = *p++;
131
135
prefs->line_mode = *p++;
132
-
prefs->view_mode = *p++;
136
+
137
+
prefs->windows = *p++;
138
+
if (version <= 1)
139
+
prefs->windows++;
140
+
133
141
if (version > 0)
134
142
prefs->alignment = *p++;
135
143
else
136
144
prefs->alignment = LEFT;
145
+
137
146
prefs->encoding = *p++;
138
147
prefs->scrollbar_mode = *p++;
139
148
/* skip need_scrollbar */
···
143
152
prefs->footer_mode = *p++;
144
153
prefs->scroll_mode = *p++;
145
154
prefs->autoscroll_speed = *p++;
146
-
rb->memcpy(prefs->font_name, p, MAX_PATH);
155
+
156
+
rb->memcpy(prefs->font_name, buf + read_size - MAX_PATH, MAX_PATH);
157
+
147
158
#ifdef HAVE_LCD_BITMAP
148
159
prefs->font = rb->font_get(FONT_UI);
149
160
#endif
···
158
169
159
170
*p++ = prefs->word_mode;
160
171
*p++ = prefs->line_mode;
161
-
*p++ = prefs->view_mode;
172
+
*p++ = prefs->windows;
162
173
*p++ = prefs->alignment;
163
174
*p++ = prefs->encoding;
164
175
*p++ = prefs->scrollbar_mode;
···
169
180
*p++ = prefs->footer_mode;
170
181
*p++ = prefs->scroll_mode;
171
182
*p++ = prefs->autoscroll_speed;
172
-
rb->memcpy(p, prefs->font_name, MAX_PATH);
183
+
184
+
rb->memcpy(buf + 28, prefs->font_name, MAX_PATH);
173
185
174
186
return (rb->write(pfd, buf, TV_PREFERENCES_SIZE) >= 0);
175
187
}
+1
-1
apps/plugins/text_viewer/tv_text_processor.c
+1
-1
apps/plugins/text_viewer/tv_text_processor.c
+8
-13
apps/plugins/text_viewer/tv_window.c
+8
-13
apps/plugins/text_viewer/tv_window.c
···
27
27
#include "tv_text_reader.h"
28
28
#include "tv_window.h"
29
29
30
-
#define TV_WINDOWS_PER_SCREEN 2
31
-
32
30
#define TV_SCROLLBAR_WIDTH rb->global_settings->scrollbar_width
33
31
34
32
#ifndef HAVE_LCD_BITMAP
···
47
45
static int window_width;
48
46
static int window_columns;
49
47
static int col_width;
50
-
51
-
static int max_windows;
52
48
53
49
static int cur_window;
54
50
static int cur_column;
···
204
200
int offset = cur_column * col_width;
205
201
int size = 0;
206
202
int line_width;
207
-
int draw_width = (max_windows - cur_window) * LCD_WIDTH - offset;
203
+
int draw_width = (prefs->windows - cur_window) * LCD_WIDTH - offset;
208
204
int dx = start_width - offset;
209
205
210
206
tv_copy_screen_pos(&pos);
···
213
209
if (prefs->alignment == LEFT)
214
210
tv_read_start(cur_window, (cur_column > 0));
215
211
else
216
-
tv_read_start(0, prefs->view_mode == WIDE);
212
+
tv_read_start(0, prefs->windows > 1);
217
213
218
214
for (line = 0; line < display_lines; line++)
219
215
{
···
313
309
col_width = 1;
314
310
#endif
315
311
316
-
max_windows = (prefs->view_mode == NARROW)? 1: TV_WINDOWS_PER_SCREEN;
317
-
if (cur_window >= max_windows)
312
+
if (cur_window >= prefs->windows)
318
313
cur_window = 0;
319
314
320
315
window_width = LCD_WIDTH;
···
322
317
need_scrollbar = false;
323
318
start_width = 0;
324
319
tv_seek_top();
325
-
tv_set_read_conditions(max_windows, window_width);
320
+
tv_set_read_conditions(prefs->windows, window_width);
326
321
if (tv_traverse_lines() && prefs->scrollbar_mode)
327
322
{
328
323
need_scrollbar = true;
···
337
332
338
333
cur_column = 0;
339
334
340
-
tv_set_read_conditions(max_windows, window_width);
335
+
tv_set_read_conditions(prefs->windows, window_width);
341
336
}
342
337
343
338
bool tv_init_window(unsigned char *buf, size_t bufsize, size_t *used_size)
···
365
360
cur_window = 0;
366
361
cur_column = 0;
367
362
}
368
-
else if (cur_window >= max_windows)
363
+
else if (cur_window >= prefs->windows)
369
364
{
370
-
cur_window = max_windows - 1;
365
+
cur_window = prefs->windows - 1;
371
366
cur_column = 0;
372
367
}
373
368
···
383
378
}
384
379
else
385
380
{
386
-
if (cur_window == max_windows - 1)
381
+
if (cur_window == prefs->windows - 1)
387
382
cur_column = 0;
388
383
else if (cur_column >= window_columns)
389
384
{