mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-29 07:58:30 +02:00
Code Issues Releases Wiki Activity

Replace use of PHYSFS UTF-8 functions by UTF8.h

Browse Source 
This is a massive simplification of the UTF-8 work there, lol
This commit is contained in:
Dav999-v 2023-02-23 05:14:33 +01:00 committed by Misa Elizabeth Kai
parent a91c85d92e
commit 368b9f1b3d
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
desktop_version/src/VFormat.c
View File

@ -1,11 +1,11 @@
#include "VFormat.h" #include "VFormat.h"
#include <physfs.h>
#include <SDL.h> #include <SDL.h>
#include <stdbool.h> #include <stdbool.h>
#include "Alloc.h" #include "Alloc.h"
#include "CWrappers.h" #include "CWrappers.h"
#include "UTF8.h"
static inline bool is_whitespace(char ch) static inline bool is_whitespace(char ch)
@ -38,49 +38,25 @@ static inline void call_with_button(format_callback callback, void* userdata, in
button_value = 0xFF; button_value = 0xFF;
} }
uint32_t utf32[2]; UTF8_encoding utf8 = UTF8_encode(0xE000 + button_value);
utf32[0] = 0xE000 + button_value; callback(userdata, utf8.bytes, utf8.nbytes);
utf32[1] = 0x0000;
char utf8[5];
PHYSFS_utf8FromUcs4(utf32, utf8, sizeof(utf8));
callback(userdata, utf8, SDL_strlen(utf8));
} }
static inline void call_with_upper(format_callback callback, void* userdata, const char* string, size_t bytes) static inline void call_with_upper(format_callback callback, void* userdata, const char* string, size_t bytes)
{ {
/* Call the given callback with the specified string, where the first /* Call the given callback with the specified string, where the first
* letter is changed to uppercase. * letter is changed to uppercase. */
* First reserve some more space for the (in UTF-8) possibly larger if (bytes == 0)
* uppercase character, and the currently missing null terminator.
* (Theoretically 1->4 bytes, + 1 for '\0') */
size_t conv_bytes = bytes + 4;
char* utf8 = SDL_malloc(conv_bytes);
uint32_t* utf32 = SDL_malloc(conv_bytes*4);
if (utf8 == NULL || utf32 == NULL)
{ {
/* Never mind the capitalization then! Better than nothing. */
callback(userdata, string, bytes);
VVV_free(utf32);
VVV_free(utf8);
return; return;
} }
SDL_memcpy(utf8, string, bytes); uint8_t lower_letter_nbytes;
utf8[bytes] = '\0'; uint32_t lower_letter = UTF8_peek_next(string, &lower_letter_nbytes);
PHYSFS_utf8ToUcs4(utf8, utf32, conv_bytes*4); UTF8_encoding upper_letter = UTF8_encode(LOC_toupper_ch(lower_letter));
utf32[0] = LOC_toupper_ch(utf32[0]); callback(userdata, upper_letter.bytes, upper_letter.nbytes);
PHYSFS_utf8FromUcs4(utf32, utf8, conv_bytes); callback(userdata, &string[lower_letter_nbytes], bytes - lower_letter_nbytes);
callback(userdata, utf8, SDL_strlen(utf8));
VVV_free(utf32);
VVV_free(utf8);
} }