diff options
Diffstat (limited to 'apps/plugins/test_viewports.c')
-rw-r--r-- | apps/plugins/test_viewports.c | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/apps/plugins/test_viewports.c b/apps/plugins/test_viewports.c index 465a832399..60c6672456 100644 --- a/apps/plugins/test_viewports.c +++ b/apps/plugins/test_viewports.c | |||
@@ -35,7 +35,7 @@ static struct viewport vp0 = | |||
35 | { | 35 | { |
36 | .x = 0, | 36 | .x = 0, |
37 | .y = 0, | 37 | .y = 0, |
38 | .width = LCD_WIDTH, | 38 | .width = LCD_WIDTH/ 2 + LCD_WIDTH / 3, |
39 | .height = 20, | 39 | .height = 20, |
40 | .font = FONT_UI, | 40 | .font = FONT_UI, |
41 | .drawmode = DRMODE_SOLID, | 41 | .drawmode = DRMODE_SOLID, |
@@ -120,15 +120,37 @@ static struct viewport rvp1 = | |||
120 | 120 | ||
121 | #endif | 121 | #endif |
122 | 122 | ||
123 | static void *test_address_fn(int x, int y) | ||
124 | { | ||
125 | struct frame_buffer_t *fb = vp0.buffer; | ||
126 | |||
127 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | ||
128 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; | ||
129 | #else | ||
130 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; | ||
131 | #endif | ||
132 | return fb->fb_ptr + (element % fb->elems); | ||
133 | } | ||
123 | 134 | ||
124 | enum plugin_status plugin_start(const void* parameter) | 135 | enum plugin_status plugin_start(const void* parameter) |
125 | { | 136 | { |
126 | (void)parameter; | 137 | (void)parameter; |
127 | char buf[80]; | 138 | char buf[80]; |
128 | int i,y; | 139 | int i,y; |
140 | fb_data vp_buffer[LCD_NBELEMS(vp0.width, vp0.height)]; | ||
129 | 141 | ||
142 | struct frame_buffer_t fb; | ||
143 | |||
144 | fb.stride = STRIDE_MAIN(vp0.width, vp0.height); | ||
145 | |||
146 | fb.fb_ptr = vp_buffer; | ||
147 | fb.elems = LCD_NBELEMS(vp0.width, vp0.height); | ||
148 | fb.get_address_fn = &test_address_fn; | ||
149 | |||
150 | rb->viewport_set_buffer(&vp0, &fb, SCREEN_MAIN); | ||
130 | rb->screens[SCREEN_MAIN]->set_viewport(&vp0); | 151 | rb->screens[SCREEN_MAIN]->set_viewport(&vp0); |
131 | rb->screens[SCREEN_MAIN]->clear_viewport(); | 152 | rb->screens[SCREEN_MAIN]->clear_viewport(); |
153 | |||
132 | rb->screens[SCREEN_MAIN]->puts_scroll(0,0,"Viewport testing plugin - this is a scrolling title"); | 154 | rb->screens[SCREEN_MAIN]->puts_scroll(0,0,"Viewport testing plugin - this is a scrolling title"); |
133 | 155 | ||
134 | rb->screens[SCREEN_MAIN]->set_viewport(&vp1); | 156 | rb->screens[SCREEN_MAIN]->set_viewport(&vp1); |
@@ -192,6 +214,9 @@ enum plugin_status plugin_start(const void* parameter) | |||
192 | 214 | ||
193 | rb->screens[SCREEN_REMOTE]->update(); | 215 | rb->screens[SCREEN_REMOTE]->update(); |
194 | #endif | 216 | #endif |
217 | rb->button_clear_queue(); | ||
218 | while(rb->button_get(true) <= BUTTON_NONE) | ||
219 | ;; | ||
195 | 220 | ||
196 | rb->button_get(true); | 221 | rb->button_get(true); |
197 | 222 | ||