platform: add Platfrom_Init, Platform_Shutdown, Platform_MouseMove move platform-specific code from host.c

engine/client/input.c

@@ -570,6 +570,7 @@ void IN_CollectInput( float *forward, float *side, float *pitch, float *yaw, qbo
 	if( includeMouse )
 	{
 #if XASH_INPUT == INPUT_SDL
+		/// TODO: check if we may move this to platform
 		if( includeSdlMouse )
 		{
 			int x, y;
@@ -577,16 +578,12 @@ void IN_CollectInput( float *forward, float *side, float *pitch, float *yaw, qbo
 			*pitch += y * m_pitch->value;
 			*yaw   -= x * m_yaw->value;
 		}
-#endif // INPUT_SDL
+#else
-
+		float x, y;
-#if XASH_INPUT == INPUT_ANDROID
+		Platform_MouseMove( &x, &y );
-		{
+		*pitch += y * m_pitch->value;
-			float x, y;
+		*yaw   -= x * m_yaw->value;
-			Android_MouseMove( &x, &y );
+#endif // SDL
-			*pitch += y * m_pitch->value;
-			*yaw   -= x * m_yaw->value;
-		}
-#endif // ANDROID
 
 #ifdef XASH_USE_EVDEV
 		IN_EvdevMove( yaw, pitch );

engine/common/host.c

@@ -677,54 +677,104 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
 	if( !Sys_CheckParm( "-noch" ) )
 		Sys_SetupCrashHandler();
 
-	// to be accessed later
+	host.enabledll = !Sys_CheckParm( "-nodll" );
-	if( ( host.daemonized = Sys_CheckParm( "-daemonize" ) ) )
+
+	host.change_game = bChangeGame;
+	host.config_executed = false;
+	host.status = HOST_INIT; // initialzation started
+
+	Memory_Init(); // init memory subsystem
+
+	host.mempool = Mem_AllocPool( "Zone Engine" );
+
+	// HACKHACK: Quake console is always allowed
+	// TODO: determine if we are running QWrap more reliable
+	if( Sys_CheckParm( "-console" ) || !Q_stricmp( SI.exeName, "quake" ))
+		host.allow_console = true;
+
+	if( Sys_CheckParm( "-dev" ))
 	{
-#if defined(_POSIX_VERSION) && !defined(XASH_MOBILE_PLATFORM)
+		host.allow_console = true;
-		pid_t daemon;
+		developer = DEV_NORMAL;
 
-		daemon = fork();
+		if( Sys_GetParmFromCmdLine( "-dev", dev_level ))
-
-		if( daemon < 0 )
 		{
-			Host_Error( "fork() failed: %s\n", strerror( errno ) );
+			if( Q_isdigit( dev_level ))
+				developer = bound( DEV_NONE, abs( Q_atoi( dev_level )), DEV_EXTENDED );
 		}
-
-		if( daemon > 0 )
-		{
-			// parent
-			Con_Reportf( "Child pid: %i\n", daemon );
-			exit( 0 );
-		}
-		else
-		{
-			// don't be closed by parent
-			if( setsid() < 0 )
-			{
-				Host_Error( "setsid() failed: %s\n", strerror( errno ) );
-			}
-
-			// set permissions
-			umask( 0 );
-
-			// engine will still use stdin/stdout,
-			// so just redirect them to /dev/null
-			close( STDIN_FILENO );
-			close( STDOUT_FILENO );
-			close( STDERR_FILENO );
-			open("/dev/null", O_RDONLY); // becomes stdin
-			open("/dev/null", O_RDWR); // stdout
-			open("/dev/null", O_RDWR); // stderr
-
-			// fallthrough
-		}
-#elif defined(XASH_MOBILE_PLATFORM)
-		Sys_Error( "Can't run in background on mobile platforms!" );
-#else
-		Sys_Error( "Daemonize not supported on this platform!" );
-#endif
 	}
 
+	host.con_showalways = true;
+
+#if XASH_DEDICATED
+	host.type = HOST_DEDICATED; // predict state
+#else
+	if( Sys_CheckParm("-dedicated") || progname[0] == '#' )
+	{
+		host.type = HOST_DEDICATED;
+	}
+	else
+	{
+		host.type = HOST_NORMAL;
+	}
+#endif
+
+	// set default gamedir
+	if( progname[0] == '#' )
+		progname++;
+
+	Q_strncpy( SI.exeName, progname, sizeof( SI.exeName ));
+	Q_strncpy( SI.basedirName, progname, sizeof( SI.exeName ));
+
+	if( Host_IsDedicated() )
+	{
+		Sys_MergeCommandLine( );
+
+		host.allow_console = true;
+	}
+	else
+	{
+		// don't show console as default
+		if( developer <= DEV_NORMAL )
+			host.con_showalways = false;
+	}
+
+	// member console allowing
+	host.allow_console_init = host.allow_console;
+
+	// timeBeginPeriod( 1 ); // a1ba: Do we need this?
+
+	// NOTE: this message couldn't be passed into game console but it doesn't matter
+//	Con_Reportf( "Sys_LoadLibrary: Loading xash.dll - ok\n" );
+
+	// get default screen res
+	VID_InitDefaultResolution();
+
+	// init host state machine
+	COM_InitHostState();
+
+	// init hashed commands
+	BaseCmd_Init();
+
+	// startup cmds and cvars subsystem
+	Cmd_Init();
+	Cvar_Init();
+
+	// share developer level across all dlls
+	Q_snprintf( dev_level, sizeof( dev_level ), "%i", developer );
+	Cvar_DirectSet( &host_developer, dev_level );
+	Cvar_RegisterVariable( &sys_ticrate );
+
+	if( Sys_GetParmFromCmdLine( "-sys_ticrate", ticrate ))
+	{
+		double fps = bound( MIN_FPS, atof( ticrate ), MAX_FPS );
+		Cvar_SetValue( "sys_ticrate", fps );
+	}
+
+	Con_Init(); // early console running to catch all the messages
+
+	Platform_Init();
+
 	if( ( baseDir = getenv( "XASH3D_BASEDIR" ) ) )
 	{
 		Q_strncpy( host.rootdir, baseDir, sizeof(host.rootdir) );
@@ -767,65 +817,6 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
 	if( host.rodir[0] && host.rodir[Q_strlen( host.rodir ) - 1] == '/' )
 		host.rodir[Q_strlen( host.rodir ) - 1] = 0;
 
-	host.enabledll = !Sys_CheckParm( "-nodll" );
-
-	host.change_game = bChangeGame;
-	host.config_executed = false;
-	host.status = HOST_INIT; // initialzation started
-
-	Memory_Init(); // init memory subsystem
-
-	host.mempool = Mem_AllocPool( "Zone Engine" );
-
-	// HACKHACK: Quake console is always allowed
-	// TODO: determine if we are running QWrap more reliable
-	if( Sys_CheckParm( "-console" ) || !Q_stricmp( SI.exeName, "quake" ))
-		host.allow_console = true;
-
-	if( Sys_CheckParm( "-dev" ))
-	{
-		host.allow_console = true;
-		developer = DEV_NORMAL;
-
-		if( Sys_GetParmFromCmdLine( "-dev", dev_level ))
-		{
-			if( Q_isdigit( dev_level ))
-				developer = bound( DEV_NONE, abs( Q_atoi( dev_level )), DEV_EXTENDED );
-		}
-	}
-
-	host.con_showalways = true;
-
-#if XASH_DEDICATED
-	host.type = HOST_DEDICATED; // predict state
-#else
-	if( Sys_CheckParm("-dedicated") || progname[0] == '#' )
-	{
-		host.type = HOST_DEDICATED;
-	}
-	else
-	{
-		host.type = HOST_NORMAL;
-	}
-#endif
-
-#ifdef XASH_SDL
-#ifndef SDL_INIT_EVENTS
-#define SDL_INIT_EVENTS 0
-#endif
-
-	if( SDL_Init( SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS ) )
-	{
-		Sys_Warn( "SDL_Init failed: %s", SDL_GetError() );
-		host.type = HOST_DEDICATED;
-	}
-
-#if XASH_SDL == 2
-	SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
-	SDL_StopTextInput();
-#endif // XASH_SDL == 2
-#endif // XASH_SDL
-
 	if ( !host.rootdir[0] || SetCurrentDirectory( host.rootdir ) != 0)
 		Con_Reportf( "%s is working directory now\n", host.rootdir );
 	else
@@ -833,62 +824,6 @@ void Host_InitCommon( int argc, char **argv, const char *progname, qboolean bCha
 
 	Sys_InitLog();
 
-	// set default gamedir
-	if( progname[0] == '#' )
-		progname++;
-
-	Q_strncpy( SI.exeName, progname, sizeof( SI.exeName ));
-	Q_strncpy( SI.basedirName, progname, sizeof( SI.exeName ));
-
-	if( Host_IsDedicated() )
-	{
-		Sys_MergeCommandLine( );
-
-		host.allow_console = true;
-	}
-	else
-	{
-		// don't show console as default
-		if( developer <= DEV_NORMAL )
-			host.con_showalways = false;
-	}
-
-	// member console allowing
-	host.allow_console_init = host.allow_console;
-
-#ifdef _WIN32
-	Wcon_CreateConsole(); // system console used by dedicated server or show fatal errors
-#endif
-	// timeBeginPeriod( 1 ); // a1ba: Do we need this?
-
-	// NOTE: this message couldn't be passed into game console but it doesn't matter
-	Con_Reportf( "Sys_LoadLibrary: Loading xash.dll - ok\n" );
-
-	// get default screen res
-	VID_InitDefaultResolution();
-
-	// init host state machine
-	COM_InitHostState();
-
-	// init hashed commands
-	BaseCmd_Init();
-
-	// startup cmds and cvars subsystem
-	Cmd_Init();
-	Cvar_Init();
-
-	// share developer level across all dlls
-	Q_snprintf( dev_level, sizeof( dev_level ), "%i", developer );
-	Cvar_DirectSet( &host_developer, dev_level );
-	Cvar_RegisterVariable( &sys_ticrate );
-
-	if( Sys_GetParmFromCmdLine( "-sys_ticrate", ticrate ))
-	{
-		double fps = bound( MIN_FPS, atof( ticrate ), MAX_FPS );
-		Cvar_SetValue( "sys_ticrate", fps );
-	}
-
-	Con_Init(); // early console running to catch all the messages
 	Cmd_AddCommand( "exec", Host_Exec_f, "execute a script file" );
 	Cmd_AddCommand( "memlist", Host_MemStats_f, "prints memory pool information" );
 
@@ -1064,9 +999,7 @@ void EXPORT Host_Shutdown( void )
 	NET_Shutdown();
 	HTTP_Shutdown();
 	Host_FreeCommon();
-#ifdef _WIN32
+	Platform_Shutdown();
-	Wcon_DestroyConsole();
-#endif
 
 	// must be last, console uses this
 	Mem_FreePool( &host.mempool );

engine/common/sys_con.c

@@ -310,3 +310,15 @@ void Con_Reportf( const char *szFmt, ... )
 
 	Sys_Print( buffer );
 }
+
+
+#if XASH_MESSAGEBOX == MSGBOX_STDERR
+void Platform_MessageBox( const char *title, const char *message, qboolean parentMainWindow )
+{
+	fprintf( stderr,
+		 "======================================\n"
+		 "%s: %s\n"
+		 "======================================\n", title, message );
+}
+#endif
+

engine/common/system.h

@@ -86,7 +86,6 @@ int Sys_LogFileNo( void );
 #if XASH_WIN32
 void Wcon_InitConsoleCommands( void );
 void Wcon_ShowConsole( qboolean show );
-void Wcon_Init( void );
 void Wcon_CreateConsole( void );
 void Wcon_DestroyConsole( void );
 void Wcon_DisableInput( void );

engine/platform/android/android.c

@@ -586,16 +586,21 @@ JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *reserved )
 
 /*
 ========================
-Android_Init
+Platform_Init
 
 Initialize android-related cvars
 ========================
 */
-void Android_Init( void )
+void Platform_Init( void )
 {
 	android_sleep = Cvar_Get( "android_sleep", "1", FCVAR_ARCHIVE, "Enable sleep in background" );
 }
 
+void Platform_Shutdown( void )
+{
+
+}
+
 /*
 ========================
 Android_EnableTextInput
@@ -714,7 +719,7 @@ void Android_SaveID( const char *id )
 Android_MouseMove
 ========================
 */
-void Android_MouseMove( float *x, float *y )
+void Platform_MouseMove( float *x, float *y )
 {
 	*x = jnimouse.x;
 	*y = jnimouse.y;

engine/platform/linux/in_evdev.c

@@ -439,6 +439,12 @@ void Platform_EnableTextInput( qboolean enable )
 	evdev.chars = enable;
 	evdev.shift = false;
 }
+
+void Platfrom_MouseMove( float *yaw, float *pitch )
+{
+	// already catched in IN_EvdevMove
+}
+
 #endif
 
 void Evdev_Init( void )

engine/platform/platform.h

@@ -28,6 +28,9 @@ GNU General Public License for more details.
 
 ==============================================================================
 */
+
+void Platform_Init( void );
+void Platform_Shutdown( void );
 double Platform_DoubleTime( void );
 void Platform_Sleep( int msec );
 void Platform_ShellExecute( const char *path, const char *parms );
@@ -69,6 +72,7 @@ void Platform_RunEvents( void );
 void Platform_GetMousePos( int *x, int *y );
 void Platform_SetMousePos( int x, int y );
 void Platform_PreCreateMove( void );
+void Platform_MouseMove( float *x, float *y );
 // Clipboard
 void Platform_GetClipboardText( char *buffer, size_t size );
 void Platform_SetClipboardText( const char *buffer, size_t size );

engine/platform/posix/sys_posix.c

@@ -92,12 +92,63 @@ void Platform_ShellExecute( const char *path, const char *parms )
 }
 #endif // XASH_ANDROID
 
-#if XASH_MESSAGEBOX == MSGBOX_STDERR
+void Posix_Daemonize( void )
-void Platform_MessageBox( const char *title, const char *message, qboolean parentMainWindow )
 {
-	fprintf( stderr,
+	// to be accessed later
-		 "======================================\n"
+	if( ( host.daemonized = Sys_CheckParm( "-daemonize" ) ) )
-		 "%s: %s\n"
+	{
-		 "======================================\n", title, message );
+#if XASH_POSIX && defined(_POSIX_VERSION) && !defined(XASH_MOBILE_PLATFORM)
-}
+		pid_t daemon;
+
+		daemon = fork();
+
+		if( daemon < 0 )
+		{
+			Host_Error( "fork() failed: %s\n", strerror( errno ) );
+		}
+
+		if( daemon > 0 )
+		{
+			// parent
+			Con_Reportf( "Child pid: %i\n", daemon );
+			exit( 0 );
+		}
+		else
+		{
+			// don't be closed by parent
+			if( setsid() < 0 )
+			{
+				Host_Error( "setsid() failed: %s\n", strerror( errno ) );
+			}
+
+			// set permissions
+			umask( 0 );
+
+			// engine will still use stdin/stdout,
+			// so just redirect them to /dev/null
+			close( STDIN_FILENO );
+			close( STDOUT_FILENO );
+			close( STDERR_FILENO );
+			open("/dev/null", O_RDONLY); // becomes stdin
+			open("/dev/null", O_RDWR); // stdout
+			open("/dev/null", O_RDWR); // stderr
+
+			// fallthrough
+		}
+#elif defined(XASH_MOBILE_PLATFORM)
+		Sys_Error( "Can't run in background on mobile platforms!" );
+#else
+		Sys_Error( "Daemonize not supported on this platform!" );
+#endif
+	}
+
+}
+
+#if !XASH_SDL && !XASH_ANDROID
+
+void Platform_Init( void )
+{
+	Posix_Daemonize();
+}
+void Platform_Shutdown( void ) {}
 #endif

engine/platform/sdl/sys_sdl.c

@@ -44,3 +44,23 @@ void Platform_MessageBox( const char *title, const char *message, qboolean paren
 	SDL_ShowSimpleMessageBox( SDL_MESSAGEBOX_ERROR, title, message, parentMainWindow ? host.hWnd : NULL );
 }
 #endif // XASH_MESSAGEBOX == MSGBOX_SDL
+void Posix_Daemonize( void );
+void Platform_Init( void )
+{
+#ifndef SDL_INIT_EVENTS
+#define SDL_INIT_EVENTS 0
+
+	if( SDL_Init( SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS ) )
+	{
+		Sys_Warn( "SDL_Init failed: %s", SDL_GetError() );
+		host.type = HOST_DEDICATED;
+	}
+
+#if XASH_SDL == 2
+	SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
+	SDL_StopTextInput();
+#endif // XASH_SDL == 2
+#if XASH_POSIX
+	Posix_Daemonize();
+#endif
+}

engine/platform/win32/sys_win.c

@@ -59,3 +59,16 @@ void Platform_MessageBox( const char *title, const char *message, qboolean paren
 	MessageBox( parentMainWindow ? host.hWnd : NULL, message, title, MB_OK|MB_SETFOREGROUND|MB_ICONSTOP );
 }
 #endif // XASH_MESSAGEBOX == MSGBOX_WIN32
+
+#ifndef XASH_SDL
+
+void Platform_Init( void )
+{
+	Wcon_CreateConsole(); // system console used by dedicated server or show fatal errors
+
+}
+void Platform_Shutdown( void )
+{
+	Wcon_DestroyConsole();
+}
+#endif