lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'connect-ip-textbox' into 'master' 

Add clipboard functionality to the Connect via IP textbox.

See merge request STJr/SRB2!597
This commit is contained in:
James R 2020-01-05 17:06:45 -05:00
parent a3396d6bd7 bc88def225
commit e4f88d142e
1 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/m_menu.c
View File

@ -10506,15 +10506,78 @@ 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);
if ( ctrldown ) {
switch (choice) {
case 'v':
case 'V': // ctrl+v, pasting
{
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_INS:
case 'c':
case 'C': // ctrl+c, ctrl+insert, copying
I_ClipboardCopy(setupm_ip, l);
S_StartSound(NULL,sfx_menu1); // Tails
break;
case 'x':
case 'X': // ctrl+x, 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 ( shiftdown ) {
switch (choice) {
case KEY_INS: // shift+insert, pasting
{
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;