Improvements to icon- and banner-positioning code. Fixes crash if

[refind] / refind / screen.h

diff --git a/refind/screen.h b/refind/screen.h
index 1b2dfa641faa75c8dada94d906ed2237c4f19538..2647fc79d65a2656ab82c8ef7f2a21fd1512b12f 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)
@@ -55,9 +61,7 @@
 
 //#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_BANNER_YGAP 32
 
 #define FONT_CELL_WIDTH (7)
 #define FONT_CELL_HEIGHT (12)
@@ -91,6 +95,9 @@ 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);
@@ -98,4 +105,6 @@ VOID BltImageAlpha(IN EG_IMAGE *Image, IN UINTN XPos, IN UINTN YPos, IN EG_PIXEL
 //VOID BltImageComposite(IN EG_IMAGE *BaseImage, IN EG_IMAGE *TopImage, IN UINTN XPos, IN UINTN YPos);
 VOID BltImageCompositeBadge(IN EG_IMAGE *BaseImage, IN EG_IMAGE *TopImage, IN EG_IMAGE *BadgeImage, IN UINTN XPos, IN UINTN YPos);
 
+BOOLEAN line_edit(CHAR16 *line_in, CHAR16 **line_out, UINTN x_max);
+
 #endif