diff --git a/libs/video/targets/in_sdl.c b/libs/video/targets/in_sdl.c index 60f3ec1aa..1d7b2058a 100644 --- a/libs/video/targets/in_sdl.c +++ b/libs/video/targets/in_sdl.c @@ -57,8 +57,6 @@ int modestate; // FIXME: just to avoid cross-comp. // errors - remove later -static int mouse_oldbuttonstate = 0; - /* IN_SendKeyEvents */ @@ -168,64 +166,67 @@ IN_LL_SendKeyEvents (void) break; case SDLK_KP0: if (modstate & KMOD_NUM) - sym = K_INS; + sym = KP_INS; else sym = SDLK_0; break; case SDLK_KP1: if (modstate & KMOD_NUM) - sym = K_END; + sym = KP_END; else sym = SDLK_1; break; case SDLK_KP2: if (modstate & KMOD_NUM) - sym = K_DOWNARROW; + sym = KP_DOWNARROW; else sym = SDLK_2; break; case SDLK_KP3: if (modstate & KMOD_NUM) - sym = K_PGDN; + sym = KP_PGDN; else sym = SDLK_3; break; case SDLK_KP4: if (modstate & KMOD_NUM) - sym = K_LEFTARROW; + sym = KP_LEFTARROW; else sym = SDLK_4; break; case SDLK_KP5: - sym = SDLK_5; + if (modstate & KMOD_NUM) + sym = KP_5; + else + sym = SDLK_5; break; case SDLK_KP6: if (modstate & KMOD_NUM) - sym = K_RIGHTARROW; + sym = KP_RIGHTARROW; else sym = SDLK_6; break; case SDLK_KP7: if (modstate & KMOD_NUM) - sym = K_HOME; + sym = KP_HOME; else sym = SDLK_7; break; case SDLK_KP8: if (modstate & KMOD_NUM) - sym = K_UPARROW; + sym = KP_UPARROW; else sym = SDLK_8; break; case SDLK_KP9: if (modstate & KMOD_NUM) - sym = K_PGUP; + sym = KP_PGUP; else sym = SDLK_9; break; case SDLK_KP_PERIOD: if (modstate & KMOD_NUM) - sym = K_DEL; + sym = KP_DEL; else sym = SDLK_PERIOD; break; @@ -271,39 +272,19 @@ IN_LL_SendKeyEvents (void) == SDL_MOUSEBUTTONDOWN); break; case 4: - Key_Event (K_MWHEELUP, 0, - event.type == SDL_MOUSEBUTTONDOWN); + Key_Event (K_MWHEELUP, 0, true); + Key_Event (K_MWHEELUP, 0, false); break; case 5: - Key_Event (K_MWHEELDOWN, 0, - event.type == SDL_MOUSEBUTTONDOWN); + Key_Event (K_MWHEELDOWN, 0, true); + Key_Event (K_MWHEELDOWN, 0, false); break; } break; case SDL_MOUSEMOTION: - if (_windowed_mouse->value) { - if ((event.motion.x != (vid.width / 2)) - || (event.motion.y != (vid.height / 2))) { - // *2 for vid_sdl.c, *10 for vid_sgl.c. - in_mouse_x = event.motion.xrel * 5; - in_mouse_y = event.motion.yrel * 5; - if ( - (event.motion.x < - ((vid.width / 2) - (vid.width / 4))) - || (event.motion.x > - ((vid.width / 2) + (vid.width / 4))) - || (event.motion.y < - ((vid.height / 2) - (vid.height / 4))) - || (event.motion.y > - ((vid.height / 2) + (vid.height / 4)))) - SDL_WarpMouse (vid.width / 2, vid.height / 2); - } - } else { - // following are *2 in vid_sdl.c, vid_sgl.c is *10 - in_mouse_x = event.motion.xrel * 5; - in_mouse_y = event.motion.yrel * 5; - } + in_mouse_x += event.motion.xrel; + in_mouse_y += event.motion.yrel; break; case SDL_QUIT: @@ -325,11 +306,11 @@ IN_LL_Commands (void) if (old_windowed_mouse != _windowed_mouse->value) { old_windowed_mouse = _windowed_mouse->value; if (!_windowed_mouse->value) { -// SDL_ShowCursor (0); + SDL_ShowCursor (1); SDL_WM_GrabInput (SDL_GRAB_OFF); } else { SDL_WM_GrabInput (SDL_GRAB_ON); -// SDL_ShowCursor (1); + SDL_ShowCursor (0); } } } @@ -344,9 +325,6 @@ IN_LL_Init (void) in_mouse_x = in_mouse_y = 0.0; in_mouse_avail = 1; -// SDL_ShowCursor (0); -// SDL_WM_GrabInput (SDL_GRAB_ON); -// FIXME: disable DGA if in_dgamouse says to. } void @@ -360,30 +338,6 @@ IN_LL_Shutdown (void) in_mouse_avail = 0; } -void -IN_LL_Frame (void) -{ - int i; - int mouse_buttonstate; - - if (!in_mouse_avail) - return; - - i = SDL_GetMouseState (NULL, NULL); - /* Quake swaps the second and third buttons */ - mouse_buttonstate = (i & ~0x06) | ((i & 0x02) << 1) | ((i & 0x04) >> 1); - for (i = 0; i < 3; i++) { - if ((mouse_buttonstate & (1 << i)) - && !(mouse_oldbuttonstate & (1 << i))) Key_Event (K_MOUSE1 + i, 0, - true); - - if (!(mouse_buttonstate & (1 << i)) - && (mouse_oldbuttonstate & (1 << i))) Key_Event (K_MOUSE1 + i, 0, - false); - } - mouse_oldbuttonstate = mouse_buttonstate; -} - void IN_LL_ClearStates (void) { diff --git a/libs/video/targets/vid_sgl.c b/libs/video/targets/vid_sgl.c index 8300eee88..9d3f478c4 100644 --- a/libs/video/targets/vid_sgl.c +++ b/libs/video/targets/vid_sgl.c @@ -60,16 +60,6 @@ HWND mainwindow; #endif -#ifndef SDL_COMPILEDVERSION -#define SDL_COMPILEDVERSION \ - SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL) -#endif - -#ifndef SDL_VERSION_ATLEAST -#define SDL_VERSION_ATLEAST(X, Y, Z) \ - (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) -#endif - #define WARP_WIDTH 320 #define WARP_HEIGHT 200 @@ -87,11 +77,7 @@ extern void VID_Init8bitPalette (void); void VID_SDL_GammaCheck (void) { -#if SDL_VERSION_ATLEAST(1, 2, 0) Uint16 redtable[256], greentable[256], bluetable[256]; -#else - Uint8 redtable[256], greentable[256], bluetable[256]; -#endif if (SDL_GetGammaRamp(redtable, greentable, bluetable) < 0) vid_gamma_avail = false; @@ -102,9 +88,6 @@ VID_SDL_GammaCheck (void) void VID_Shutdown (void) { -// if (!vid.initialized) -// return; -// Con_Printf ("VID_Shutdown\n"); SDL_Quit (); } @@ -202,9 +185,9 @@ VID_Init (unsigned char *palette) } // Setup GL Attributes - SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1); - SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1); - SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1); + SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 4); + SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 4); + SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 4); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 1); @@ -217,7 +200,7 @@ VID_Init (unsigned char *palette) vid.width = vid.conwidth = min (vid.conwidth, scr_width); Con_CheckResize (); // Now that we have a window size, fix console - vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0); + vid.aspect = ((float) vid.height / (float) vid.width) * (4.0 / 3.0); vid.numpages = 2; #ifndef WIN32