YGGverse
/
xash3d-fwgs
mirror of https://github.com/YGGverse/xash3d-fwgs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

engine: platform: sdl: dirty wip sdl1.2 port

pull/2/head
Alibek Omarov 5 years ago
parent
ae35f15f15
commit
8dafbaeda2
4 changed files with 184 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      engine/platform/sdl/events.c
  2. 27
      engine/platform/sdl/in_sdl.c
  3. 20
      engine/platform/sdl/s_sdl.c
  4. 37
      engine/platform/sdl/vid_sdl.c

84
engine/platform/sdl/events.c
Unescape View File

@ -39,6 +39,7 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
int keynum = key.keysym.scancode; int keynum = key.keysym.scancode;
qboolean numLock = SDL_GetModState() & KMOD_NUM; qboolean numLock = SDL_GetModState() & KMOD_NUM;
#if XASH_SDL == 2
if( SDL_IsTextInputActive() && down ) if( SDL_IsTextInputActive() && down )
{ {
if( SDL_GetModState() & KMOD_CTRL ) if( SDL_GetModState() & KMOD_CTRL )
@ -52,6 +53,7 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
return; return;
} }
} }
#endif
#define DECLARE_KEY_RANGE( min, max, repl ) \ #define DECLARE_KEY_RANGE( min, max, repl ) \
if( keynum >= (min) && keynum <= (max) ) \ if( keynum >= (min) && keynum <= (max) ) \
@ -59,10 +61,10 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
keynum = keynum - (min) + (repl); \ keynum = keynum - (min) + (repl); \
} }
#if XASH_SDL == 2
DECLARE_KEY_RANGE( SDL_SCANCODE_A, SDL_SCANCODE_Z, 'a' ) DECLARE_KEY_RANGE( SDL_SCANCODE_A, SDL_SCANCODE_Z, 'a' )
else DECLARE_KEY_RANGE( SDL_SCANCODE_1, SDL_SCANCODE_9, '1' ) else DECLARE_KEY_RANGE( SDL_SCANCODE_1, SDL_SCANCODE_9, '1' )
else DECLARE_KEY_RANGE( SDL_SCANCODE_F1, SDL_SCANCODE_F12, K_F1 ) else DECLARE_KEY_RANGE( SDL_SCANCODE_F1, SDL_SCANCODE_F12, K_F1 )
#undef DECLARE_KEY_RANGE
else else
{ {
switch( keynum ) switch( keynum )
@ -144,6 +146,86 @@ static void SDLash_KeyEvent( SDL_KeyboardEvent key )
return; return;
} }
} }
#else
DECLARE_KEY_RANGE( SDLK_a, SDLK_z, 'a' )
else DECLARE_KEY_RANGE( SDLK_1, SDLK_9, '1' )
else DECLARE_KEY_RANGE( SDLK_F1, SDLK_F12, K_F1 )
else
{
switch( keynum )
{
case SDLK_BACKQUOTE: keynum = '`'; break;
case SDLK_0: keynum = '0'; break;
case SDLK_BACKSLASH: keynum = '\\'; break;
case SDLK_LEFTBRACKET: keynum = '['; break;
case SDLK_RIGHTBRACKET: keynum = ']'; break;
case SDLK_EQUALS: keynum = '='; break;
case SDLK_MINUS: keynum = '-'; break;
case SDLK_TAB: keynum = K_TAB; break;
case SDLK_RETURN: keynum = K_ENTER; break;
case SDLK_ESCAPE: keynum = K_ESCAPE; break;
case SDLK_SPACE: keynum = K_SPACE; break;
case SDLK_BACKSPACE: keynum = K_BACKSPACE; break;
case SDLK_UP: keynum = K_UPARROW; break;
case SDLK_LEFT: keynum = K_LEFTARROW; break;
case SDLK_DOWN: keynum = K_DOWNARROW; break;
case SDLK_RIGHT: keynum = K_RIGHTARROW; break;
case SDLK_LALT:
case SDLK_RALT: keynum = K_ALT; break;
case SDLK_LCTRL:
case SDLK_RCTRL: keynum = K_CTRL; break;
case SDLK_LSHIFT:
case SDLK_RSHIFT: keynum = K_SHIFT; break;
case SDLK_LMETA:
case SDLK_RMETA: keynum = K_WIN; break;
case SDLK_INSERT: keynum = K_INS; break;
case SDLK_DELETE: keynum = K_DEL; break;
case SDLK_PAGEDOWN: keynum = K_PGDN; break;
case SDLK_PAGEUP: keynum = K_PGUP; break;
case SDLK_HOME: keynum = K_HOME; break;
case SDLK_END: keynum = K_END; break;
case SDLK_KP1: keynum = numLock ? '1' : K_KP_END; break;
case SDLK_KP2: keynum = numLock ? '2' : K_KP_DOWNARROW; break;
case SDLK_KP3: keynum = numLock ? '3' : K_KP_PGDN; break;
case SDLK_KP4: keynum = numLock ? '4' : K_KP_LEFTARROW; break;
case SDLK_KP5: keynum = numLock ? '5' : K_KP_5; break;
case SDLK_KP6: keynum = numLock ? '6' : K_KP_RIGHTARROW; break;
case SDLK_KP7: keynum = numLock ? '7' : K_KP_HOME; break;
case SDLK_KP8: keynum = numLock ? '8' : K_KP_UPARROW; break;
case SDLK_KP9: keynum = numLock ? '9' : K_KP_PGUP; break;
case SDLK_KP0: keynum = numLock ? '0' : K_KP_INS; break;
case SDLK_KP_PERIOD: keynum = K_KP_DEL; break;
case SDLK_KP_ENTER: keynum = K_KP_ENTER; break;
case SDLK_KP_PLUS: keynum = K_KP_PLUS; break;
case SDLK_KP_MINUS: keynum = K_KP_MINUS; break;
case SDLK_KP_DIVIDE: keynum = K_KP_SLASH; break;
case SDLK_KP_MULTIPLY: keynum = '*'; break;
case SDLK_NUMLOCK: keynum = K_KP_NUMLOCK; break;
case SDLK_CAPSLOCK: keynum = K_CAPSLOCK; break;
case SDLK_SLASH: keynum = '/'; break;
case SDLK_PERIOD: keynum = '.'; break;
case SDLK_SEMICOLON: keynum = ';'; break;
case SDLK_QUOTE: keynum = '\''; break;
case SDLK_COMMA: keynum = ','; break;
case SDLK_PRINT:
{
host.force_draw_version = true;
host.force_draw_version_time = host.realtime + FORCE_DRAW_VERSION_TIME;
break;
}
case SDLK_UNKNOWN:
{
if( down ) Con_Reportf( "SDLash_KeyEvent: Unknown scancode\n" );
return;
}
default:
if( down ) Con_Reportf( "SDLash_KeyEvent: Unknown key: %s = %i\n", SDL_GetScancodeName( keynum ), keynum );
return;
}
}
#endif
#undef DECLARE_KEY_RANGE
Key_Event( keynum, down ); Key_Event( keynum, down );
} }

