--- hatari/src/includes/statusbar.h	2019/04/01 07:14:51	1.1.1.1
+++ hatari/src/includes/statusbar.h	2019/04/09 08:59:29	1.1.1.6
@@ -1,14 +1,16 @@
 /*
   Hatari - statusbar.h
   
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 #ifndef HATARI_STATUSBAR_H
 #define HATARI_STATUSBAR_H
 
-#include <SDL.h>
-#include "main.h"
+#include <SDL_video.h>
+
+/* must correspond to max value returned by Statusbar_GetHeightForSize() */
+#define STATUSBAR_MAX_HEIGHT (2*(2*8+2))
 
 typedef enum {
 	DRIVE_LED_A,
@@ -16,16 +18,25 @@ typedef enum {
 	DRIVE_LED_HD
 } drive_index_t;
 
+typedef enum {
+	LED_STATE_OFF,
+	LED_STATE_ON,
+	LED_STATE_ON_BUSY,
+	MAX_LED_STATE
+} drive_led_t;
+
+
 extern int Statusbar_SetHeight(int ScreenWidth, int ScreenHeight);
+extern int Statusbar_GetHeightForSize(int width, int height);
 extern int Statusbar_GetHeight(void);
-extern void Statusbar_EnableHDLed(void);
-extern void Statusbar_SetFloppyLed(drive_index_t drive, bool state);
+extern void Statusbar_EnableHDLed(drive_led_t state);
+extern void Statusbar_SetFloppyLed(drive_index_t drive, drive_led_t state);
 
 extern void Statusbar_Init(SDL_Surface *screen);
 extern void Statusbar_UpdateInfo(void);
 extern void Statusbar_AddMessage(const char *msg, Uint32 msecs);
 extern void Statusbar_OverlayBackup(SDL_Surface *screen);
-extern void Statusbar_Update(SDL_Surface *screen);
+extern SDL_Rect* Statusbar_Update(SDL_Surface *screen, bool do_update);
 extern void Statusbar_OverlayRestore(SDL_Surface *screen);
 
 #endif /* HATARI_STATUSBAR_H */