From 5462ef728fd41a6db4d1d784c478416ceeebf588 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 10 Oct 2010 23:35:03 +0000 Subject: Add _rect to {draw,fill}_viewport as suggested by Jonathan Gordon to reduce the chance to confuse it with update_viewport(). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28240 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/buttonbar.c | 2 +- apps/gui/splash.c | 4 ++-- apps/gui/statusbar.c | 2 +- apps/plugins/lib/pluginlib_touchscreen.c | 2 +- apps/screen_access.c | 8 ++++---- apps/screen_access.h | 4 ++-- firmware/drivers/lcd-bitmap-common.c | 4 ++-- firmware/export/lcd-remote.h | 4 ++-- firmware/export/lcd.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index db94362352..9abd851252 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) vp.width = button_width-1; vp.x = button_width * num; display->set_viewport(&vp); - display->fill_viewport(NULL); + display->fill_viewport_rect(NULL); if(buttonbar->caption[num][0] != 0) { display->getstringsize(buttonbar->caption[num], &fw, &fh); diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 8c5f57fdd9..5123e5d8f5 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) #endif vp.drawmode = (DRMODE_SOLID|DRMODE_INVERSEVID); - screen->fill_viewport(NULL); + screen->fill_viewport_rect(NULL); #if LCD_DEPTH > 1 if (screen->depth > 1) @@ -174,7 +174,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) #endif vp.drawmode = DRMODE_SOLID; - screen->draw_viewport(NULL); + screen->draw_viewport_rect(NULL); /* prepare putting the text */ y = RECT_SPACING; diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index a05a11a502..467907c21a 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 { display->set_viewport(vp); display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); - display->fill_viewport(NULL); + display->fill_viewport_rect(NULL); display->set_drawmode(DRMODE_SOLID); if (bar->info.battery_state) diff --git a/apps/plugins/lib/pluginlib_touchscreen.c b/apps/plugins/lib/pluginlib_touchscreen.c index 3920b8ec18..8b559a4c48 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) { } /* Draw bounding box around the button location. */ - lcd->draw_viewport(NULL); + lcd->draw_viewport_rect(NULL); } } lcd->set_viewport(NULL); /* Go back to the default viewport */ diff --git a/apps/screen_access.c b/apps/screen_access.c index e828feafc1..d16a4415fa 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c @@ -162,8 +162,8 @@ struct screen screens[NB_SCREENS] = .update_viewport_rect=&lcd_update_viewport_rect, .fillrect=&lcd_fillrect, .drawrect=&lcd_drawrect, - .draw_viewport=&lcd_draw_viewport, - .fill_viewport=&lcd_fill_viewport, + .draw_viewport_rect=&lcd_draw_viewport_rect, + .fill_viewport_rect=&lcd_fill_viewport_rect, .drawpixel=&lcd_drawpixel, .drawline=&lcd_drawline, .vline=&lcd_vline, @@ -255,8 +255,8 @@ struct screen screens[NB_SCREENS] = .update_viewport_rect=&lcd_remote_update_viewport_rect, .fillrect=&lcd_remote_fillrect, .drawrect=&lcd_remote_drawrect, - .draw_viewport=&lcd_remote_draw_viewport, - .fill_viewport=&lcd_remote_fill_viewport, + .draw_viewport_rect=&lcd_remote_draw_viewport_rect, + .fill_viewport_rect=&lcd_remote_fill_viewport_rect, .drawpixel=&lcd_remote_drawpixel, .drawline=&lcd_remote_drawline, .vline=&lcd_remote_vline, diff --git a/apps/screen_access.h b/apps/screen_access.h index fb7aa7bd26..6a4750dbb0 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h @@ -117,8 +117,8 @@ struct screen void (*update_viewport_rect)(int x, int y, int width, int height); void (*fillrect)(int x, int y, int width, int height); void (*drawrect)(int x, int y, int width, int height); - void (*fill_viewport)(const struct viewport *vp); - void (*draw_viewport)(const struct viewport *vp); + void (*fill_viewport_rect)(const struct viewport *vp); + void (*draw_viewport_rect)(const struct viewport *vp); void (*drawpixel)(int x, int y); void (*drawline)(int x1, int y1, int x2, int y2); 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 d242096138..d09d293c26 100644 --- a/firmware/drivers/lcd-bitmap-common.c +++ b/firmware/drivers/lcd-bitmap-common.c @@ -84,7 +84,7 @@ static void lcd_gradient_rect(int x1, int x2, int y, unsigned h, /* * draws the borders of the viewport, or of current_vp if vp == NULL **/ -void LCDFN(draw_viewport)(const struct viewport *vp) +void LCDFN(draw_viewport_rect)(const struct viewport *vp) { if (vp == NULL) LCDFN(drawrect)(0, 0, current_vp->width, current_vp->height); @@ -95,7 +95,7 @@ void LCDFN(draw_viewport)(const struct viewport *vp) /* * fills the rectangle formed by vp or by current_vp if vp == NULL **/ -void LCDFN(fill_viewport)(const struct viewport *vp) +void LCDFN(fill_viewport_rect)(const struct viewport *vp) { if (vp == NULL) LCDFN(fillrect)(0, 0, current_vp->width, current_vp->height); diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 894d35ca11..5a78fa2b07 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); extern void lcd_remote_vline(int x, int y1, int y2); extern void lcd_remote_drawrect(int x, int y, int width, int height); extern void lcd_remote_fillrect(int x, int y, int width, int height); -extern void lcd_remote_draw_viewport(const struct viewport *vp); -extern void lcd_remote_fill_viewport(const struct viewport *vp); +extern void lcd_remote_draw_viewport_rect(const struct viewport *vp); +extern void lcd_remote_fill_viewport_rect(const struct viewport *vp); extern void lcd_remote_bitmap_part(const fb_remote_data *src, int src_x, int src_y, int stride, int x, int y, int width, int height); diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 6dab8f4cad..3a01cbca61 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); extern void lcd_vline(int x, int y1, int y2); extern void lcd_drawrect(int x, int y, int width, int height); extern void lcd_fillrect(int x, int y, int width, int height); -extern void lcd_draw_viewport(const struct viewport *vp); -extern void lcd_fill_viewport(const struct viewport *vp); +extern void lcd_draw_viewport_rect(const struct viewport *vp); +extern void lcd_fill_viewport_rect(const struct viewport *vp); extern void lcd_bitmap_part(const fb_data *src, int src_x, int src_y, int stride, int x, int y, int width, int height); extern void lcd_bitmap(const fb_data *src, int x, int y, int width, -- cgit v1.2.3