1 files changed, 62 insertions, 5 deletions

diff --git a/screen_ui.h b/screen_ui.h
index ea05bf1..78fcb9b 100644
--- a/screen_ui.h
+++ b/screen_ui.h
@@ -23,6 +23,9 @@
 #include "ui.h"
 #include "minui/minui.h"
 
+#define SYSBAR_BACK     0x01
+#define SYSBAR_HOME     0x02
+
 // Implementation of RecoveryUI appropriate for devices with a screen
 // (shows an icon + a progress bar, text logging, menu, etc.)
 class ScreenRecoveryUI : public RecoveryUI {
@@ -49,12 +52,28 @@ class ScreenRecoveryUI : public RecoveryUI {
 
     // printing messages
     void Print(const char* fmt, ...) __printflike(2, 3);
+    void PrintOnScreenOnly(const char* fmt, ...) __printflike(2, 3);
     void ShowFile(const char* filename);
 
+    void DialogShowInfo(const char* text);
+    void DialogShowError(const char* text);
+    void DialogShowErrorLog(const char* text);
+    int  DialogShowing() const { return (dialog_text != NULL); }
+    bool DialogDismissable() const { return (dialog_icon == D_ERROR); }
+    void DialogDismiss();
+    void SetHeadlessMode();
+
+    // sysbar
+    int  GetSysbarHeight() { return gr_get_height(sysbarBackHighlightIcon); }
+    int  GetSysbarState() { return sysbar_state; }
+    void SetSysbarState(int state);
+
     // menu display
+    virtual int MenuItemStart() const { return menu_item_start_; }
+    virtual int MenuItemHeight() const { return 3 * char_height_; }
     void StartMenu(const char* const * headers, const char* const * items,
                    int initial_selection);
-    int SelectMenu(int sel);
+    int SelectMenu(int sel, bool abs = false);
     void EndMenu();
 
     void KeyLongPress(int);
@@ -62,7 +81,7 @@ class ScreenRecoveryUI : public RecoveryUI {
     void Redraw();
 
     enum UIElement {
-        HEADER, MENU, MENU_SEL_BG, MENU_SEL_BG_ACTIVE, MENU_SEL_FG, LOG, TEXT_FILL, INFO
+        HEADER, MENU, MENU_SEL_BG, MENU_SEL_BG_ACTIVE, MENU_SEL_FG, LOG, TEXT_FILL, INFO, ERROR_TEXT
     };
     void SetColor(UIElement e);
 
@@ -73,8 +92,15 @@ class ScreenRecoveryUI : public RecoveryUI {
     bool rtl_locale;
 
     pthread_mutex_t updateMutex;
-    GRSurface* backgroundIcon[5];
-    GRSurface* backgroundText[5];
+    pthread_cond_t  progressCondition;
+
+    GRSurface* headerIcon;
+    GRSurface* sysbarBackIcon;
+    GRSurface* sysbarBackHighlightIcon;
+    GRSurface* sysbarHomeIcon;
+    GRSurface* sysbarHomeHighlightIcon;
+    GRSurface* backgroundIcon[NR_ICONS];
+    GRSurface* backgroundText[NR_ICONS];
     GRSurface** installation;
     GRSurface* progressBarEmpty;
     GRSurface* progressBarFill;
@@ -89,6 +115,7 @@ class ScreenRecoveryUI : public RecoveryUI {
     // true when both graphics pages are the same (except for the progress bar).
     bool pagesIdentical;
 
+    size_t log_text_cols_, log_text_rows_;
     size_t text_cols_, text_rows_;
 
     // Log text overlay, displayed when a magic key is pressed.
@@ -98,14 +125,26 @@ class ScreenRecoveryUI : public RecoveryUI {
     bool show_text;
     bool show_text_ever;   // has show_text ever been true?
 
+    Icon dialog_icon;
+    char *dialog_text;
+    bool dialog_show_log;
+
     char** menu_;
     const char* const* menu_headers_;
+    int header_items;
     bool show_menu;
     int menu_items, menu_sel;
 
+    int menu_show_start_;
+    int max_menu_rows_;
+
+    int sysbar_state;
+
     // An alternate text screen, swapped with 'text_' when we're viewing a log file.
     char** file_viewer_text_;
 
+    int menu_item_start_;
+
     pthread_t progress_thread_;
 
     int animation_fps;
@@ -115,16 +154,32 @@ class ScreenRecoveryUI : public RecoveryUI {
 
     int stage, max_stage;
 
+    bool rainbow;
+    int wrap_count;
+
+    int log_char_height_, log_char_width_;
+    int char_height_, char_width_;
+
+    int header_height_, header_width_;
+    int sysbar_height_;
+    int text_first_row_;
+
+    bool update_waiting;
+
     void draw_background_locked(Icon icon);
     void draw_progress_locked();
+    int  draw_header_icon();
+    void draw_menu_item(int textrow, const char *text, int selected);
+    void draw_sysbar();
+    void draw_dialog();
     void draw_screen_locked();
     void update_screen_locked();
-    void update_progress_locked();
 
     static void* ProgressThreadStartRoutine(void* data);
     void ProgressThreadLoop();
 
     void ShowFile(FILE*);
+    void PrintV(const char*, bool, va_list);
     void PutChar(char);
     void ClearText();
 
@@ -135,6 +190,8 @@ class ScreenRecoveryUI : public RecoveryUI {
     void LoadBitmap(const char* filename, GRSurface** surface);
     void LoadBitmapArray(const char* filename, int* frames, GRSurface*** surface);
     void LoadLocalizedBitmap(const char* filename, GRSurface** surface);
+
+    void OMGRainbows();
 };
 
 #endif  // RECOVERY_UI_H