-Removed Sys_Quit and added Sys_Shutdown which will be called by Host_Shutdown.
authorblack <black@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 11 Jul 2004 14:56:33 +0000 (14:56 +0000)
committerblack <black@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 11 Jul 2004 14:56:33 +0000 (14:56 +0000)
-The SDL main driver is works more or less now.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4265 d7cf8633-e32d-0410-b094-e92efae38249

host.c
prvm_cmds.c
sys.h
sys_linux.c
sys_sdl.c
sys_shared.c
sys_win.c
vid_sdl.c
vid_wgl.c

diff --git a/host.c b/host.c
index 8a90463..311752b 100644 (file)
--- a/host.c
+++ b/host.c
@@ -949,5 +949,7 @@ void Host_Shutdown(void)
                R_Modules_Shutdown();
                VID_Shutdown();
        }
+
+       Sys_Shutdown();
 }
 
index 58d816c..2271956 100644 (file)
@@ -1116,7 +1116,7 @@ void VM_precache_sound (void)
        }
        
        if(!S_PrecacheSound(s,true, true))
-               Con_Printf("VM_prache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
+               Con_Printf("VM_precache_sound: Failed to load %s for %s\n", s, PRVM_NAME);
 }
 
 /*
diff --git a/sys.h b/sys.h
index f0e2ad5..0314f24 100644 (file)
--- a/sys.h
+++ b/sys.h
@@ -62,6 +62,7 @@ void Sys_Printf(const char *fmt, ...);
 void Sys_PrintToTerminal(const char *text);
 // (may) output text to terminal which launched program
 
+void Sys_Shutdown (void); //INFO: This is only called by Host_Shutdown so we dont need testing for recursion
 void Sys_Quit (void);
 
 double Sys_DoubleTime (void);
index ed68eec..ef11c6b 100644 (file)
@@ -21,15 +21,12 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 // =======================================================================
 // General routines
 // =======================================================================
-
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
 #ifndef WIN32
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
        fflush(stdout);
-       exit(0);
 }
 
 void Sys_Error (const char *error, ...)
index fd3642f..bc48f44 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 #endif
 
-
-
 // =======================================================================
 // General routines
 // =======================================================================
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
 #ifndef WIN32
        fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
 #endif
        fflush(stdout);
-       exit(0);
+       SDL_Quit();
 }
+       
 
 void Sys_Error (const char *error, ...)
 {
@@ -64,27 +62,7 @@ double Sys_DoubleTime (void)
        double newtime;
 #ifdef WIN32
        // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine.
-       if (sys_usetimegettime.integer)
-       {
-               static int firsttimegettime = true;
-               // timeGetTime
-               // platform:
-               // Windows 95/98/ME/NT/2000/XP
-               // features:
-               // reasonable accuracy (millisecond)
-               // issues:
-               // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter)
-
-               // make sure the timer is high precision, otherwise different versions of windows have varying accuracy
-               if (firsttimegettime)
-               {
-                       timeBeginPeriod (1);
-                       firsttimegettime = false;
-               }
-
-               newtime = (double) timeGetTime () / 1000.0;
-       }
-       else
+       if (!sys_usetimegettime.integer)
        {
                // QueryPerformanceCounter
                // platform:
@@ -109,12 +87,10 @@ double Sys_DoubleTime (void)
                timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0);
                newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
                #endif
-       }
-#else
-       struct timeval tp;
-       gettimeofday(&tp, NULL);
-       newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+       } else
 #endif
+       newtime = (double) SDL_GetTicks() / 1000.0;
+
 
        if (first)
        {
@@ -217,6 +193,10 @@ int SDL_main (int argc, char *argv[])
 
        Sys_Shared_EarlyInit();
 
+#ifdef WIN32
+       Cvar_RegisterVariable(&sys_usetimegettime);
+#endif
+
        Host_Init();
 
        Sys_Shared_LateInit();
index a72125f..dfd9a7a 100644 (file)
@@ -93,6 +93,11 @@ void Sys_Printf(const char *fmt, ...)
        Sys_Print(msg);
 }
 
+void Sys_Quit (void)
+{
+       Host_Shutdown();
+       exit(0);
+}
 
 char engineversion[128];
 
index 4114fdc..43d324d 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -93,10 +93,8 @@ void Sys_Error (const char *error, ...)
        exit (1);
 }
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-       Host_Shutdown();
-
        if (tevent)
                CloseHandle (tevent);
 
@@ -105,8 +103,6 @@ void Sys_Quit (void)
 
 // shut down QHOST hooks if necessary
        DeinitConProc ();
-
-       exit (0);
 }
 
 void Sys_PrintToTerminal(const char *text)
index 25252a9..69a11d7 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -16,7 +16,14 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+/*
+TODOs until first commit:
+       1. Hide and/or show the mouse whether the mainwindow is focused or not.
+       2. Minimize when losing focus in fullscreen mode.
+d      3. GrabInput while mainwindow is active.
+       4
 
+*/
 #include <SDL.h>
 #include <stdio.h>
 
