X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=2fb307c52d41b65ec095bf81b7ee9f5bfed7aceb;hp=12214d2ab5b70cfa962ce8ff797188de247cae28;hb=e2e22c8380e0e9e6be93a25ebf201ca932a8b7bc;hpb=94f6390e1e8066e0a63cf4430b7b28a46a89d545 diff --git a/vid_sdl.c b/vid_sdl.c index 12214d2a..2fb307c5 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -static cvar_t apple_mouse_noaccel = {CVAR_CLIENT | CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"}; -static qboolean vid_usingnoaccel; +static cvar_t apple_mouse_noaccel = {CF_CLIENT | CF_ARCHIVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"}; +static qbool vid_usingnoaccel; static double originalMouseSpeed = -1.0; io_connect_t IN_GetIOHandle(void) { @@ -63,17 +63,17 @@ io_connect_t IN_GetIOHandle(void) // Tell startup code that we have a client int cl_available = true; -qboolean vid_supportrefreshrate = false; +qbool vid_supportrefreshrate = false; -static qboolean vid_usingmouse = false; -static qboolean vid_usingmouse_relativeworks = false; // SDL2 workaround for unimplemented RelativeMouse mode -static qboolean vid_usinghidecursor = false; -static qboolean vid_hasfocus = false; -static qboolean vid_isfullscreen; -static qboolean vid_usingvsync = false; +static qbool vid_usingmouse = false; +static qbool vid_usingmouse_relativeworks = false; // SDL2 workaround for unimplemented RelativeMouse mode +static qbool vid_usinghidecursor = false; +static qbool vid_hasfocus = false; +static qbool vid_isfullscreen; +static qbool vid_usingvsync = false; static SDL_Joystick *vid_sdljoystick = NULL; static SDL_GameController *vid_sdlgamecontroller = NULL; -static cvar_t joy_sdl2_trigger_deadzone = {CVAR_SAVE | CVAR_CLIENT, "joy_sdl2_trigger_deadzone", "0.5", "deadzone for triggers to be registered as key presses"}; +static cvar_t joy_sdl2_trigger_deadzone = {CF_ARCHIVE | CF_CLIENT, "joy_sdl2_trigger_deadzone", "0.5", "deadzone for triggers to be registered as key presses"}; // GAME_STEELSTORM specific static cvar_t *steelstorm_showing_map = NULL; // detect but do not create the cvar static cvar_t *steelstorm_showing_mousecursor = NULL; // detect but do not create the cvar @@ -341,12 +341,12 @@ static int MapKey( unsigned int sdlkey ) } } -qboolean VID_HasScreenKeyboardSupport(void) +qbool VID_HasScreenKeyboardSupport(void) { return SDL_HasScreenKeyboardSupport() != SDL_FALSE; } -void VID_ShowKeyboard(qboolean show) +void VID_ShowKeyboard(qbool show) { if (!SDL_HasScreenKeyboardSupport()) return; @@ -363,12 +363,12 @@ void VID_ShowKeyboard(qboolean show) } } -qboolean VID_ShowingKeyboard(void) +qbool VID_ShowingKeyboard(void) { return SDL_IsTextInputActive() != 0; } -void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) +void VID_SetMouse(qbool fullscreengrab, qbool relative, qbool hidecursor) { #ifndef DP_MOBILETOUCH #ifdef MACOSX @@ -455,14 +455,14 @@ float multitouch[MAXFINGERS][3]; int multitouchs[MAXFINGERS]; // modified heavily by ELUAN -static qboolean VID_TouchscreenArea(int corner, float px, float py, float pwidth, float pheight, const char *icon, float textheight, const char *text, float *resultmove, qboolean *resultbutton, keynum_t key, const char *typedtext, float deadzone, float oversizepixels_x, float oversizepixels_y, qboolean iamexclusive) +static qbool VID_TouchscreenArea(int corner, float px, float py, float pwidth, float pheight, const char *icon, float textheight, const char *text, float *resultmove, qbool *resultbutton, keynum_t key, const char *typedtext, float deadzone, float oversizepixels_x, float oversizepixels_y, qbool iamexclusive) { int finger; float fx, fy, fwidth, fheight; float overfx, overfy, overfwidth, overfheight; float rel[3]; float sqsum; - qboolean button = false; + qbool button = false; VectorClear(rel); if (pwidth > 0 && pheight > 0) { @@ -568,11 +568,11 @@ static qboolean VID_TouchscreenArea(int corner, float px, float py, float pwidth // ELUAN: // not reentrant, but we only need one mouse cursor anyway... -static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheight, qboolean *resultbutton, keynum_t key) +static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheight, qbool *resultbutton, keynum_t key) { int finger; float fx, fy, fwidth, fheight; - qboolean button = false; + qbool button = false; static int cursorfinger = -1; static int cursorfreemovement = false; static int canclick = false; @@ -607,7 +607,7 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh } if (scr_numtouchscreenareas < 128) { - if (clickrealtime + 1 > realtime) + if (clickrealtime + 1 > host.realtime) { scr_touchscreenareas[scr_numtouchscreenareas].pic = "gfx/gui/touch_puck_cur_click.tga"; } @@ -617,7 +617,7 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh } else { - switch ((int)realtime * 10 % 20) + switch ((int)host.realtime * 10 % 20) { case 0: scr_touchscreenareas[scr_numtouchscreenareas].pic = "gfx/gui/touch_puck_cur_touch.tga"; @@ -671,11 +671,11 @@ static void VID_TouchscreenCursor(float px, float py, float pwidth, float pheigh { Key_Event(key, 0, true); canclick = false; - clickrealtime = realtime; + clickrealtime = host.realtime; } // SS:BR can't qc can't cope with presses and releases on the same frame - if (clickrealtime && clickrealtime + 0.1 < realtime) + if (clickrealtime && clickrealtime + 0.1 < host.realtime) { Key_Event(key, 0, false); clickrealtime = 0; @@ -699,10 +699,10 @@ void VID_BuildJoyState(vid_joystate_t *joystate) { for (j = 0; j <= SDL_CONTROLLER_AXIS_MAX; ++j) { - joystate->axis[j] = SDL_GameControllerGetAxis(vid_sdlgamecontroller, j) * (1.0f / 32767.0f); + joystate->axis[j] = SDL_GameControllerGetAxis(vid_sdlgamecontroller, (SDL_GameControllerAxis)j) * (1.0f / 32767.0f); } for (j = 0; j < SDL_CONTROLLER_BUTTON_MAX; ++j) - joystate->button[j] = SDL_GameControllerGetButton(vid_sdlgamecontroller, j); + joystate->button[j] = SDL_GameControllerGetButton(vid_sdlgamecontroller, (SDL_GameControllerButton)j); // emulate joy buttons for trigger "axes" joystate->button[SDL_CONTROLLER_BUTTON_MAX] = VID_JoyState_GetAxis(joystate, SDL_CONTROLLER_AXIS_TRIGGERLEFT, 1, joy_sdl2_trigger_deadzone.value) > 0.0f; joystate->button[SDL_CONTROLLER_BUTTON_MAX+1] = VID_JoyState_GetAxis(joystate, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, 1, joy_sdl2_trigger_deadzone.value) > 0.0f; @@ -761,8 +761,8 @@ static void IN_Move_TouchScreen_SteelStorm(void) int i, numfingers; float xscale, yscale; float move[3], aim[3]; - static qboolean oldbuttons[128]; - static qboolean buttons[128]; + static qbool oldbuttons[128]; + static qbool buttons[128]; keydest_t keydest = (key_consoleactive & KEY_CONSOLEACTIVE_USER) ? key_console : key_dest; memcpy(oldbuttons, buttons, sizeof(oldbuttons)); memset(multitouchs, 0, sizeof(multitouchs)); @@ -874,8 +874,8 @@ static void IN_Move_TouchScreen_Quake(void) { int x, y; float move[3], aim[3], click[3]; - static qboolean oldbuttons[128]; - static qboolean buttons[128]; + static qbool oldbuttons[128]; + static qbool buttons[128]; keydest_t keydest = (key_consoleactive & KEY_CONSOLEACTIVE_USER) ? key_console : key_dest; memcpy(oldbuttons, buttons, sizeof(oldbuttons)); memset(multitouchs, 0, sizeof(multitouchs)); @@ -894,7 +894,7 @@ static void IN_Move_TouchScreen_Quake(void) if (!VID_ShowingKeyboard()) { // user entered a command, close the console now - Con_ToggleConsole_f(&cmd_client); + Con_ToggleConsole_f(cmd_local); } VID_TouchscreenArea( 0, 0, 0, 0, 0, NULL , 0.0f, NULL, NULL, &buttons[15], (keynum_t)0, NULL, 0, 0, 0, true); VID_TouchscreenArea( 0, 0, 0, 0, 0, NULL , 0.0f, NULL, move, &buttons[0], K_MOUSE4, NULL, 0, 0, 0, true); @@ -944,7 +944,7 @@ void IN_Move( void ) static int old_x = 0, old_y = 0; static int stuck = 0; static keydest_t oldkeydest; - static qboolean oldshowkeyboard; + static qbool oldshowkeyboard; int x, y; vid_joystate_t joystate; keydest_t keydest = (key_consoleactive & KEY_CONSOLEACTIVE_USER) ? key_console : key_dest; @@ -1022,7 +1022,7 @@ void IN_Move( void ) //// #ifdef SDL_R_RESTART -static qboolean sdl_needs_restart; +static qbool sdl_needs_restart; static void sdl_start(void) { } @@ -1060,10 +1060,10 @@ static keynum_t buttonremap[] = // SDL2 void Sys_SendKeyEvents( void ) { - static qboolean sound_active = true; + static qbool sound_active = true; int keycode; int i; - qboolean isdown; + qbool isdown; Uchar unicode; SDL_Event event; @@ -1076,7 +1076,7 @@ void Sys_SendKeyEvents( void ) #ifdef DEBUGSDLEVENTS Con_DPrintf("SDL_Event: SDL_QUIT\n"); #endif - Sys_Quit(0); + host.state = host_shutdown; break; case SDL_KEYDOWN: case SDL_KEYUP: @@ -1179,7 +1179,7 @@ void Sys_SendKeyEvents( void ) // so, let's better queue it for next frame if(!sdl_needs_restart) { - Cbuf_AddText(&cmd_client, "\nr_restart\n"); + Cbuf_AddText(cmd_local, "\nr_restart\n"); sdl_needs_restart = true; } #endif @@ -1202,7 +1202,7 @@ void Sys_SendKeyEvents( void ) vid_hasfocus = false; break; case SDL_WINDOWEVENT_CLOSE: - Sys_Quit(0); + host.state = host_shutdown; break; } } @@ -1311,12 +1311,12 @@ void *GL_GetProcAddress(const char *name) return p; } -qboolean GL_ExtensionSupported(const char *name) +qbool GL_ExtensionSupported(const char *name) { return SDL_GL_ExtensionSupported(name); } -static qboolean vid_sdl_initjoysticksystem = false; +static qbool vid_sdl_initjoysticksystem = false; void VID_Init (void) { @@ -1338,16 +1338,16 @@ void VID_Init (void) Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError()); vid_sdl_initjoysticksystem = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0; if (!vid_sdl_initjoysticksystem) - Con_Printf("Failed to init SDL joystick subsystem: %s\n", SDL_GetError()); + Con_Printf(CON_ERROR "Failed to init SDL joystick subsystem: %s\n", SDL_GetError()); vid_isfullscreen = false; } static int vid_sdljoystickindex = -1; -void VID_EnableJoystick(qboolean enable) +void VID_EnableJoystick(qbool enable) { int index = joy_enable.integer > 0 ? joy_index.integer : -1; int numsdljoysticks; - qboolean success = false; + qbool success = false; int sharedcount = 0; int sdlindex = -1; sharedcount = VID_Shared_SetJoystick(index); @@ -1392,7 +1392,7 @@ void VID_EnableJoystick(qboolean enable) } else { - Con_Printf("Joystick %i failed (SDL_JoystickOpen(%i) returned: %s)\n", index, sdlindex, SDL_GetError()); + Con_Printf(CON_ERROR "Joystick %i failed (SDL_JoystickOpen(%i) returned: %s)\n", index, sdlindex, SDL_GetError()); sdlindex = -1; } } @@ -1418,6 +1418,11 @@ static void VID_OutputVersion(void) #ifdef WIN32 static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) { + int workWidth; + int workHeight; + int titleBarPixels = 2; + int screenHeight; + RECT workArea; LONG width = mode->width; // vid_width LONG height = mode->height; // vid_height @@ -1428,16 +1433,14 @@ static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) rect->bottom = height; AdjustWindowRectEx(rect, WS_CAPTION|WS_THICKFRAME, false, 0); - RECT workArea; SystemParametersInfo(SPI_GETWORKAREA, 0, &workArea, 0); - int workWidth = workArea.right - workArea.left; - int workHeight = workArea.bottom - workArea.top; + workWidth = workArea.right - workArea.left; + workHeight = workArea.bottom - workArea.top; // SDL forces the window height to be <= screen height - 27px (on Win8.1 - probably intended for the title bar) // If the task bar is docked to the the left screen border and we move the window to negative y, // there would be some part of the regular desktop visible on the bottom of the screen. - int titleBarPixels = 2; - int screenHeight = GetSystemMetrics(SM_CYSCREEN); + screenHeight = GetSystemMetrics(SM_CYSCREEN); if (screenHeight == workHeight) titleBarPixels = -rect->top; @@ -1459,13 +1462,21 @@ static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) } #endif -static qboolean VID_InitModeGL(viddef_mode_t *mode) +extern cvar_t gl_info_vendor; +extern cvar_t gl_info_renderer; +extern cvar_t gl_info_version; +extern cvar_t gl_info_platform; +extern cvar_t gl_info_driver; + +static qbool VID_InitModeGL(viddef_mode_t *mode) { int windowflags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL; + // currently SDL_WINDOWPOS_UNDEFINED behaves exactly like SDL_WINDOWPOS_CENTERED, this might change some day + // https://trello.com/c/j56vUcwZ/81-centered-vs-undefined-window-position int xPos = SDL_WINDOWPOS_UNDEFINED; int yPos = SDL_WINDOWPOS_UNDEFINED; -#ifndef USE_GLES2 int i; +#ifndef USE_GLES2 const char *drivername; #endif @@ -1482,12 +1493,12 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) drivername = NULL; // COMMANDLINEOPTION: SDL GL: -gl_driver selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it - i = COM_CheckParm("-gl_driver"); - if (i && i < com_argc - 1) - drivername = com_argv[i + 1]; + i = Sys_CheckParm("-gl_driver"); + if (i && i < sys.argc - 1) + drivername = sys.argv[i + 1]; if (SDL_GL_LoadLibrary(drivername) < 0) { - Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError()); + Con_Printf(CON_ERROR "Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError()); return false; } #endif @@ -1514,16 +1525,27 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) vid_isfullscreen = true; } else { + if (vid_borderless.integer) + windowflags |= SDL_WINDOW_BORDERLESS; #ifdef WIN32 - RECT rect; - AdjustWindowBounds(mode, &rect); - xPos = rect.left; - yPos = rect.top; + if (vid_ignore_taskbar.integer) { + xPos = SDL_WINDOWPOS_CENTERED; + yPos = SDL_WINDOWPOS_CENTERED; + } + else { + RECT rect; + AdjustWindowBounds(mode, &rect); + xPos = rect.left; + yPos = rect.top; + } #endif } } //flags |= SDL_HWSURFACE; + if (vid_mouse_clickthrough.integer && !vid_isfullscreen) + SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); + SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8); SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 8); @@ -1556,7 +1578,7 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) window = SDL_CreateWindow(gamename, xPos, yPos, mode->width, mode->height, windowflags); if (window == NULL) { - Con_Printf("Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); + Con_Printf(CON_ERROR "Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); VID_Shutdown(); return false; } @@ -1564,7 +1586,7 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) context = SDL_GL_CreateContext(window); if (context == NULL) { - Con_Printf("Failed to initialize OpenGL context: %s\n", SDL_GetError()); + Con_Printf(CON_ERROR "Failed to initialize OpenGL context: %s\n", SDL_GetError()); VID_Shutdown(); return false; } @@ -1577,11 +1599,6 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) GL_Setup(); // VorteX: set other info - extern cvar_t gl_info_vendor; - extern cvar_t gl_info_renderer; - extern cvar_t gl_info_version; - extern cvar_t gl_info_platform; - extern cvar_t gl_info_driver; Cvar_SetQuick(&gl_info_vendor, gl_vendor); Cvar_SetQuick(&gl_info_renderer, gl_renderer); Cvar_SetQuick(&gl_info_version, gl_version); @@ -1589,10 +1606,15 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode) Cvar_SetQuick(&gl_info_driver, gl_driver); // LadyHavoc: report supported extensions + Con_DPrintf("\nQuakeC extensions for server and client:"); + for (i = 0; vm_sv_extensions[i]; i++) + Con_DPrintf(" %s", vm_sv_extensions[i]); + Con_DPrintf("\n"); #ifdef CONFIG_MENU - Con_DPrintf("\nQuakeC extensions for server and client: %s\nQuakeC extensions for menu: %s\n", vm_sv_extensions, vm_m_extensions); -#else - Con_DPrintf("\nQuakeC extensions for server and client: %s\n", vm_sv_extensions); + Con_DPrintf("\nQuakeC extensions for menu:"); + for (i = 0; vm_m_extensions[i]; i++) + Con_DPrintf(" %s", vm_m_extensions[i]); + Con_DPrintf("\n"); #endif // clear to black (loading plaque will be seen over this) @@ -1614,7 +1636,7 @@ extern cvar_t gl_info_version; extern cvar_t gl_info_platform; extern cvar_t gl_info_driver; -qboolean VID_InitMode(viddef_mode_t *mode) +qbool VID_InitMode(viddef_mode_t *mode) { // GAME_STEELSTORM specific steelstorm_showing_map = Cvar_FindVar(&cvars_all, "steelstorm_showing_map", ~0); @@ -1644,7 +1666,7 @@ void VID_Shutdown (void) void VID_Finish (void) { - qboolean vid_usevsync; + qbool vid_usevsync; vid_activewindow = !vid_hidden && vid_hasfocus; VID_UpdateGamma();