YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-03-11 05:21:07 +00:00
Code Issues Projects Releases Wiki Activity

engine: platform: updated clipboard read/write functions

Browse Source
This commit is contained in:
SNMetamorph 2022-04-22 21:28:19 +04:00 committed by a1batross
parent 5402e1a259
commit 15eb6808c4
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/common/system.c
View File

@ -91,7 +91,7 @@ write screenshot into clipboard
*/ */
void Sys_SetClipboardData( const char *buffer, size_t size ) void Sys_SetClipboardData( const char *buffer, size_t size )
{ {
Platform_SetClipboardText( buffer, size ); Platform_SetClipboardText( buffer );
} }
#endif // XASH_DEDICATED #endif // XASH_DEDICATED

4
engine/platform/platform.h
View File

@ -80,8 +80,8 @@ void Platform_SetMousePos( int x, int y );
void Platform_PreCreateMove( void ); void Platform_PreCreateMove( void );
void Platform_MouseMove( float *x, float *y ); void Platform_MouseMove( float *x, float *y );
// Clipboard // Clipboard
void Platform_GetClipboardText( char *buffer, size_t size ); int Platform_GetClipboardText( char *buffer, size_t size );
void Platform_SetClipboardText( const char *buffer, size_t size ); void Platform_SetClipboardText( const char *buffer );
#if XASH_SDL == 12 #if XASH_SDL == 12
#define SDL_SetWindowGrab( wnd, state ) SDL_WM_GrabInput( (state) ) #define SDL_SetWindowGrab( wnd, state ) SDL_WM_GrabInput( (state) )

17
engine/platform/sdl/in_sdl.c
View File

@ -71,19 +71,28 @@ Platform_GetClipobardText
============= =============
*/ */
void Platform_GetClipboardText( char *buffer, size_t size ) int Platform_GetClipboardText( char *buffer, size_t size )
{ {
#if SDL_VERSION_ATLEAST( 2, 0, 0 ) #if SDL_VERSION_ATLEAST( 2, 0, 0 )
int textLength;
char *sdlbuffer = SDL_GetClipboardText(); char *sdlbuffer = SDL_GetClipboardText();
if( !sdlbuffer ) if( !sdlbuffer )
return; return 0;
Q_strncpy( buffer, sdlbuffer, size ); if (buffer && size > 0)
{
textLength = Q_strncpy( buffer, sdlbuffer, size );
}
else {
textLength = Q_strlen( sdlbuffer );
}
SDL_free( sdlbuffer ); SDL_free( sdlbuffer );
return textLength;
#else // SDL_VERSION_ATLEAST( 2, 0, 0 ) #else // SDL_VERSION_ATLEAST( 2, 0, 0 )
buffer[0] = 0; buffer[0] = 0;
#endif // SDL_VERSION_ATLEAST( 2, 0, 0 ) #endif // SDL_VERSION_ATLEAST( 2, 0, 0 )
return 0;
} }
/* /*
@ -92,7 +101,7 @@ Platform_SetClipobardText
============= =============
*/ */
void Platform_SetClipboardText( const char *buffer, size_t size ) void Platform_SetClipboardText( const char *buffer )
{ {
#if SDL_VERSION_ATLEAST( 2, 0, 0 ) #if SDL_VERSION_ATLEAST( 2, 0, 0 )
SDL_SetClipboardText( buffer ); SDL_SetClipboardText( buffer );