#include <IOKit/hidsystem/IOHIDLib.h>
#include <IOKit/hidsystem/IOHIDParameter.h>
#include <IOKit/hidsystem/event_status_driver.h>
-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)
{
// 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
}
}
-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;
}
}
-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
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)
{
// 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;
}
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";
}
}
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";
{
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;
{
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;
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));
{
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));
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);
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;
////
#ifdef SDL_R_RESTART
-static qboolean sdl_needs_restart;
+static qbool sdl_needs_restart;
static void sdl_start(void)
{
}
// 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;
#ifdef DEBUGSDLEVENTS
Con_DPrintf("SDL_Event: SDL_QUIT\n");
#endif
- Sys_Quit(0);
+ host.state = host_shutdown;
break;
case SDL_KEYDOWN:
case SDL_KEYUP:
// 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
vid_hasfocus = false;
break;
case SDL_WINDOWEVENT_CLOSE:
- Sys_Quit(0);
+ host.state = host_shutdown;
break;
}
}
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)
{
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);
}
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;
}
}
#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
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;
}
#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
drivername = NULL;
// COMMANDLINEOPTION: SDL GL: -gl_driver <drivername> 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
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);
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;
}
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;
}
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);
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)
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);
void VID_Finish (void)
{
- qboolean vid_usevsync;
+ qbool vid_usevsync;
vid_activewindow = !vid_hidden && vid_hasfocus;
VID_UpdateGamma();