diff options
-rw-r--r-- | apps/gui/buttonbar.c | 2 | ||||
-rw-r--r-- | apps/gui/splash.c | 4 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_touchscreen.c | 2 | ||||
-rw-r--r-- | apps/screen_access.c | 8 | ||||
-rw-r--r-- | apps/screen_access.h | 4 | ||||
-rw-r--r-- | firmware/drivers/lcd-bitmap-common.c | 18 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 4 | ||||
-rw-r--r-- | firmware/export/lcd.h | 4 |
9 files changed, 21 insertions, 27 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index 9abd851252..c7b36fa6e3 100644 --- a/apps/gui/buttonbar.c +++ b/apps/gui/buttonbar.c | |||
@@ -69,7 +69,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) | |||
69 | vp.width = button_width-1; | 69 | vp.width = button_width-1; |
70 | vp.x = button_width * num; | 70 | vp.x = button_width * num; |
71 | display->set_viewport(&vp); | 71 | display->set_viewport(&vp); |
72 | display->fill_viewport_rect(NULL); | 72 | display->fill_viewport(); |
73 | if(buttonbar->caption[num][0] != 0) | 73 | if(buttonbar->caption[num][0] != 0) |
74 | { | 74 | { |
75 | display->getstringsize(buttonbar->caption[num], &fw, &fh); | 75 | display->getstringsize(buttonbar->caption[num], &fw, &fh); |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 5123e5d8f5..4ce751ca74 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -163,7 +163,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
163 | #endif | 163 | #endif |
164 | vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); | 164 | vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); |
165 | 165 | ||
166 | screen->fill_viewport_rect(NULL); | 166 | screen->fill_viewport(); |
167 | 167 | ||
168 | #if LCD_DEPTH > 1 | 168 | #if LCD_DEPTH > 1 |
169 | if (screen->depth > 1) | 169 | if (screen->depth > 1) |
@@ -174,7 +174,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
174 | #endif | 174 | #endif |
175 | vp.drawmode = DRMODE_SOLID; | 175 | vp.drawmode = DRMODE_SOLID; |
176 | 176 | ||
177 | screen->draw_viewport_rect(NULL); | 177 | screen->draw_border_viewport(); |
178 | 178 | ||
179 | /* prepare putting the text */ | 179 | /* prepare putting the text */ |
180 | y = RECT_SPACING; | 180 | y = RECT_SPACING; |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 467907c21a..d2b7f500b1 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -280,7 +280,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
280 | { | 280 | { |
281 | display->set_viewport(vp); | 281 | display->set_viewport(vp); |
282 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 282 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
283 | display->fill_viewport_rect(NULL); | 283 | display->fill_viewport(); |
284 | display->set_drawmode(DRMODE_SOLID); | 284 | display->set_drawmode(DRMODE_SOLID); |
285 | 285 | ||
286 | if (bar->info.battery_state) | 286 | if (bar->info.battery_state) |
diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c index 8b559a4c48..e510856851 100644 --- a/apps/plugins/lib/pluginlib_touchscreen.c +++ b/apps/plugins/lib/pluginlib_touchscreen.c | |||
@@ -129,7 +129,7 @@ void touchbutton_draw(struct touchbutton *data, int num_buttons) { | |||
129 | } | 129 | } |
130 | 130 | ||
131 | /* Draw bounding box around the button location. */ | 131 | /* Draw bounding box around the button location. */ |
132 | lcd->draw_viewport_rect(NULL); | 132 | lcd->draw_border_viewport(); |
133 | } | 133 | } |
134 | } | 134 | } |
135 | lcd->set_viewport(NULL); /* Go back to the default viewport */ | 135 | lcd->set_viewport(NULL); /* Go back to the default viewport */ |
diff --git a/apps/screen_access.c b/apps/screen_access.c index d16a4415fa..b83e842de8 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -162,8 +162,8 @@ struct screen screens[NB_SCREENS] = | |||
162 | .update_viewport_rect=&lcd_update_viewport_rect, | 162 | .update_viewport_rect=&lcd_update_viewport_rect, |
163 | .fillrect=&lcd_fillrect, | 163 | .fillrect=&lcd_fillrect, |
164 | .drawrect=&lcd_drawrect, | 164 | .drawrect=&lcd_drawrect, |
165 | .draw_viewport_rect=&lcd_draw_viewport_rect, | 165 | .draw_border_viewport=&lcd_draw_border_viewport, |
166 | .fill_viewport_rect=&lcd_fill_viewport_rect, | 166 | .fill_viewport=&lcd_fill_viewport, |
167 | .drawpixel=&lcd_drawpixel, | 167 | .drawpixel=&lcd_drawpixel, |
168 | .drawline=&lcd_drawline, | 168 | .drawline=&lcd_drawline, |
169 | .vline=&lcd_vline, | 169 | .vline=&lcd_vline, |
@@ -255,8 +255,8 @@ struct screen screens[NB_SCREENS] = | |||
255 | .update_viewport_rect=&lcd_remote_update_viewport_rect, | 255 | .update_viewport_rect=&lcd_remote_update_viewport_rect, |
256 | .fillrect=&lcd_remote_fillrect, | 256 | .fillrect=&lcd_remote_fillrect, |
257 | .drawrect=&lcd_remote_drawrect, | 257 | .drawrect=&lcd_remote_drawrect, |
258 | .draw_viewport_rect=&lcd_remote_draw_viewport_rect, | 258 | .draw_border_viewport=&lcd_remote_draw_border_viewport, |
259 | .fill_viewport_rect=&lcd_remote_fill_viewport_rect, | 259 | .fill_viewport=&lcd_remote_fill_viewport, |
260 | .drawpixel=&lcd_remote_drawpixel, | 260 | .drawpixel=&lcd_remote_drawpixel, |
261 | .drawline=&lcd_remote_drawline, | 261 | .drawline=&lcd_remote_drawline, |
262 | .vline=&lcd_remote_vline, | 262 | .vline=&lcd_remote_vline, |
diff --git a/apps/screen_access.h b/apps/screen_access.h index 6a4750dbb0..efe232b50e 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -117,8 +117,8 @@ struct screen | |||
117 | void (*update_viewport_rect)(int x, int y, int width, int height); | 117 | void (*update_viewport_rect)(int x, int y, int width, int height); |
118 | void (*fillrect)(int x, int y, int width, int height); | 118 | void (*fillrect)(int x, int y, int width, int height); |
119 | void (*drawrect)(int x, int y, int width, int height); | 119 | void (*drawrect)(int x, int y, int width, int height); |
120 | void (*fill_viewport_rect)(const struct viewport *vp); | 120 | void (*fill_viewport)(void); |
121 | void (*draw_viewport_rect)(const struct viewport *vp); | 121 | void (*draw_border_viewport)(void); |
122 | void (*drawpixel)(int x, int y); | 122 | void (*drawpixel)(int x, int y); |
123 | void (*drawline)(int x1, int y1, int x2, int y2); | 123 | void (*drawline)(int x1, int y1, int x2, int y2); |
124 | void (*vline)(int x, int y1, int y2); | 124 | void (*vline)(int x, int y1, int y2); |
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c index d09d293c26..8e3b52c246 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c | |||
@@ -82,25 +82,19 @@ static void lcd_gradient_rect(int x1, int x2, int y, unsigned h, | |||
82 | #endif | 82 | #endif |
83 | 83 | ||
84 | /* | 84 | /* |
85 | * draws the borders of the viewport, or of current_vp if vp == NULL | 85 | * draws the borders of the current viewport |
86 | **/ | 86 | **/ |
87 | void LCDFN(draw_viewport_rect)(const struct viewport *vp) | 87 | void LCDFN(draw_border_viewport)(void) |
88 | { | 88 | { |
89 | if (vp == NULL) | 89 | LCDFN(drawrect)(0, 0, current_vp->width, current_vp->height); |
90 | LCDFN(drawrect)(0, 0, current_vp->width, current_vp->height); | ||
91 | else | ||
92 | LCDFN(drawrect)(vp->x, vp->y, vp->width, vp->height); | ||
93 | } | 90 | } |
94 | 91 | ||
95 | /* | 92 | /* |
96 | * fills the rectangle formed by vp or by current_vp if vp == NULL | 93 | * fills the rectangle formed by current_vp |
97 | **/ | 94 | **/ |
98 | void LCDFN(fill_viewport_rect)(const struct viewport *vp) | 95 | void LCDFN(fill_viewport)(void) |
99 | { | 96 | { |
100 | if (vp == NULL) | 97 | LCDFN(fillrect)(0, 0, current_vp->width, current_vp->height); |
101 | LCDFN(fillrect)(0, 0, current_vp->width, current_vp->height); | ||
102 | else | ||
103 | LCDFN(fillrect)(vp->x, vp->y, vp->width, vp->height); | ||
104 | } | 98 | } |
105 | 99 | ||
106 | /* put a string at a given pixel position, skipping first ofs pixel columns */ | 100 | /* put a string at a given pixel position, skipping first ofs pixel columns */ |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 5a78fa2b07..9b5f397dff 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -178,8 +178,8 @@ extern void lcd_remote_hline(int x1, int x2, int y); | |||
178 | extern void lcd_remote_vline(int x, int y1, int y2); | 178 | extern void lcd_remote_vline(int x, int y1, int y2); |
179 | extern void lcd_remote_drawrect(int x, int y, int width, int height); | 179 | extern void lcd_remote_drawrect(int x, int y, int width, int height); |
180 | extern void lcd_remote_fillrect(int x, int y, int width, int height); | 180 | extern void lcd_remote_fillrect(int x, int y, int width, int height); |
181 | extern void lcd_remote_draw_viewport_rect(const struct viewport *vp); | 181 | extern void lcd_remote_draw_border_viewport(const struct viewport *vp); |
182 | extern void lcd_remote_fill_viewport_rect(const struct viewport *vp); | 182 | extern void lcd_remote_fill_viewport(const struct viewport *vp); |
183 | extern void lcd_remote_bitmap_part(const fb_remote_data *src, int src_x, | 183 | extern void lcd_remote_bitmap_part(const fb_remote_data *src, int src_x, |
184 | int src_y, int stride, int x, int y, | 184 | int src_y, int stride, int x, int y, |
185 | int width, int height); | 185 | int width, int height); |
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 3a01cbca61..79231d198e 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -507,8 +507,8 @@ extern void lcd_hline(int x1, int x2, int y); | |||
507 | extern void lcd_vline(int x, int y1, int y2); | 507 | extern void lcd_vline(int x, int y1, int y2); |
508 | extern void lcd_drawrect(int x, int y, int width, int height); | 508 | extern void lcd_drawrect(int x, int y, int width, int height); |
509 | extern void lcd_fillrect(int x, int y, int width, int height); | 509 | extern void lcd_fillrect(int x, int y, int width, int height); |
510 | extern void lcd_draw_viewport_rect(const struct viewport *vp); | 510 | extern void lcd_draw_border_viewport(void); |
511 | extern void lcd_fill_viewport_rect(const struct viewport *vp); | 511 | extern void lcd_fill_viewport(void); |
512 | extern void lcd_bitmap_part(const fb_data *src, int src_x, int src_y, | 512 | extern void lcd_bitmap_part(const fb_data *src, int src_x, int src_y, |
513 | int stride, int x, int y, int width, int height); | 513 | int stride, int x, int y, int width, int height); |
514 | extern void lcd_bitmap(const fb_data *src, int x, int y, int width, | 514 | extern void lcd_bitmap(const fb_data *src, int x, int y, int width, |