@@ -24,9 +31,289 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // Tell startup code that we have a client
 int cl_available = true;
+static int vid_usingmouse;
+static int vid_isfullscreen;
 
 static SDL_Surface *screen;
 
+static Uint8 in_mouse_buttons;
+
+static void IN_Init( void );
+static void IN_Shutdown( void );
+
+/////////////////////////
+// Input handling
+////
+//TODO: Add joystick support
+//TODO: Add error checking
+
+
+//keysym to quake keysym mapping
+#define tenoh  0,0,0,0,0, 0,0,0,0,0
+#define fiftyoh tenoh, tenoh, tenoh, tenoh, tenoh
+#define hundredoh fiftyoh, fiftyoh
+static unsigned int tbl_sdltoquake[] = 
+{
+       0,0,0,0,                //SDLK_UNKNOWN          = 0,
+       0,0,0,0,                //SDLK_FIRST            = 0,
+       K_BACKSPACE,    //SDLK_BACKSPACE        = 8,
+       K_TAB,                  //SDLK_TAB                      = 9,
+       0,0,
+       0,                              //SDLK_CLEAR            = 12,
+       K_ENTER,                //SDLK_RETURN           = 13,
+    0,0,0,0,0,
+       K_PAUSE,                //SDLK_PAUSE            = 19,
+       0,0,0,0,0,0,0,
+       K_ESCAPE,               //SDLK_ESCAPE           = 27,
+       0,0,0,0,
+       K_SPACE,                //SDLK_SPACE            = 32,
+       '!',                    //SDLK_EXCLAIM          = 33,
+       '"',                    //SDLK_QUOTEDBL         = 34,
+       '#',                    //SDLK_HASH                     = 35,
+       '$',                    //SDLK_DOLLAR           = 36,
+       0,
+       '&',                    //SDLK_AMPERSAND        = 38,
+       '\'',                   //SDLK_QUOTE            = 39,
+       '(',                    //SDLK_LEFTPAREN        = 40,
+       ')',                    //SDLK_RIGHTPAREN       = 41,
+       '*',                    //SDLK_ASTERISK         = 42,
+       '+',                    //SDLK_PLUS                     = 43,
+       ',',                    //SDLK_COMMA            = 44,
+       '-',                    //SDLK_MINUS            = 45,
+       '.',                    //SDLK_PERIOD           = 46,
+       '/',                    //SDLK_SLASH            = 47,
+       '0',                    //SDLK_0                        = 48,
+       '1',                    //SDLK_1                        = 49,
+       '2',                    //SDLK_2                        = 50,
+       '3',                    //SDLK_3                        = 51,
+       '4',                    //SDLK_4                        = 52,
+       '5',                    //SDLK_5                        = 53,
+       '6',                    //SDLK_6                        = 54,
+       '7',                    //SDLK_7                        = 55,
+       '8',                    //SDLK_8                        = 56,
+       '9',                    //SDLK_9                        = 57,
+       ':',                    //SDLK_COLON            = 58,
+       ';',                    //SDLK_SEMICOLON        = 59,
+       '<',                    //SDLK_LESS                     = 60,
+       '=',                    //SDLK_EQUALS           = 61,
+       '>',                    //SDLK_GREATER          = 62,
+       '?',                    //SDLK_QUESTION         = 63,
+       '@',                    //SDLK_AT                       = 64,
+       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+       '[',            //SDLK_LEFTBRACKET      = 91,
+       '\\',           //SDLK_BACKSLASH        = 92,
+       ']',            //SDLK_RIGHTBRACKET     = 93,
+       '^',            //SDLK_CARET            = 94,
+       '_',            //SDLK_UNDERSCORE       = 95,
+       '`',            //SDLK_BACKQUOTE        = 96,
+       'a',            //SDLK_a                        = 97,
+       'b',            //SDLK_b                        = 98,
+       'c',            //SDLK_c                        = 99,
+       'd',            //SDLK_d                        = 100,
+       'e',            //SDLK_e                        = 101,
+       'f',            //SDLK_f                        = 102,
+       'g',            //SDLK_g                        = 103,
+       'h',            //SDLK_h                        = 104,
+       'i',            //SDLK_i                        = 105,
+       'j',            //SDLK_j                        = 106,
+       'k',            //SDLK_k                        = 107,
+       'l',            //SDLK_l                        = 108,
+       'm',            //SDLK_m                        = 109,
+       'n',            //SDLK_n                        = 110,
+       'o',            //SDLK_o                        = 111,
+       'p',            //SDLK_p                        = 112,
+       'q',            //SDLK_q                        = 113,
+       'r',            //SDLK_r                        = 114,
+       's',            //SDLK_s                        = 115,
+       't',            //SDLK_t                        = 116,
+       'u',            //SDLK_u                        = 117,
+       'v',            //SDLK_v                        = 118,
+       'w',            //SDLK_w                        = 119,
+       'x',            //SDLK_x                        = 120,
+       'y',            //SDLK_y                        = 121,
+       'z',            //SDLK_z                        = 122,
+       0,0,0,0,
+       K_DEL,          //SDLK_DELETE           = 127,
+       hundredoh /*227*/, tenoh, tenoh, 0,0,0,0,0,0,0,0,
+       K_KP_0,         //SDLK_KP0              = 256,
+       K_KP_1,         //SDLK_KP1              = 257,
+       K_KP_2,         //SDLK_KP2              = 258,
+       K_KP_3,         //SDLK_KP3              = 259,
+       K_KP_4,         //SDLK_KP4              = 260,
+       K_KP_5,         //SDLK_KP5              = 261,
+       K_KP_6,         //SDLK_KP6              = 262,
+       K_KP_7,         //SDLK_KP7              = 263,
+       K_KP_8,         //SDLK_KP8              = 264,
+       K_KP_9,         //SDLK_KP9              = 265,
+       K_KP_PERIOD,//SDLK_KP_PERIOD    = 266,
+       K_KP_DIVIDE,//SDLK_KP_DIVIDE    = 267,
+       K_KP_MULTIPLY,//SDLK_KP_MULTIPLY= 268,
+       K_KP_MINUS,     //SDLK_KP_MINUS         = 269,
+       K_KP_PLUS,      //SDLK_KP_PLUS          = 270,
+       K_KP_ENTER,     //SDLK_KP_ENTER         = 271,
+       K_KP_EQUALS,//SDLK_KP_EQUALS    = 272,
+       K_UPARROW,      //SDLK_UP               = 273,
+       K_DOWNARROW,//SDLK_DOWN         = 274,
+       K_RIGHTARROW,//SDLK_RIGHT       = 275,
+       K_LEFTARROW,//SDLK_LEFT         = 276,
+       K_INS,          //SDLK_INSERT   = 277,
+       K_HOME,         //SDLK_HOME             = 278,
+       K_END,          //SDLK_END              = 279,
+       K_PGUP,         //SDLK_PAGEUP   = 280,
+       K_PGDN,         //SDLK_PAGEDOWN = 281,
+       K_F1,           //SDLK_F1               = 282,
+       K_F2,           //SDLK_F2               = 283,
+       K_F3,           //SDLK_F3               = 284,
+       K_F4,           //SDLK_F4               = 285,
+       K_F5,           //SDLK_F5               = 286,
+       K_F6,           //SDLK_F6               = 287,
+       K_F7,           //SDLK_F7               = 288,
+       K_F8,           //SDLK_F8               = 289,
+       K_F9,           //SDLK_F9               = 290,
+       K_F10,          //SDLK_F10              = 291,
+       K_F11,          //SDLK_F11              = 292,
+       K_F12,          //SDLK_F12              = 293,
+       0,                      //SDLK_F13              = 294,
+       0,                      //SDLK_F14              = 295,
+       0,                      //SDLK_F15              = 296,
+       0,0,0,
+       K_NUMLOCK,      //SDLK_NUMLOCK  = 300,
+       K_CAPSLOCK,     //SDLK_CAPSLOCK = 301,
+       K_SCROLLOCK,//SDLK_SCROLLOCK= 302,
+       K_SHIFT,        //SDLK_RSHIFT   = 303,
+       K_SHIFT,        //SDLK_LSHIFT   = 304,
+       K_CTRL,         //SDLK_RCTRL    = 305,
+       K_CTRL,         //SDLK_LCTRL    = 306,
+       K_ALT,          //SDLK_RALT             = 307,
+       K_ALT,          //SDLK_LALT             = 308,
+       0,                      //SDLK_RMETA    = 309,
+       0,                      //SDLK_LMETA    = 310,
+       0,                      //SDLK_LSUPER   = 311,          /* Left "Windows" key */
+       0,                      //SDLK_RSUPER   = 312,          /* Right "Windows" key */
+       0,                      //SDLK_MODE             = 313,          /* "Alt Gr" key */
+       0,                      //SDLK_COMPOSE  = 314,          /* Multi-key compose key */
+       0,                      //SDLK_HELP             = 315,
+       0,                      //SDLK_PRINT    = 316,
+       0,                      //SDLK_SYSREQ   = 317,
+       K_PAUSE,        //SDLK_BREAK    = 318,
+       0,                      //SDLK_MENU             = 319,
+       0,                      //SDLK_POWER    = 320,          /* Power Macintosh power key */
+       'e',            //SDLK_EURO             = 321,          /* Some european keyboards */
+       0                       //SDLK_UNDO             = 322,          /* Atari keyboard has Undo */
+};
+#undef tenoh
+#undef fiftyoh
+#undef hundredoh
+
+static int MapKey( int sdlkey )
+{
+       if( sdlkey > sizeof(tbl_sdltoquake)/ sizeof(int) )
+               return 0;
+    return tbl_sdltoquake[ sdlkey ];
+}
+
+static void IN_Activate( void )
+{
+       SDL_WM_GrabInput( SDL_GRAB_ON );
+       SDL_ShowCursor( SDL_DISABLE );
+}
+
+static void IN_Deactivate( void )
+{
+       SDL_WM_GrabInput( SDL_GRAB_OFF );
+       SDL_ShowCursor( SDL_ENABLE );
+}
+
+void IN_Commands (void)
+{
+}
+
+static void IN_MouseMove (usercmd_t *cmd)
+{
+       int x, y;
+       Uint8 state;
+       int i;
+
+       if( !vid_usingmouse ) {
+               IN_Mouse( cmd, 0, 0 );
+               return;
+       }
+
+       state = SDL_GetRelativeMouseState( &x, &y );
+       for( i = 0; i < 8 ; i++ )
+               if( state & ~in_mouse_buttons & 1 << i  )
+                       Key_Event( K_MOUSE1 + i, 0, true );
+               else if( ~state & in_mouse_buttons & 1 << i )
+                       Key_Event( K_MOUSE1 + i, 0, false );
+
+       in_mouse_buttons = state;
+    
+       IN_Mouse( cmd, x, y );
+}
+
+void IN_Move( usercmd_t *cmd )
+{
+       IN_MouseMove( cmd );    
+}
+
+static void IN_Init( void )
+{
+       // init keyboard
+       SDL_EnableUNICODE( SDL_ENABLE );
+
+       // init mouse
+       in_mouse_buttons = SDL_GetMouseState( NULL, NULL );
+       vid_usingmouse = false;
+}
+
+static void IN_Shutdown( void )
+{
+}
+
+/////////////////////
+// Message Handling
+////
+
+static int Sys_EventFilter( SDL_Event *event ) 
+{
+       //TODO: Add a quit query in linux, too - though linux user are more likely to know what they do
+#ifdef WIN32
+       if( event->type == SDL_QUIT && MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO )
+               return 0;
+       else 
+               return 1;
+#else
+       return 1;
+#endif
+}
+
+void Sys_SendKeyEvents( void )
+{
+       SDL_Event event;
+
+       while( SDL_PollEvent( &event ) )
+               switch( event.type ) {
+                       case SDL_QUIT:
+                               Sys_Quit();
+                               break;
+                       case SDL_KEYDOWN:
+                       case SDL_KEYUP:
+                               Key_Event( MapKey( event.key.keysym.sym ), event.key.keysym.unicode, (event.key.state == SDL_PRESSED) );
+                               break;
+                       case SDL_ACTIVEEVENT:
+                               if( event.active.state == SDL_APPACTIVE ) 
+                                       if( event.active.gain )
+                                               vid_hidden = false;
+                                       else
+                                               vid_hidden = true;
+                               break;
+               }
+}
+
+/////////////////
+// Video system
+////
+
 void *GL_GetProcAddress(const char *name)
 {
        void *p = NULL;
@@ -34,17 +321,29 @@ void *GL_GetProcAddress(const char *name)
        return p;
 }
 
