lua print_button script

also allow splash_scroller to be used as static text display

Change-Id: Idc8c9e60ada920e2d1abd5301b59bd235e21a1c2

2 files changed, 25 insertions, 21 deletions

diff --git a/apps/plugins/lua/rbdefines_helper.pl b/apps/plugins/lua/rbdefines_helper.pl
index eca09187fa..e788855e87 100755
--- a/apps/plugins/lua/rbdefines_helper.pl
+++ b/apps/plugins/lua/rbdefines_helper.pl
@@ -47,7 +47,7 @@ if ($def_type eq "rb_defines") {
         '^PLAYLIST_(INSERT|PREPEND|REPLACE)',
         '^TOUCHSCREEN_(POINT|BUTTON)$',
         '^SYS_CHARGER_(DIS|)CONNECTED$',
-        '^SYS_(TIMEOUT|POWEROFF)$',
+        '^SYS_(TIMEOUT|POWEROFF|BATTERY_UPDATE)$',
         '^SYS_USB_(DIS|)CONNECTED$',
         '^HOME_DIR$',
         '^PLUGIN_DIR$',
diff --git a/apps/plugins/lua/rockaux.c b/apps/plugins/lua/rockaux.c
index 25bace3451..73fe458889 100644
--- a/apps/plugins/lua/rockaux.c
+++ b/apps/plugins/lua/rockaux.c
@@ -133,28 +133,32 @@ int splash_scroller(int timeout, const char* str)
         }
 
         rb->lcd_update();
-
-        action = rb->get_action(CONTEXT_STD, timeout);
-        switch(action)
+        if (timeout >= TIMEOUT_BLOCK)
         {
-            case ACTION_STD_OK:
-            case ACTION_STD_CANCEL:
-                cycles--;
-            /* Fall Through */
-            case ACTION_NONE:
-                cycles--;
-                break;
-            case ACTION_STD_PREV:
-                timeout = TIMEOUT_BLOCK; /* disable timeout */
-                if(firstline > 0)
-                    firstline--;
-                break;
-            case ACTION_STD_NEXT:
-                timeout = TIMEOUT_BLOCK; /* disable timeout */
-                if (linesdisp == max_lines)
-                    firstline++;
-                break;
+            action = rb->get_action(CONTEXT_STD, timeout);
+            switch(action)
+            {
+                case ACTION_STD_OK:
+                case ACTION_STD_CANCEL:
+                    cycles--;
+                /* Fall Through */
+                case ACTION_NONE:
+                    cycles--;
+                    break;
+                case ACTION_STD_PREV:
+                    timeout = TIMEOUT_BLOCK; /* disable timeout */
+                    if(firstline > 0)
+                        firstline--;
+                    break;
+                case ACTION_STD_NEXT:
+                    timeout = TIMEOUT_BLOCK; /* disable timeout */
+                    if (linesdisp == max_lines)
+                        firstline++;
+                    break;
+            }
         }
+        else
+            break;
     }
     return action;
 }