27
engine/platform/sdl/in_sdl.c
Unescape View File

@ -25,7 +25,9 @@ GNU General Public License for more details.
#include "vid_common.h" #include "vid_common.h"
static SDL_Joystick *joy; static SDL_Joystick *joy;
#if XASH_SDL == 2
static SDL_GameController *gamecontroller; static SDL_GameController *gamecontroller;
#endif // XASH_SDL == 2
/* /*
============= =============
@ -46,7 +48,11 @@ Platform_SetMousePos
*/ */
void Platform_SetMousePos( int x, int y ) void Platform_SetMousePos( int x, int y )
{ {
#if XASH_SDL == 2
SDL_WarpMouseInWindow( host.hWnd, x, y ); SDL_WarpMouseInWindow( host.hWnd, x, y );
#else
SDL_WarpMouse( x, y );
#endif
} }
/* /*
@ -57,6 +63,7 @@ Platform_GetClipobardText
*/ */
void Platform_GetClipboardText( char *buffer, size_t size ) void Platform_GetClipboardText( char *buffer, size_t size )
{ {
#if XASH_SDL == 2
char *sdlbuffer = SDL_GetClipboardText(); char *sdlbuffer = SDL_GetClipboardText();
if( !sdlbuffer ) if( !sdlbuffer )
@ -64,6 +71,9 @@ void Platform_GetClipboardText( char *buffer, size_t size )
Q_strncpy( buffer, sdlbuffer, size ); Q_strncpy( buffer, sdlbuffer, size );
SDL_free( sdlbuffer ); SDL_free( sdlbuffer );
#else
buffer[0] = 0;
#endif
} }
/* /*
@ -74,7 +84,9 @@ Platform_SetClipobardText
*/ */
void Platform_SetClipboardText( const char *buffer, size_t size ) void Platform_SetClipboardText( const char *buffer, size_t size )
{ {
#if XASH_SDL == 2
SDL_SetClipboardText( buffer ); SDL_SetClipboardText( buffer );
#endif
} }
/* /*
@ -96,7 +108,9 @@ SDLash_EnableTextInput
*/ */
void Platform_EnableTextInput( qboolean enable ) void Platform_EnableTextInput( qboolean enable )
{ {
#if XASH_SDL == 2
enable ? SDL_StartTextInput() : SDL_StopTextInput(); enable ? SDL_StartTextInput() : SDL_StopTextInput();
#endif
} }
/* /*
@ -134,8 +148,10 @@ static int SDLash_JoyInit_Old( int numjoy )
return 0; return 0;
} }
#if XASH_SDL == 2
for( i = 0; i < num; i++ ) for( i = 0; i < num; i++ )
Con_Reportf( "%i\t: %s\n", i, SDL_JoystickNameForIndex( i ) ); Con_Reportf( "%i\t: %s\n", i, SDL_JoystickNameForIndex( i ) );
#endif
Con_Reportf( "Pass +set joy_index N to command line, where N is number, to select active joystick\n" ); Con_Reportf( "Pass +set joy_index N to command line, where N is number, to select active joystick\n" );
@ -147,6 +163,7 @@ static int SDLash_JoyInit_Old( int numjoy )
return 0; return 0;
} }
#if XASH_SDL == 2
Con_Reportf( "Selected joystick: %s\n" Con_Reportf( "Selected joystick: %s\n"
"\tAxes: %i\n" "\tAxes: %i\n"
"\tHats: %i\n" "\tHats: %i\n"
@ -156,11 +173,13 @@ static int SDLash_JoyInit_Old( int numjoy )
SDL_JoystickNumButtons( joy ), SDL_JoystickNumBalls( joy ) ); SDL_JoystickNumButtons( joy ), SDL_JoystickNumBalls( joy ) );
SDL_GameControllerEventState( SDL_DISABLE ); SDL_GameControllerEventState( SDL_DISABLE );
#endif
SDL_JoystickEventState( SDL_ENABLE ); SDL_JoystickEventState( SDL_ENABLE );
return num; return num;
} }
#if XASH_SDL == 2
/* /*
============= =============
SDLash_JoyInit_New SDLash_JoyInit_New
@ -231,6 +250,7 @@ static int SDLash_JoyInit_New( int numjoy )
return num; return num;
} }
#endif // XASH_SDL == 2
/* /*
============= =============
@ -240,12 +260,13 @@ Platform_JoyInit
*/ */
int Platform_JoyInit( int numjoy ) int Platform_JoyInit( int numjoy )
{ {
#if XASH_SDL == 2
// SDL_Joystick is now an old API // SDL_Joystick is now an old API
// SDL_GameController is preferred // SDL_GameController is preferred
if( Sys_CheckParm( "-sdl_joy_old_api" ) ) if( !Sys_CheckParm( "-sdl_joy_old_api" ) )
return SDLash_JoyInit_Old(numjoy);
return SDLash_JoyInit_New(numjoy); return SDLash_JoyInit_New(numjoy);
#endif // XASH_SDL == 2
return SDLash_JoyInit_Old(numjoy);
} }
#endif // XASH_DEDICATED #endif // XASH_DEDICATED

