Merge commit '66d7ba273b64a6dd5987c32b5c3bc849b9fa9f16'

[refind] / refind / screen.h

diff --git a/refind/screen.h b/refind/screen.h
index 1b2dfa641faa75c8dada94d906ed2237c4f19538..9a1c911de0604e7679b4bc0a75c804bc8140e903 100644 (file)
--- a/refind/screen.h
+++ b/refind/screen.h
@@ -37,8 +37,12 @@
 #ifndef __SCREEN_H_
 #define __SCREEN_H_
 
+#ifdef __MAKEWITH_GNUEFI
 #include "efi.h"
 #include "efilib.h"
+#else
+#include "../include/tiano_includes.h"
+#endif
 
 #include "libeg.h"
 
@@ -46,6 +50,8 @@
 // screen module
 //
 
+#define DONT_CHANGE_TEXT_MODE 1024 /* textmode # that's a code to not change the text mode */
+
 #define ATTR_BASIC (EFI_LIGHTGRAY | EFI_BACKGROUND_BLACK)
 #define ATTR_ERROR (EFI_YELLOW | EFI_BACKGROUND_BLACK)
 #define ATTR_BANNER (EFI_WHITE | EFI_BACKGROUND_BLUE)
@@ -54,13 +60,11 @@
 #define ATTR_SCROLLARROW (EFI_LIGHTGREEN | EFI_BACKGROUND_BLACK)
 
 //#define LAYOUT_TEXT_WIDTH (512)
-#define LAYOUT_TEXT_WIDTH (425)
-#define LAYOUT_TOTAL_HEIGHT (368)
-#define LAYOUT_BANNER_HEIGHT (32)
-#define LAYOUT_BANNER_YOFFSET (LAYOUT_BANNER_HEIGHT + 32)
+//#define LAYOUT_TEXT_WIDTH (425)
+#define LAYOUT_BANNER_YGAP 32
 
-#define FONT_CELL_WIDTH (7)
-#define FONT_CELL_HEIGHT (12)
+//#define FONT_CELL_WIDTH (7)
+//#define FONT_CELL_HEIGHT (12)
 
 extern UINTN ConWidth;
 extern UINTN ConHeight;
@@ -80,17 +84,23 @@ VOID FinishTextScreen(IN BOOLEAN WaitAlways);
 VOID BeginExternalScreen(IN BOOLEAN UseGraphicsMode, IN CHAR16 *Title);
 VOID FinishExternalScreen(VOID);
 VOID TerminateScreen(VOID);
+VOID DrawScreenHeader(IN CHAR16 *Title);
+
 #if REFIT_DEBUG > 0
 VOID DebugPause(VOID);
 #else
 #define DebugPause()
 #endif
 VOID EndlessIdleLoop(VOID);
+BOOLEAN ReadAllKeyStrokes(VOID);
 VOID PauseForKey(VOID);
 
 BOOLEAN CheckFatalError(IN EFI_STATUS Status, IN CHAR16 *where);
 BOOLEAN CheckError(IN EFI_STATUS Status, IN CHAR16 *where);
 
+VOID SwitchToText(IN BOOLEAN CursorEnabled);
+VOID SwitchToGraphics(VOID);
+
 VOID SwitchToGraphicsAndClear(VOID);
 VOID BltClearScreen(IN BOOLEAN ShowBanner);
 VOID BltImage(IN EG_IMAGE *Image, IN UINTN XPos, IN UINTN YPos);