Use UTF-8 for all SDL string parameters

Author: benstone

kauai/src/appbsdl.cpp

@@ -76,7 +76,9 @@ bool APPB::_FInitOS(void)
     // TODO: replace starting position with SDL_WINDOWPOS_UNDEFINED
     // TODO: set starting size properly
 
-    SDL_Window *wnd = SDL_CreateWindow(stnApp.Psz(), 64, 64, 640, 480, 0);
+    U8SZ u8szApp;
+    stnApp.GetUtf8Sz(u8szApp);
+    SDL_Window *wnd = SDL_CreateWindow(u8szApp, 64, 64, 640, 480, 0);
     Assert(wnd != pvNil, "no window returned from SDL_CreateWindow");
     if (wnd == pvNil)
     {
@@ -506,6 +508,9 @@ bool APPB::FAssertProcApp(PSZS pszsFile, int32_t lwLine, PSZS pszsMsg, void *pv,
     stn0.FAppendSz(PszLit("\n"));
     stn0.FAppendStn(&stn2);
 
+    U8SZ u8szMessage;
+    stn0.GetUtf8Sz(u8szMessage);
+
     SDL_MessageBoxButtonData rgbutton[3];
     FillPb(rgbutton, SIZEOF(rgbutton), 0);
 
@@ -519,7 +524,7 @@ bool APPB::FAssertProcApp(PSZS pszsFile, int32_t lwLine, PSZS pszsMsg, void *pv,
     SDL_MessageBoxData data = {0};
     data.buttons = rgbutton;
     data.numbuttons = 3;
-    data.message = stn0.Psz(); // TODO: UTF-8
+    data.message = u8szMessage;
     data.flags = SDL_MessageBoxFlags::SDL_MESSAGEBOX_ERROR;
     data.title = "Assertion Failure";
 
@@ -608,11 +613,17 @@ tribool APPB::TGiveAlertSz(const PCSZ psz, int32_t bk, int32_t cok)
         break;
     }
 
+    // Convert message to UTF-8
+    U8SZ u8szMessage;
+    STN stnMessage;
+    stnMessage.SetSz(psz);
+    stnMessage.GetUtf8Sz(u8szMessage);
+
     SDL_MessageBoxData data;
     ClearPb(&data, sizeof(data));
     data.buttons = rgbutton;
     data.numbuttons = ibutton;
-    data.message = psz; // TODO: UTF-8
+    data.message = u8szMessage;
     data.flags = SDL_MessageBoxFlags::SDL_MESSAGEBOX_ERROR;
     data.title = "3D Movie Maker";
 

kauai/src/fontsdl.cpp

@@ -319,8 +319,10 @@ SDL_RWops *SDLFontFile::GetFontRWops()
 {
     STN stnFontPath;
     _fniFont.GetStnPath(&stnFontPath);
+    U8SZ u8szFontPath;
+    stnFontPath.GetUtf8Sz(u8szFontPath);
 
-    SDL_RWops *rwops = SDL_RWFromFile(stnFontPath.Psz(), "rb");
+    SDL_RWops *rwops = SDL_RWFromFile(u8szFontPath, "rb");
     Assert(rwops != pvNil, "Opening file failed!");
     return rwops;
 }

kauai/src/gfxsdl.cpp

@@ -239,7 +239,9 @@ void GPT::UpdateTexture()
 
 void GPT::DumpBitmap(STN *stnBmp)
 {
-    AssertDoSDL(SDL_SaveBMP(_surface, stnBmp->Psz()));
+    U8SZ u8szFilePath;
+    stnBmp->GetUtf8Sz(u8szFilePath);
+    AssertDoSDL(SDL_SaveBMP(_surface, u8szFilePath));
 }
 
 /***************************************************************************
@@ -588,8 +590,9 @@ void GPT::DrawRgch(const achar *prgch, int32_t cch, PTS pts, GDD *pgdd, DSF *pds
     stnText.SetRgch(prgch, cch);
 
     // Draw text
-    // TODO: Convert string from CP1252 to a character set supported by SDL_TTF
-    surRendered = TTF_RenderText_Solid(ttfFont, stnText.Psz(), sdlcFore);
+    U8SZ u8szText;
+    stnText.GetUtf8Sz(u8szText);
+    surRendered = TTF_RenderUTF8_Solid(ttfFont, u8szText, sdlcFore);
     Assert(surRendered != pvNil, "TTF_RenderText failed");
 
     if (surRendered != pvNil)
@@ -639,7 +642,9 @@ void GPT::GetRcsFromRgch(RCS *prcs, const achar *prgch, int32_t cch, PTS pts, DS
 
     // Get bounding box of text with current font
     stnText.SetRgch(prgch, cch);
-    TTF_SizeText(ttfFont, stnText.Psz(), &dxpText, &dypText);
+    U8SZ u8szText;
+    stnText.GetUtf8Sz(u8szText);
+    AssertDoSDL(TTF_SizeUTF8(ttfFont, u8szText, &dxpText, &dypText));
 
     tmAscent = TTF_FontAscent(ttfFont);
     tmHeight = TTF_FontHeight(ttfFont);

kauai/src/gobsdl.cpp

@@ -170,7 +170,9 @@ void GOB::SetHwndName(PSTN pstn)
         RawRtn();
     }
 
-    SDL_SetWindowTitle((SDL_Window *)_hwnd, pstn->Psz());
+    U8SZ u8szTitle;
+    pstn->GetUtf8Sz(u8szTitle);
+    SDL_SetWindowTitle((SDL_Window *)_hwnd, u8szTitle);
 }
 
 /***************************************************************************