20
engine/platform/sdl/s_sdl.c
Unescape View File

@ -76,8 +76,10 @@ qboolean SNDDMA_Init( void )
// even if we don't have PA // even if we don't have PA
// we still can safely set env variables // we still can safely set env variables
#if XASH_SDL == 2
SDL_setenv( "PULSE_PROP_application.name", GI->title, 1 ); SDL_setenv( "PULSE_PROP_application.name", GI->title, 1 );
SDL_setenv( "PULSE_PROP_media.role", "game", 1 ); SDL_setenv( "PULSE_PROP_media.role", "game", 1 );
#endif
memset( &desired, 0, sizeof( desired ) ); memset( &desired, 0, sizeof( desired ) );
desired.freq = SOUND_DMA_SPEED; desired.freq = SOUND_DMA_SPEED;
@ -86,7 +88,10 @@ qboolean SNDDMA_Init( void )
desired.channels = 2; desired.channels = 2;
desired.callback = SDL_SoundCallback; desired.callback = SDL_SoundCallback;
#if XASH_SDL == 2
sdl_dev = SDL_OpenAudioDevice( NULL, 0, &desired, &obtained, 0 ); sdl_dev = SDL_OpenAudioDevice( NULL, 0, &desired, &obtained, 0 );
#endif
sdl_dev = SDL_OpenAudio( &desired, &obtained );
if( !sdl_dev ) if( !sdl_dev )
{ {
@ -116,9 +121,13 @@ qboolean SNDDMA_Init( void )
dma.buffer = Z_Malloc( dma.samples * 2 ); dma.buffer = Z_Malloc( dma.samples * 2 );
dma.samplepos = 0; dma.samplepos = 0;
#if XASH_SDL == 2
Con_Printf( "Using SDL audio driver: %s @ %d Hz\n", SDL_GetCurrentAudioDriver( ), obtained.freq ); Con_Printf( "Using SDL audio driver: %s @ %d Hz\n", SDL_GetCurrentAudioDriver( ), obtained.freq );
#else
Con_Printf( "Using SDL audio driver @ %d Hz\n", obtained.freq );
#endif
SDL_PauseAudioDevice( sdl_dev, 0 ); SNDDMA_Activate( true );
dma.initialized = true; dma.initialized = true;
return true; return true;
@ -218,9 +227,12 @@ void SNDDMA_Shutdown( void )
if( sdl_dev ) if( sdl_dev )
{ {
SDL_PauseAudioDevice( sdl_dev, 1 ); SNDDMA_Activate( false );
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
#if XASH_SDL == 2
SDL_CloseAudioDevice( sdl_dev ); SDL_CloseAudioDevice( sdl_dev );
#endif
SDL_CloseAudio( ); SDL_CloseAudio( );
#endif #endif
} }
@ -247,6 +259,10 @@ between a deactivate and an activate.
*/ */
void SNDDMA_Activate( qboolean active ) void SNDDMA_Activate( qboolean active )
{ {
#if XASH_SDL == 2
SDL_PauseAudioDevice( sdl_dev, !active ); SDL_PauseAudioDevice( sdl_dev, !active );
#else
SDL_PauseAudio( !active );
#endif
} }
#endif // XASH_SOUND == SOUND_SDL #endif // XASH_SOUND == SOUND_SDL

37
engine/platform/sdl/vid_sdl.c
Unescape View File

@ -31,8 +31,10 @@ struct
struct struct
{ {
#if XASH_SDL == 2
SDL_Renderer *renderer; SDL_Renderer *renderer;
SDL_Texture *tex; SDL_Texture *tex;
#endif
int width, height; int width, height;
SDL_Surface *surf; SDL_Surface *surf;
SDL_Surface *win; SDL_Surface *win;
@ -43,6 +45,7 @@ qboolean SW_CreateBuffer( int width, int height, uint *stride, uint *bpp, uint *
sw.width = width; sw.width = width;
sw.height = height; sw.height = height;
#if XASH_SDL == 2
if( sw.renderer ) if( sw.renderer )
{ {
unsigned int format = SDL_GetWindowPixelFormat( host.hWnd ); unsigned int format = SDL_GetWindowPixelFormat( host.hWnd );
@ -110,10 +113,16 @@ qboolean SW_CreateBuffer( int width, int height, uint *stride, uint *bpp, uint *
sw.renderer = NULL; sw.renderer = NULL;
} }
} }
#endif
#if XASH_SDL == 2
if( !sw.renderer ) if( !sw.renderer )
{ {
sw.win = SDL_GetWindowSurface( host.hWnd ); sw.win = SDL_GetWindowSurface( host.hWnd );
#else
{
sw.win = SDL_GetVideoSurface();
#endif
// sdl will create renderer if hw framebuffer unavailiable, so cannot fallback here // sdl will create renderer if hw framebuffer unavailiable, so cannot fallback here
// if it is failed, it is not possible to draw with SDL in REF_SOFTWARE mode // if it is failed, it is not possible to draw with SDL in REF_SOFTWARE mode
@ -145,6 +154,7 @@ qboolean SW_CreateBuffer( int width, int height, uint *stride, uint *bpp, uint *
void *SW_LockBuffer( void ) void *SW_LockBuffer( void )
{ {
#if XASH_SDL == 2
if( sw.renderer ) if( sw.renderer )
{ {
void *pixels; void *pixels;
@ -154,24 +164,27 @@ void *SW_LockBuffer( void )
Sys_Error("%s", SDL_GetError()); Sys_Error("%s", SDL_GetError());
return pixels; return pixels;
} }
else
{
// ensure it not changed (do we really need this?) // ensure it not changed (do we really need this?)
sw.win = SDL_GetWindowSurface( host.hWnd ); sw.win = SDL_GetWindowSurface( host.hWnd );
//if( !sw.win ) //if( !sw.win )
//SDL_GetWindowSurface( host.hWnd ); //SDL_GetWindowSurface( host.hWnd );
#else
sw.win = SDL_GetVideoSurface();
#endif
// prevent buffer overrun // prevent buffer overrun
if( !sw.win || sw.win->w < sw.width || sw.win->h < sw.height ) if( !sw.win || sw.win->w < sw.width || sw.win->h < sw.height )
return NULL; return NULL;
#if XASH_SDL == 2
if( sw.surf ) if( sw.surf )
{ {
SDL_LockSurface( sw.surf ); SDL_LockSurface( sw.surf );
return sw.surf->pixels; return sw.surf->pixels;
} }
else else
#endif
{ {
// real window pixels (x11 shm region, dma buffer, etc) // real window pixels (x11 shm region, dma buffer, etc)
// or SDL_Renderer texture if not supported // or SDL_Renderer texture if not supported
@ -179,10 +192,10 @@ void *SW_LockBuffer( void )
return sw.win->pixels; return sw.win->pixels;
} }
} }
}
void SW_UnlockBuffer( void ) void SW_UnlockBuffer( void )
{ {
#if XASH_SDL == 2
if( sw.renderer ) if( sw.renderer )
{ {
SDL_Rect src, dst; SDL_Rect src, dst;
@ -197,10 +210,11 @@ void SW_UnlockBuffer( void )
SDL_RenderCopy(sw.renderer, sw.tex, &src, &dst); SDL_RenderCopy(sw.renderer, sw.tex, &src, &dst);
SDL_RenderPresent(sw.renderer); SDL_RenderPresent(sw.renderer);
return;
//Con_Printf("%s\n", SDL_GetError()); //Con_Printf("%s\n", SDL_GetError());
} }
else
{
// blit if blitting surface availiable // blit if blitting surface availiable
if( sw.surf ) if( sw.surf )
{ {
@ -211,12 +225,16 @@ void SW_UnlockBuffer( void )
dst = src; dst = src;
SDL_UnlockSurface( sw.surf ); SDL_UnlockSurface( sw.surf );
SDL_BlitSurface( sw.surf, &src, sw.win, &dst ); SDL_BlitSurface( sw.surf, &src, sw.win, &dst );
return;
} }
else // already blitted #endif
// already blitted
SDL_UnlockSurface( sw.win ); SDL_UnlockSurface( sw.win );
#if XASH_SDL == 2
SDL_UpdateWindowSurface( host.hWnd ); SDL_UpdateWindowSurface( host.hWnd );
} #endif
} }
int R_MaxVideoModes( void ) int R_MaxVideoModes( void )
@ -236,6 +254,7 @@ vidmode_t *R_GetVideoMode( int num )
static void R_InitVideoModes( void ) static void R_InitVideoModes( void )
{ {
#if XASH_SDL == 2
int displayIndex = 0; // TODO: handle multiple displays somehow int displayIndex = 0; // TODO: handle multiple displays somehow
int i, modes; int i, modes;
@ -280,6 +299,8 @@ static void R_InitVideoModes( void )
num_vidmodes++; num_vidmodes++;
} }
#else
int i;
} }
static void R_FreeVideoModes( void ) static void R_FreeVideoModes( void )

Write Preview
Loading…
Cancel
Save