thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-05 17:56:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Menus: handle caret codes in text fields

Browse source 
- All text boxes render caret code colors
- On-screen keyboard updates colors in real time
This commit is contained in:
James R 2024-02-02 04:28:18 -08:00
parent a5c4b3705f
commit 3646850ff6
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_menudraw.c
View file

@ -69,6 +69,7 @@
#include "i_time.h"
#include "m_easing.h"
#include "sanitize.h"
#ifdef PC_DOS
#include <stdio.h> // for snprintf
@ -532,12 +533,12 @@ static void M_DrawMenuTyping(void)
V_DrawFill(x + 4, y + 4 + 5, 1, 8+6, 121);
V_DrawFill(x + 5 + boxwidth - 8, y + 4 + 5, 1, 8+6, 121);
V_DrawString(x + 8, y + 12, 0, menutyping.cache);
INT32 textwidth = M_DrawCaretString(x + 8, y + 12, menutyping.cache, true);
if (skullAnimCounter < 4
&& menutyping.menutypingclose == false
&& menutyping.menutypingfade == (menutyping.keyboardtyping ? 9 : 18))
{
V_DrawCharacter(x + 8 + V_StringWidth(menutyping.cache, 0), y + 12 + 1, '_', false);
V_DrawCharacter(x + 8 + textwidth, y + 12 + 1, '_', false);
}
const INT32 buttonwidth = ((boxwidth + 1)/NUMVIRTUALKEYSINROW);
@ -4493,7 +4494,7 @@ box_found:
V_DrawMenuString(x + (skullAnimCounter/5) + 7, y + 9, highlightflags, "\x1D");
}
V_DrawString(x + xoffs + 8, y + 9, 0, cv->string);
M_DrawCaretString(x + xoffs + 8, y + 9, cv->string, false);
y += LINEHEIGHT;
}

10
src/sanitize.cpp
View file

@ -15,6 +15,7 @@
#include "doomtype.h"
#include "sanitize.h"
#include "v_draw.hpp"
using namespace srb2::sanitize;
@ -131,3 +132,12 @@ void D_ParseCarets(char *out, const char *in, size_t out_size)
{
strlcpy(out, parse_carets(in, ParseMode::kConsume).c_str(), out_size);
}
INT32 M_DrawCaretString(INT32 x, INT32 y, const char *string, boolean preserve)
{
using srb2::Draw;
Draw::TextElement text(parse_carets(string, preserve ? ParseMode::kPreserve : ParseMode::kConsume));
text.font(Draw::Font::kConsole);
Draw(x, y).text(text);
return text.width();
}

3
src/sanitize.h
View file

@ -45,6 +45,9 @@ extern "C" {
void D_SanitizeKeepColors(char *out, const char *in, size_t out_size); // SanitizeMode::kKeepColors
void D_ParseCarets(char *out, const char *in, size_t out_size); // ParseMode::kConsume
// returns string width in pixels
INT32 M_DrawCaretString(INT32 x, INT32 y, const char *string, boolean preserve);
#ifdef __cplusplus
} // extern "C"
#endif