Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-04-08 13:04:54 +03:00
parent 4be33ca401
commit b245ea17d4
4 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
View File

@ -1497,7 +1497,7 @@ INTN REFIT_MENU_SCREEN::DrawTextXY(IN const XStringW& Text, IN INTN XPos, IN INT
* as well we not know yet the font using but egRenderText calculate later real width
* so make a place to be large enoungh
*/
egMeasureText(Text.data(), &TextWidth, NULL);
ThemeX.MeasureText(Text, &TextWidth, NULL); //NULL means we already know Height
if (XAlign == X_IS_LEFT) {
TextWidth = UGAWidth - XPos - 1;
@ -1827,7 +1827,7 @@ VOID REFIT_MENU_SCREEN::GraphicsMenuStyle(IN UINTN Function, IN CONST CHAR16 *Pa
TimeoutPosY = EntriesPosY + (Entries.size() + 1) * ThemeX.TextHeight;
// initial painting
egMeasureText(Title.data(), &ItemWidth, NULL);
ThemeX.MeasureText(Title, &ItemWidth, NULL);
if (!(ThemeX.HideUIFlags & HIDEUI_FLAG_MENU_TITLE)) {
DrawTextXY(Title, (UGAWidth >> 1), EntriesPosY - ThemeX.TextHeight * 2, X_IS_CENTER);
}
@ -2451,7 +2451,7 @@ VOID REFIT_MENU_SCREEN::DrawMainMenuLabel(IN CONST XStringW& Text, IN INTN XPos,
INTN TextWidth = 0;
INTN BadgeDim = (INTN)(BADGE_DIMENSION * ThemeX.Scale);
egMeasureText(Text.wc_str(), &TextWidth, NULL);
ThemeX.MeasureText(Text, &TextWidth, NULL);
//Clear old text
// if (OldTextWidth > TextWidth) {

1
rEFIt_UEFI/libeg/XTheme.h
View File

@ -136,6 +136,7 @@ public:
//overload for UTF8 text
INTN RenderText(IN const XString& Text, OUT XImage* CompImage_ptr,
IN INTN PosX, IN INTN PosY, IN INTN Cursor, INTN textType);
VOID MeasureText(IN const XStringW& Text, OUT INTN *Width, OUT INTN *Height);
// void AddIcon(Icon& NewIcon); //return EFI_STATUS?

3
rEFIt_UEFI/libeg/libeg.h
View File

@ -496,10 +496,11 @@ VOID egFillImageArea(IN OUT EG_IMAGE *CompImage,
IN EG_PIXEL *Color);
VOID egComposeImage(IN OUT EG_IMAGE *CompImage, IN EG_IMAGE *TopImage, IN INTN PosX, IN INTN PosY);
VOID egMeasureText(IN CONST CHAR16 *Text, OUT INTN *Width, OUT INTN *Height);
#if USE_XTHEME
VOID egClearScreen(IN const void *Color);
#else
VOID egMeasureText(IN CONST CHAR16 *Text, OUT INTN *Width, OUT INTN *Height);
VOID PrepareFont(VOID);
VOID egClearScreen(IN EG_PIXEL *Color);
#endif

58
rEFIt_UEFI/libeg/text.cpp
View File

@ -33,7 +33,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
//Slice 2011 - 2016 numerous improvements, 2020 full rewritten
//Slice 2011 - 2016 numerous improvements, 2020 full rewritten for c++
extern "C" {
#include <Protocol/GraphicsOutput.h>
@ -82,13 +82,13 @@ NSVGfontChain *fontsDB = NULL;
//it is not good for vector theme
//it will be better to sum each letter width for the chosen font
// so one more parameter is TextStyle
VOID egMeasureText(IN CONST CHAR16 *Text, OUT INTN *Width, OUT INTN *Height)
VOID XTheme::MeasureText(IN const XStringW& Text, OUT INTN *Width, OUT INTN *Height)
{
INTN ScaledWidth = (INTN)(ThemeX.CharWidth * ThemeX.Scale);
INTN ScaledWidth = (INTN)(CharWidth * Scale);
if (Width != NULL)
*Width = StrLen(Text) * ((ThemeX.FontWidth > ScaledWidth)?ThemeX.FontWidth:ScaledWidth);
*Width = Text.length() * ((FontWidth > ScaledWidth) ? FontWidth : ScaledWidth);
if (Height != NULL)
*Height = ThemeX.FontHeight;
*Height = FontHeight;
}
#else
@ -458,19 +458,14 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
{
XImage& CompImage = *CompImage_ptr;
// EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BufferPtr;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL FontPixel;
// EFI_GRAPHICS_OUTPUT_BLT_PIXEL *FirstPixelBuf;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL FirstPixel;
// INTN BufferLineWidth; //, BufferLineOffset, FontLineOffset;
INTN TextLength /*, NewTextLength = 0 */;
INTN TextLength;
INTN Shift = 0;
UINTN Cho = 0, Jong = 0, Joong = 0;
INTN LeftSpace, RightSpace;
INTN RealWidth = 0;
// INTN ScaledWidth = (INTN)(CharWidth * Scale); //real char width in pixels
// but raster theme Scale=1 while SVG theme has own render
if (TypeSVG) {
return renderSVGtext(&CompImage, PosX, PosY, textType, Text, Cursor);
}
@ -479,26 +474,12 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
TextLength = Text.size();
DBG("text to render %ls length %lld\n", Text.wc_str(), Text.size());
if (FontImage.isEmpty()) {
// GlobalConfig.Font = FONT_ALFA;
PrepareFont(); //at the boot screen there is embedded font
}
// DBG("TextLength =%d PosX=%d PosY=%d\n", TextLength, PosX, PosY);
// render it
// BufferPtr = CompImage.GetPixelPtr(0,0);
// BufferLineOffset = CompImage.GetWidth();
// BufferLineWidth = CompImage.GetWidth() - PosX; // width from PosX to buffer end
// BufferPtr += PosX + PosY * BufferLineOffset; //how to avoid pointer arithmetics?
// BufferPtr = CompImage.GetPixelPtr(PosX, PosY); //a place to write the text
// FirstPixelBuf = BufferPtr;
FirstPixel = CompImage.GetPixel(0,0);
FontPixel = FontImage.GetPixel(0,0);
// FontLineOffset = FontImage.GetWidth();
// DBG("BufferLineOffset=%d FontLineOffset=%d\n", BufferLineOffset, FontLineOffset);
// if (ScaledWidth < FontWidth) {
// Shift = (FontWidth - ScaledWidth) >> 1;
// }
UINT16 c0 = 0;
RealWidth = CharWidth;
DBG("FontWidth=%lld, CharWidth=%lld\n", FontWidth, RealWidth);
@ -512,7 +493,7 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
DBG("codepage=%llx, asciiPage=%x\n", GlobalConfig.Codepage, AsciiPageSize);
for (INTN i = 0; i < TextLength; i++) {
UINT16 c = Text[i];
DBG("initial char to render 0x%x\n", c); //good
// DBG("initial char to render 0x%x\n", c); //good
if (gLanguage != korean) { //russian Codepage = 0x410
if (c >= 0x410 && c < 0x450) {
//we have russian raster fonts with chars at 0xC0
@ -521,7 +502,7 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
INTN c2 = (c >= GlobalConfig.Codepage) ? (c - GlobalConfig.Codepage + AsciiPageSize) : c; //International letters
c = c2 & 0xFF; //this maximum raster font size
}
DBG("char to render 0x%x\n", c);
// DBG("char to render 0x%x\n", c);
if (Proportional) {
//find spaces {---comp--__left__|__right__--char---}
if (c0 <= 0x20) { // space before or at buffer edge
@ -544,7 +525,7 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
LeftSpace = 2;
RightSpace = 0;
}
DBG(" RealWidth = %lld LeftSpace = %lld RightSpace = %lld\n", RealWidth, LeftSpace, RightSpace);
// DBG(" RealWidth = %lld LeftSpace = %lld RightSpace = %lld\n", RealWidth, LeftSpace, RightSpace);
c0 = c; //old value
if (PosX + RealWidth > CompImage.GetWidth()) {
//no more place for character
@ -554,7 +535,7 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
Area.XPos = PosX + 2 - LeftSpace;
Area.Width = RealWidth;
Bukva.XPos = c * FontWidth + RightSpace;
DBG("place [%lld,%lld,%lld,%lld], bukva [%lld,%lld,%lld,%lld]\n",
// DBG("place [%lld,%lld,%lld,%lld], bukva [%lld,%lld,%lld,%lld]\n",
Area.XPos, Area.YPos, Area.Width, Area.Height,
Bukva.XPos, Bukva.YPos, Bukva.Width, Bukva.Height);
// Bukva.YPos
@ -601,24 +582,16 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
Bukva.XPos = Cho * FontWidth + 4;
Bukva.YPos = 1;
CompImage.Compose(Area, Bukva, FontImage, false);
// egRawCompose(BufferPtr, FontPixelData + Cho * FontWidth + 4 + FontLineOffset,
// ScaledWidth, FontHeight,
// BufferLineOffset, FontLineOffset);
} else {
Area.YPos = PosY + 3;
Bukva.XPos = Cho * FontWidth + 2;
Bukva.YPos = 0;
// egRawCompose(BufferPtr + BufferLineOffset * 3, FontPixelData + Cho * FontWidth + 2,
// ScaledWidth, FontHeight,
// BufferLineOffset, FontLineOffset);
CompImage.Compose(Area, Bukva, FontImage, false);
}
if (i == Cursor) {
c = 99;
Bukva.XPos = c * FontWidth + 2;
CompImage.Compose(Area, Bukva, FontImage, false);
// egRawCompose(BufferPtr, FontPixelData + c * FontWidth + 2,
// ScaledWidth, FontHeight,
// BufferLineOffset, FontLineOffset);
}
if (Shift == 18) {
Area.XPos = PosX + 9;
@ -626,17 +599,10 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr,
Bukva.XPos = Joong * FontWidth + 6;
Bukva.YPos = 0;
CompImage.Compose(Area, Bukva, FontImage, false);
// egRawCompose(BufferPtr + 9, FontPixelData + Joong * FontWidth + 6, //9 , 4 are tunable
// ScaledWidth - 8, FontHeight,
// BufferLineOffset, FontLineOffset);
Area.XPos = PosX;
Area.YPos = PosY + 9;
Bukva.XPos = Jong * FontWidth + 1;
// Bukva.YPos = 0;
// Area.Width = CharWidth;
// egRawCompose(BufferPtr + BufferLineOffset * 9, FontPixelData + Jong * FontWidth + 1,
// ScaledWidth, FontHeight - 3,
// BufferLineOffset, FontLineOffset);
CompImage.Compose(Area, Bukva, FontImage, false);
}