summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/screen_access.c2
-rw-r--r--apps/screen_access.h1
-rw-r--r--firmware/drivers/lcd-bitmap-common.c5
-rw-r--r--firmware/drivers/lcd-charcell.c33
-rw-r--r--firmware/export/lcd-remote.h2
-rw-r--r--firmware/export/lcd.h1
6 files changed, 17 insertions, 27 deletions
diff --git a/apps/screen_access.c b/apps/screen_access.c
index 7ebc45b8fd..c8f47ed0f6 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -266,7 +266,6 @@ struct screen screens[NB_SCREENS] =
.putsxy=&lcd_putsxy,
.puts=&lcd_puts,
.putsf=&lcd_putsf,
- .puts_offset=&lcd_puts_offset,
.puts_scroll=&lcd_puts_scroll,
.putsxy_scroll_func=&lcd_putsxy_scroll_func,
.scroll_speed=&lcd_scroll_speed,
@@ -368,7 +367,6 @@ struct screen screens[NB_SCREENS] =
.putsxy=&lcd_remote_putsxy,
.puts=&lcd_remote_puts,
.putsf=&lcd_remote_putsf,
- .puts_offset=&lcd_remote_puts_offset,
.puts_scroll=&lcd_remote_puts_scroll,
.putsxy_scroll_func=&lcd_remote_putsxy_scroll_func,
.scroll_speed=&lcd_remote_scroll_speed,
diff --git a/apps/screen_access.h b/apps/screen_access.h
index c21d9cdb63..1d120f7bb0 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -139,7 +139,6 @@ struct screen
void (*putsxy)(int x, int y, const unsigned char *str);
void (*puts)(int x, int y, const unsigned char *str);
void (*putsf)(int x, int y, const unsigned char *str, ...);
- void (*puts_offset)(int x, int y, const unsigned char *str, int offset);
void (*puts_scroll)(int x, int y, const unsigned char *string);
void (*putsxy_scroll_func)(int x, int y, const unsigned char *string,
void (*scroll_func)(struct scrollinfo *),
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 00d317c9c8..2219b6de78 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -494,11 +494,6 @@ void LCDFN(puts_style)(int x, int y, const unsigned char *str, int style)
LCDFN(puts_style_offset)(x, y, str, style, 0);
}
-void LCDFN(puts_offset)(int x, int y, const unsigned char *str, int offset)
-{
- LCDFN(puts_style_offset)(x, y, str, STYLE_DEFAULT, offset);
-}
-
/*** scrolling ***/
static struct scrollinfo* find_scrolling_line(int x, int y)
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c
index c3b1482a3b..6a6e57e992 100644
--- a/firmware/drivers/lcd-charcell.c
+++ b/firmware/drivers/lcd-charcell.c
@@ -477,10 +477,25 @@ void lcd_putsxyf(int x, int y, const unsigned char *fmt, ...)
/*** Line oriented text output ***/
+/* Put a string at a given char position, skipping first offset chars */
+void lcd_putsofs(int x, int y, const unsigned char *str, int offset)
+{
+ if ((unsigned)y >= (unsigned)current_vp->height)
+ return;
+
+ /* make sure scrolling is turned off on the line we are updating */
+ lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
+
+ x = lcd_putsxyofs(x, y, offset, str);
+ while (x < current_vp->width)
+ lcd_putxchar(x++, y, xspace);
+}
+
+
/* Put a string at a given char position */
void lcd_puts(int x, int y, const unsigned char *str)
{
- lcd_puts_offset(x, y, str, 0);
+ lcd_putsofs(x, y, str, 0);
}
/* Formatting version of lcd_puts */
@@ -494,20 +509,6 @@ void lcd_putsf(int x, int y, const unsigned char *fmt, ...)
lcd_puts(x, y, buf);
}
-/* Put a string at a given char position, skipping first offset chars */
-void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
-{
- if ((unsigned)y >= (unsigned)current_vp->height)
- return;
-
- /* make sure scrolling is turned off on the line we are updating */
- lcd_scroll_stop_viewport_rect(current_vp, x, y, current_vp->width - x, 1);
-
- x = lcd_putsxyofs(x, y, offset, str);
- while (x < current_vp->width)
- lcd_putxchar(x++, y, xspace);
-}
-
/** scrolling **/
void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
@@ -529,7 +530,7 @@ void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
s->start_tick = current_tick + lcd_scroll_info.delay;
- lcd_puts_offset(x, y, string, offset);
+ lcd_putsofs(x, y, string, offset);
len = utf8length(string);
if (current_vp->width - x >= len)
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 5eb08b618f..347a46e8bd 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -177,8 +177,6 @@ extern void lcd_remote_puts(int x, int y, const unsigned char *str);
extern void lcd_remote_putsf(int x, int y, const unsigned char *fmt, ...);
extern void lcd_remote_puts_style(int x, int y, const unsigned char *str,
int style);
-extern void lcd_remote_puts_offset(int x, int y, const unsigned char *str,
- int offset);
extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str,
int style, int offset);
extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str,
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index dd7c3ba80f..7c361d4097 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -207,7 +207,6 @@ extern void lcd_putsxy_style_offset(int x, int y, const unsigned char *str,
extern void lcd_puts(int x, int y, const unsigned char *string);
extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...);
extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
-extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset);
extern void lcd_putc(int x, int y, unsigned long ucs);
extern void lcd_puts_scroll(int x, int y, const unsigned char* string);
extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,