stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-20 19:02:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete.

Browse source 
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
This commit is contained in:
GoldenTails 2019-12-29 20:15:18 -06:00
parent ae9adce873
commit 9d701d722e
1 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/m_menu.c
View file

@ -10424,13 +10424,15 @@ static void M_HandleConnectIP(INT32 choice)
break;
case KEY_DEL:
if (setupm_ip[0])
if (setupm_ip[0] && !shiftdown) // Shift+Delete is used for something else.
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[0] = 0;
}
break;
if (!shiftdown) // Shift+Delete is used for something else.
break;
/* FALLTHRU */
default:
l = strlen(setupm_ip);
@ -10438,18 +10440,17 @@ static void M_HandleConnectIP(INT32 choice)
switch (choice) {
case 'v':
case 'V': // ctrl+v, pasting
;
char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
{
const char *paste = I_ClipboardPaste();
if (paste != NULL) {
if (strlen(paste) + l >= 28-1)
paste[28-1 - l] = 0;
strcat(setupm_ip, paste); // Concat the ip field with clipboard
strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
if (strlen(paste) != 0) // Don't play sound if nothing was pasted
S_StartSound(NULL,sfx_menu1); // Tails
}
break;
}
case 'c':
case 'C': // ctrl+c, copying
I_ClipboardCopy(setupm_ip, l);
@ -10469,6 +10470,31 @@ static void M_HandleConnectIP(INT32 choice)
break; // don't check for typed keys
}
if ( shiftdown ) {
switch (choice) {
case KEY_INS:
{
const char *paste = I_ClipboardPaste();
if (paste != NULL) {
strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
if (strlen(paste) != 0) // Don't play sound if nothing was pasted
S_StartSound(NULL,sfx_menu1); // Tails
}
break;
}
case KEY_DEL: // shift+delete, cutting
I_ClipboardCopy(setupm_ip, l);
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[0] = 0;
break;
default: // otherwise do nothing.
break;
}
break; // don't check for typed keys
}
if (l >= 28-1)
break;