From 6b9c7906980a6b111cb1b137999ccc9b1327398e Mon Sep 17 00:00:00 2001
From: georgemoralis <giorgosmrls@gmail.com>
Date: Fri, 14 Mar 2025 12:26:53 +0200
Subject: [PATCH] added sceFontStyleFrameGetScalePixel

---
 src/core/libraries/font/font.cpp | 45 +++++++++++++++++++++++++++++---
 src/core/libraries/font/font.h   | 20 +++++++++-----
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/core/libraries/font/font.cpp b/src/core/libraries/font/font.cpp
index 1c3af47e6..415c86281 100644
--- a/src/core/libraries/font/font.cpp
+++ b/src/core/libraries/font/font.cpp
@@ -817,6 +817,7 @@ void PS4_SYSV_ABI sceFontRenderSurfaceSetScissor(OrbisFontRenderSurface* renderS
 s32 PS4_SYSV_ABI sceFontRenderSurfaceSetStyleFrame(OrbisFontRenderSurface* renderSurface,
                                                    OrbisFontStyleFrame* styleFrame) {
     if (!renderSurface) {
+        LOG_ERROR(Lib_Font, "Invalid Parameter");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
@@ -825,6 +826,7 @@ s32 PS4_SYSV_ABI sceFontRenderSurfaceSetStyleFrame(OrbisFontRenderSurface* rende
     } else {
         // Validate magic number
         if (styleFrame->magic != 0xF09) {
+            LOG_ERROR(Lib_Font, "Invalid magic");
             return ORBIS_FONT_ERROR_INVALID_PARAMETER;
         }
 
@@ -925,21 +927,24 @@ s32 PS4_SYSV_ABI sceFontStringRefersTextCharacters() {
 s32 PS4_SYSV_ABI sceFontStyleFrameGetEffectSlant(OrbisFontStyleFrame* styleFrame,
                                                  float* slantRatio) {
     if (!styleFrame) {
-        printf("[ERROR] Style frame is NULL.\n");
+        LOG_ERROR(Lib_Font, "Invalid Parameter");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
     // Validate the magic number
     if (styleFrame->magic != 0xF09) {
+        LOG_ERROR(Lib_Font, "Invalid Magic");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
     // Check if the slant effect is enabled (bit 1 in flags)
     if (!(styleFrame->flags & 0x02)) {
+        LOG_ERROR(Lib_Font, "Flag not set");
         return ORBIS_FONT_ERROR_UNSET_PARAMETER;
     }
 
     if (!slantRatio) {
+        LOG_ERROR(Lib_Font, "Invalid Parameter");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
@@ -952,16 +957,19 @@ s32 PS4_SYSV_ABI sceFontStyleFrameGetEffectWeight(OrbisFontStyleFrame* fontStyle
                                                   float* weightXScale, float* weightYScale,
                                                   uint32_t* mode) {
     if (!fontStyleFrame) {
+        LOG_ERROR(Lib_Font, "Invalid Parameter");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
     // Validate the magic number
     if (fontStyleFrame->magic != 0xF09) {
+        LOG_ERROR(Lib_Font, "Magic not set");
         return ORBIS_FONT_ERROR_INVALID_PARAMETER;
     }
 
     // Check if the weight effect is enabled (bit 2 in flags)
     if (!(fontStyleFrame->flags & 0x04)) {
+        LOG_ERROR(Lib_Font, "Flag not set");
         return ORBIS_FONT_ERROR_UNSET_PARAMETER;
     }
 
@@ -985,8 +993,39 @@ s32 PS4_SYSV_ABI sceFontStyleFrameGetResolutionDpi() {
     return ORBIS_OK;
 }
 
-s32 PS4_SYSV_ABI sceFontStyleFrameGetScalePixel() {
-    LOG_ERROR(Lib_Font, "(STUBBED) called");
+s32 PS4_SYSV_ABI sceFontStyleFrameGetScalePixel(OrbisFontStyleFrame* styleFrame, float* w,
+                                                float* h) {
+    if (!styleFrame) {
+        LOG_ERROR(Lib_Font, "Invalid Parameter");
+        return ORBIS_FONT_ERROR_INVALID_PARAMETER;
+    }
+
+    if (styleFrame->magic != 0xF09) {
+        LOG_ERROR(Lib_Font, "Invalid magic");
+        return ORBIS_FONT_ERROR_INVALID_PARAMETER;
+    }
+
+    if (!(styleFrame->flags & 0x01)) {
+        LOG_ERROR(Lib_Font, "Scaling effect parameter not set");
+        return ORBIS_FONT_ERROR_UNSET_PARAMETER;
+    }
+
+    // Check if scaling is allowed
+    int isScalingEnabled = styleFrame->scalingFlag;
+    if (w) {
+        *w = styleFrame->scaleWidth;
+        if (isScalingEnabled && styleFrame->dpiX) {
+            *w *= ((float)styleFrame->dpiX / 72.0f);
+        }
+    }
+
+    if (h) {
+        *h = styleFrame->scaleHeight;
+        if (isScalingEnabled && styleFrame->dpiY) {
+            *h *= ((float)styleFrame->dpiY / 72.0f);
+        }
+    }
+
     return ORBIS_OK;
 }
 
diff --git a/src/core/libraries/font/font.h b/src/core/libraries/font/font.h
index 4a5cddf9c..a8e239126 100644
--- a/src/core/libraries/font/font.h
+++ b/src/core/libraries/font/font.h
@@ -40,12 +40,17 @@ struct OrbisFontRenderSurface {
 };
 
 struct OrbisFontStyleFrame {
-    u16 magic; // Expected to be 0xF09
-    u16 flags;
-    //
-    float weightXScale; // 0x1c
-    float weightYScale; // 0x20
-    float slantRatio;   // 0x24
+    /*0x00*/ u16 magic; // Expected to be 0xF09
+    /*0x02*/ u16 flags;
+    /*0x04*/ s32 dpiX;          // DPI scaling factor for width
+    /*0x08*/ s32 dpiY;          // DPI scaling factor for height
+    /*0x0c*/ s32 scalingFlag;   // Indicates whether scaling is enabled
+                                /*0x10*/
+    /*0x14*/ float scaleWidth;  // Width scaling factor
+    /*0x18*/ float scaleHeight; // Height scaling factor
+    /*0x1c*/ float weightXScale;
+    /*0x20*/ float weightYScale;
+    /*0x24*/ float slantRatio;
 };
 
 s32 PS4_SYSV_ABI sceFontAttachDeviceCacheBuffer();
@@ -220,7 +225,8 @@ s32 PS4_SYSV_ABI sceFontStyleFrameGetEffectWeight(OrbisFontStyleFrame* fontStyle
                                                   float* weightXScale, float* weightYScale,
                                                   uint32_t* mode);
 s32 PS4_SYSV_ABI sceFontStyleFrameGetResolutionDpi();
-s32 PS4_SYSV_ABI sceFontStyleFrameGetScalePixel();
+s32 PS4_SYSV_ABI sceFontStyleFrameGetScalePixel(OrbisFontStyleFrame* styleFrame, float* w,
+                                                float* h);
 s32 PS4_SYSV_ABI sceFontStyleFrameGetScalePoint();
 s32 PS4_SYSV_ABI sceFontStyleFrameInit();
 s32 PS4_SYSV_ABI sceFontStyleFrameSetEffectSlant();