4 files changed, 29 insertions, 0 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index d8417e13e2..5961bba7a5 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -572,6 +572,17 @@ void LCDFN(puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string
                               true, LCDFN(scroll_fn), NULL);
 }
 
+void LCDFN(putsxy_scroll_func)(int x, int y, const unsigned char *string,
+                                     void (*scroll_func)(struct scrollinfo *),
+                                     void *data, int x_offset)
+{
+    if (!scroll_func)
+        LCDFN(putsxyofs)(x, y, x_offset, string);
+    else
+        LCDFN(puts_scroll_worker)(x, y, string, STYLE_NONE, x_offset, 0,
+                              false, scroll_func, data);
+}
+
 void LCDFN(puts_scroll)(int x, int y, const unsigned char *string)
 {
     LCDFN(puts_scroll_style)(x, y, string, STYLE_DEFAULT);
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c
index db867cdb0a..54159519a3 100644
--- a/firmware/drivers/lcd-charcell.c
+++ b/firmware/drivers/lcd-charcell.c
@@ -563,6 +563,16 @@ void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
     lcd_scroll_info.lines++;
 }
 
+void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string,
+                                     void (*scroll_func)(struct scrollinfo *),
+                                     void *data, int x_offset)
+{
+    if (!scroll_func)
+        lcd_putsxyofs(x, y, x_offset, string);
+    else
+        lcd_puts_scroll_worker(x, y, string, x_offset, scroll_func, data);
+}
+
 void lcd_scroll_fn(struct scrollinfo* s)
 {
     lcd_putsxyofs(s->x, s->y, s->offset, s->line);
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index be6816cd7e..f209e6b47d 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -196,6 +196,9 @@ extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y,
                                                   const unsigned char *string,
                                                   int style, int x_offset,
                                                   int y_offset);
+extern void lcd_remote_putsxy_scroll_func(int x, int y, const unsigned char *string,
+                                          void (*scroll_func)(struct scrollinfo *),
+                                          void *data, int x_offset);
 
 extern void lcd_remote_update(void);
 extern void lcd_remote_update_rect(int x, int y, int width, int height);
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 7842ce59f2..745c445dda 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -108,6 +108,8 @@ enum screen_type {
 #endif
 };
 
+struct scrollinfo;
+
 #if   defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
 #define STRIDE_MAIN(w, h)   (h)
 #else
@@ -212,6 +214,9 @@ 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,
                                   int style);
+extern void lcd_putsxy_scroll_func(int x, int y, const unsigned char *string,
+                                   void (*scroll_func)(struct scrollinfo *),
+                                   void *data, int x_offset);
 
 #ifdef HAVE_LCD_BITMAP