+static int Sys_EventFilter( SDL_Event *event );
 void VID_Init (void)
 {
        if (SDL_Init(SDL_INIT_VIDEO) < 0)
-               printf ("Failed to init video: %s\n", SDL_GetError());
+               Sys_Error ("Failed to init video: %s\n", SDL_GetError());
+       vid_isfullscreen = false;
+
+       SDL_SetEventFilter( (SDL_EventFilter) Sys_EventFilter );
+       IN_Init();
 }
 
 int VID_InitMode(int fullscreen, int width, int height, int bpp)
 {
        int i;
        int flags = SDL_OPENGL;
-       char *drivername;
+       const char *drivername;
+
+       /* 
+       SDL Hack 
+               We cant switch from one OpenGL video mode to another.
+               Thus we first switch to some stupid 2D mode and then back to OpenGL.
+       */
+       SDL_SetVideoMode( 0, 0, 0, 0 );
 
 #ifdef WIN32
        drivername = "opengl32.dll";
@@ -57,7 +356,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                drivername = com_argv[i + 1];
-       if (!SDL_GL_LoadLibrary(drivername))
+       if (SDL_GL_LoadLibrary(drivername))
        {   
                Con_Printf("Unable to load GL driver \"%s\": ", drivername, SDL_GetError());
                return false;
@@ -74,8 +373,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
                return false;
        }
 
-//     if (fullscreen)
-//             flags |= SDL_FULLSCREEN;
+       vid_isfullscreen = false;
+       if (fullscreen) {
+               flags |= SDL_FULLSCREEN;
+               vid_isfullscreen = true;
+       }
 
        SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
        SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
@@ -97,27 +399,33 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
        gl_extensions = qglGetString(GL_EXTENSIONS);
        gl_platform = "SDL";
        // Knghtbrd: should assign platform-specific extensions here
+       //TODO: maybe ;)
        gl_platformextensions = "";
+       gl_videosyncavailable = false;
        
        GL_Init();
 
        vid_hidden = false;
+       vid_activewindow = false;
+       vid_usingmouse = false;
+       IN_Init();
        return true;
 }
 
 void VID_Shutdown (void)
 {
-//     SDL_Quit();
+       IN_Shutdown();
+       SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
 int VID_SetGamma (unsigned short *ramps)
 {
-       return false;
+       return !SDL_SetGammaRamp (ramps, ramps + 256, ramps + 512);
 }
 
 int VID_GetGamma (unsigned short *ramps)
 {
-       return false;
+       return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
 }
 
 void VID_GetWindowSize (int *x, int *y, int *width, int *height)
@@ -129,19 +437,33 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 
 void VID_Finish (void)
 {
+       Uint8 appstate;
+       int vid_usemouse;
+
        qglFinish();
        SDL_GL_SwapBuffers();
-}
 
-void IN_Commands (void)
-{
-}
+       //react on appstate changes
+       appstate = SDL_GetAppState();
 
-void IN_Move (usercmd_t *cmd)
-{
-}
+       if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
+               vid_activewindow = false;
+       else 
+               vid_activewindow = true;
 
-void Sys_SendKeyEvents (void)
-{
-}
+       vid_usemouse = false;
+       if( vid_mouse.integer && !key_consoleactive )
+               vid_usemouse = true;
+       if( vid_isfullscreen )
+               vid_usemouse = true;
+       if( !vid_activewindow )
+               vid_usemouse = false;
 
+       if( vid_usemouse && !vid_usingmouse ) {
+               vid_usingmouse = true;
+               IN_Activate();
+       } else if( !vid_usemouse && vid_usingmouse ) {
+               vid_usingmouse = false;
+               IN_Deactivate();
+       }
+}
index da0bee7..fec366f 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -1333,7 +1333,7 @@ void IN_MouseMove (usercmd_t *cmd)
        {
                GetCursorPos (&current_pos);
                //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
-               in_mouse_x = in_mouse_y = 0;
+               IN_Mouse( cmd, 0, 0 );
                return;
        }