OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Changed I_GetFromClipboard() to return an FString.

Browse source 
SVN r1414 (trunk)
This commit is contained in:
Randy Heit 2009-02-08 03:32:27 +00:00
commit 025e36ee41
8 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/win32/i_input.cpp
View file

@ -2024,15 +2024,15 @@ void I_PutInClipboard (const char *str)
CloseClipboard ();
}
char *I_GetFromClipboard ()
FString I_GetFromClipboard ()
{
char *retstr = NULL;
FString retstr;
HGLOBAL cliphandle;
char *clipstr;
char *nlstr;
if (!IsClipboardFormatAvailable (CF_TEXT) || !OpenClipboard (Window))
return NULL;
return retstr;
cliphandle = GetClipboardData (CF_TEXT);
if (cliphandle != NULL)
@ -2040,15 +2040,16 @@ char *I_GetFromClipboard ()
clipstr = (char *)GlobalLock (cliphandle);
if (clipstr != NULL)
{
retstr = copystring (clipstr);
GlobalUnlock (clipstr);
nlstr = retstr;
// Convert CR-LF pairs to just LF
while ( (nlstr = strstr (retstr, "\r\n")) )
// Convert CR-LF pairs to just LF while copying to the FString
for (nlstr = clipstr; *nlstr != '\0'; ++nlstr)
{
memmove (nlstr, nlstr + 1, strlen (nlstr) - 1);
if (nlstr[0] == '\r' && nlstr[1] == '\n')
{
nlstr++;
}
retstr += *nlstr;
}
GlobalUnlock (clipstr);
}
}