diff --git a/rEFIt_UEFI/Platform/Settings.cpp b/rEFIt_UEFI/Platform/Settings.cpp index ad4428793..a79c01c36 100644 --- a/rEFIt_UEFI/Platform/Settings.cpp +++ b/rEFIt_UEFI/Platform/Settings.cpp @@ -4282,7 +4282,8 @@ InitTheme( } // Kill mouse before we invalidate builtin pointer image -// KillMouse(); + // KillMouse(); + //here we have no access to Mouse // Invalidate BuiltinIcons // DBG ("Invalidating BuiltinIcons...\n"); diff --git a/rEFIt_UEFI/libeg/XPointer.cpp b/rEFIt_UEFI/libeg/XPointer.cpp index 3a67e179d..7aaaf9918 100644 --- a/rEFIt_UEFI/libeg/XPointer.cpp +++ b/rEFIt_UEFI/libeg/XPointer.cpp @@ -41,7 +41,7 @@ XPointer::~XPointer() void XPointer::Hide() { - if (SimplePointerProtocol) { + if (Alive) { oldImage.Draw(oldPlace.XPos, oldPlace.YPos, 1.f); } } @@ -94,6 +94,7 @@ EFI_STATUS XPointer::MouseBirth() oldPlace.YPos = (INTN)(UGAHeight >> 2); oldPlace.Width = POINTER_WIDTH; oldPlace.Height = POINTER_HEIGHT; + DBG("init mouse at [%d, %d]\n", oldPlace.XPos, oldPlace.YPos); CopyMem(&newPlace, &oldPlace, sizeof(EG_RECT)); //newImage->Fill(&MenuBackgroundPixel), diff --git a/rEFIt_UEFI/refit/icns.cpp b/rEFIt_UEFI/refit/icns.cpp index 33f1b435a..3b3b5f526 100644 --- a/rEFIt_UEFI/refit/icns.cpp +++ b/rEFIt_UEFI/refit/icns.cpp @@ -135,17 +135,18 @@ EG_IMAGE * BuiltinIcon(IN UINTN Id) EG_IMAGE *TextBuffer = NULL; CONST CHAR16 *p; CHAR16 *Text; - +// DBG("Take image for %d\n", Id); if (Id >= BUILTIN_ICON_COUNT) { return NULL; } if (BuiltinIconTable[Id].Image != NULL) { +// DBG(" ... the image present\n"); return BuiltinIconTable[Id].Image; } Size = BuiltinIconTable[Id].PixelSize; - //DBG("Load Icon [id:%d]"); +// DBG("Load Icon [id:%d]"); if (ThemeDir && !GlobalConfig.TypeSVG) { CHAR16 *Path; diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp index 34c447e9c..c4922c07a 100644 --- a/rEFIt_UEFI/refit/menu.cpp +++ b/rEFIt_UEFI/refit/menu.cpp @@ -1373,7 +1373,12 @@ VOID AboutRefit(VOID) AboutMenu.TitleImage = NULL; } if (AboutMenu.Entries.size() == 0) { - AboutMenu.AddMenuInfo(PoolPrint(L"Clover Version 2.5k rev %s", gFirmwareRevision)); // by Slice, dmazar, apianti, JrCs, pene and others"); + AboutMenu.AddMenuInfo(PoolPrint(L"Clover Version 5.0")); +#ifdef REVISION_STR + AboutMenu.AddMenuInfo(PoolPrint(L" %a", REVISION_STR)); +#else + AboutMenu.AddMenuInfo(PoolPrint(L" Revision", gFirmwareRevision)); +#endif #ifdef FIRMWARE_BUILDDATE AboutMenu.AddMenuInfo(PoolPrint(L" Build: %a", FIRMWARE_BUILDDATE)); #else @@ -2168,7 +2173,8 @@ VOID REFIT_MENU_SCREEN::HidePointer() EFI_STATUS REFIT_MENU_SCREEN::MouseBirth() { - if ( !mPointer ) return RETURN_INVALID_PARAMETER; + + if ( !mPointer ) mPointer = new XPointer(); return mPointer->MouseBirth(); }