diff --git a/src/g_game.c b/src/g_game.c index 839aa69e1..0ab5bc894 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -6280,6 +6280,16 @@ void G_BeginRecording(void) // Full replay title demobuf.p += 64; { + char demotitlename[65]; + + // Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString + snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); + + // Init just in case it isn't initialized already + M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename)); + + // This will indirectly assign to demo.titlename too + M_TextInputSetString(&demo.titlenameinput, demotitlename); snprintf(demo.titlename, 64, "%s - %s", maptitle, modeattacking ? "Time Attack" : connectedservername); } @@ -8273,7 +8283,6 @@ void G_SaveDemo(void) boolean G_DemoTitleResponder(event_t *ev) { - size_t len; INT32 ch; if (ev->type != ev_keydown) @@ -8294,28 +8303,7 @@ boolean G_DemoTitleResponder(event_t *ev) return true; } - if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART]) - || ch == ' ') // Allow spaces, of course - { - len = strlen(demo.titlename); - if (len < 64) - { - demo.titlename[len+1] = 0; - demo.titlename[len] = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(ch) : CON_ShiftChar(ch); - } - } - else if (ch == KEY_BACKSPACE) - { - if (shiftdown) - memset(demo.titlename, 0, sizeof(demo.titlename)); - else - { - len = strlen(demo.titlename); - - if (len > 0) - demo.titlename[len-1] = 0; - } - } + M_TextInputHandle(&demo.titlenameinput, ch); return true; } diff --git a/src/g_game.h b/src/g_game.h index fb352bee9..ad4ce0e88 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -18,6 +18,7 @@ #include "doomstat.h" #include "d_event.h" #include "p_saveg.h" +#include "m_textinput.h" extern char gamedatafilename[64]; extern char timeattackfolder[64]; @@ -45,6 +46,7 @@ extern consvar_t cv_recordmultiplayerdemos, cv_netdemosyncquality, cv_maxdemosiz // Publicly-accessible demo vars struct demovars_s { char titlename[65]; + textinput_t titlenameinput; boolean recording, playback, timing; UINT16 version; // Current file format of the demo being played boolean title; // Title Screen demo can be cancelled by any key diff --git a/src/st_stuff.c b/src/st_stuff.c index e35b811e2..02235a41b 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -799,25 +799,78 @@ static void ST_overlayDrawer(void) } } -void ST_DrawDemoTitleEntry(void) +static void ST_DrawTextInput(INT32 x, INT32 y, textinput_t *input, INT32 flags) { static UINT8 skullAnimCounter = 0; - char *nametodraw; + static const INT32 MAXINPUTWIDTH = (MAXSTRINGLENGTH-1)*8; - skullAnimCounter++; + if (renderisnewtic) + skullAnimCounter++; skullAnimCounter %= 8; - nametodraw = demo.titlename; - while (V_StringWidth(nametodraw, 0) > MAXSTRINGLENGTH*8 - 8) - nametodraw++; + char nametodraw[MAXSTRINGLENGTH*2+1] = {0}; + size_t drawstart = 0; + + INT32 skullx = x; + + while (V_SubStringWidth(input->buffer+drawstart, input->cursor-drawstart, V_ALLOWLOWERCASE) > MAXINPUTWIDTH) + ++drawstart; + + memcpy(nametodraw, input->buffer+drawstart, V_SubStringLengthToFit(input->buffer+drawstart, MAXINPUTWIDTH+8, V_ALLOWLOWERCASE)+1); + + if (input->length) + skullx += V_SubStringWidth(nametodraw, input->cursor-drawstart, V_ALLOWLOWERCASE); + + V_DrawString(x, y, V_ALLOWLOWERCASE|flags, nametodraw); + + // draw text cursor for name + if (skullAnimCounter < 4) // blink cursor + V_DrawCharacter(skullx, y+3, '_'|flags, false); + + // draw selection + if (input->select != input->cursor) + { + size_t start = min(input->select, input->cursor); + size_t end = max(input->select, input->cursor); + + INT32 startx = 0; + INT32 width = 0; + + // I couldn't figure out one formula so here's bunch of separate cases + if (start < drawstart && end > drawstart + MAXSTRINGLENGTH) // Selection covers whole visible portion of demo name + { + startx = 0; + width = V_StringWidth(nametodraw, V_ALLOWLOWERCASE); + } + else if (start < drawstart) // Only left side of selection is off visible part + { + startx = 0; + size_t len = (end - start) - (drawstart - start); + width = V_SubStringWidth(nametodraw, len, V_ALLOWLOWERCASE); + } + else if (end > drawstart + MAXSTRINGLENGTH) // Only right side of selection is off visible part + { + startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE); + width = V_StringWidth(nametodraw+(start-drawstart), V_ALLOWLOWERCASE); + } + else // All selection is on visible part + { + startx = V_SubStringWidth(nametodraw, start-drawstart, V_ALLOWLOWERCASE); + width = V_SubStringWidth(nametodraw+(start-drawstart), end-start, V_ALLOWLOWERCASE); + } + + V_DrawFill(x+startx, y, width, 8, 103|V_TRANSLUCENT|flags); + } +} + +void ST_DrawDemoTitleEntry(void) +{ #define x (BASEVIDWIDTH/2 - 139) #define y (BASEVIDHEIGHT/2) M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); - V_DrawString(x + 8, y + 12, V_ALLOWLOWERCASE, nametodraw); - if (skullAnimCounter < 4) - V_DrawCharacter(x + 8 + V_StringWidth(nametodraw, 0), y + 12, - '_' | 0x80, false); + + ST_DrawTextInput(x + 8, y + 12, &demo.titlenameinput, 0); M_DrawTextBox(x + 30, y - 24, 26, 1); V_DrawString(x + 38, y - 16, V_ALLOWLOWERCASE, "Enter the name of the replay."); diff --git a/src/v_video.c b/src/v_video.c index 96c2e0811..ae6f19aa0 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -2983,6 +2983,45 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option) return w; } +// +// Find maximum length for substring taken from current string to fit into given width +// +INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option) +{ + INT32 c, w = 0; + INT32 spacewidth = 4, charwidth = 0; + INT32 i; + + switch (option & V_SPACINGMASK) + { + case V_MONOSPACE: + spacewidth = 8; + /* FALLTHRU */ + case V_OLDSPACING: + charwidth = 8; + break; + case V_6WIDTHSPACE: + spacewidth = 6; + default: + break; + } + + for (i = 0; string[i] && w < width; i++) + { + c = string[i]; + if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09 + continue; + + c = toupper(c) - HU_FONTSTART; + if (c < 0 || c >= HU_FONTSIZE || !hu_font[c]) + w += spacewidth; + else + w += (charwidth ? charwidth : SHORT(hu_font[c]->width)); + } + + return max(i-1, 0); +} + char V_GetSkincolorChar(INT32 color) { char cstart = 0x80; diff --git a/src/v_video.h b/src/v_video.h index 0dae04aaa..bc1e8c546 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -246,6 +246,9 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option); INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option); #define V_ThinStringWidth(string, option) V_ThinSubStringWidth(string, -1, option) +// Find maximum length for substring taken from current string to fit into given width +INT32 V_SubStringLengthToFit(const char *string, INT32 width, INT32 option); + char V_GetSkincolorChar(INT32 color); void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param);