mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-29 23:22:55 +00:00
96a9e2a9aa
This updates from SDL 2.0.4 to SDL 2.0.8. Fix nullptr dereference in front of nullptr check in FS_CheckPak0 Fix undefined behaviour due to shifting signed in snd_mem.c Fix shifting bits out of byte in tr_font.c Fix shift into sign in cl_cin.c Fix signed bit operations in MSG_ReadBits Add missing address operator in cm_polylib.c OpenGL1: Decay float[8] to float * in tr_marks.c Avoid srcList[-1] in snd_openal.c Fix the behaviour of CVAR_LATCH|CVAR_CHEAT cvars Maximize cURL buffer size Fix mouse grab after toggling fullscreen Fix q3history buffer not cleared between mods and OOB-access Revert "Removed "Color Depth" from q3_ui system settings, it didn't control anything." Fix displayed color/depth/stencil bits values Restore setting r_colorbits in q3_ui Make setting r_stencilbits more consistent in Team Arena UI Fix map list in Team Arena start server menu after entering SP menu Support SDL audio devices that require float32 samples. sdl_snd.c should just initialize SDL audio without checking SDL_WasInit(). There's no need to SDL_PauseAudio(1) before calling SDL_CloseAudio(). Added audio capture support to SDL backend. Use the SDL2 audio device interface instead of the legacy 1.2 API. Disable SDL audio capture until prebuilt SDL libraries are updated to 2.0.8. Update SDL2 to 2.0.8 Add SDL 2.0.1 headers for macOS PPC Make macOS Universal Bundle target 10.6 for x86 and x86_64 Fix possible bot goal state NULL pointer dereference Fix uninitialized bot_goal_t fields Remove unnecessary NULL pointer check in Cmd_RemoveCommand Make UI_DrawProportionalString handle NULL string Fix compiling against macOS system OpenAL and SDL2 frameworks Fix array index in CanDamage() function - discovered by MARTY Fix compiling Makefile (broke in macOS frameworks commit) Fix clearing keys for control in Team Arena UI Make s_useOpenAL be CVAR_LATCH Improvements for dedicated camera followers (team follow1/2) Fix not closing description.txt and fix path seperator Fix duplicate bots displayed in Team Arena ingame add bot menu OpenGL2: Fix parsing specularScale in shaders Don't allow SDL audio capture using pulseaudio Isolate the Altivec code so non-Altivec PPC targets can use the same binary. Limit -maltivec to specific source files on OpenBSD too (untested) Use SDL 2.0.1 headers for macOS ppc64 Fix console offset while Team Arena voiceMenu is open OpenGL2: Readd r_deluxeSpecular. Fix client kicked as unpure when missing the latest cgame/ui pk3s Don't create multiple windows when GL context creation fails Require OpenGL 1.2 for GL_CLAMP_TO_EDGE Fix Linux uninstaller requiring Bash Fix Linux uninstaller redirecting stderr to stdout in preuninstall.sh Reported by @illwieckz. Fix in_restart causing fatal error while video is shutdown Allow pkg-config binary to be overridden with PKG_CONFIG Make testgun command without argument disable test gun model Remove unused renderer_buffer variable Don't upload 8 bit grayscale images as 16 bit luminance OpenGL1: Use RE_UploadCinematic() instead of duplicate code Don't load non-core GL functions for OpenGL 3.2 core context Load OpenGL ES 2.0 function procs Don't check fixed function GL extensions when using shader pipeline OpenGL2: Fix world VAO cache drawing when glIndex_t is unsigned short OpenGL2: Misc fixes and cleanup Fix IQM root joint backlerp when joint number is more than 0 Improve IQM loading Improve IQM CPU vertex skinning performance OpenGL2: Add GPU vertex skinning for IQM models
324 lines
8.8 KiB
Objective-C
324 lines
8.8 KiB
Objective-C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
|
|
/**
|
|
* \file SDL_syswm.h
|
|
*
|
|
* Include file for SDL custom system window manager hooks.
|
|
*/
|
|
|
|
#ifndef SDL_syswm_h_
|
|
#define SDL_syswm_h_
|
|
|
|
#include "SDL_stdinc.h"
|
|
#include "SDL_error.h"
|
|
#include "SDL_video.h"
|
|
#include "SDL_version.h"
|
|
|
|
#include "begin_code.h"
|
|
/* Set up for C function definitions, even when using C++ */
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/**
|
|
* \file SDL_syswm.h
|
|
*
|
|
* Your application has access to a special type of event ::SDL_SYSWMEVENT,
|
|
* which contains window-manager specific information and arrives whenever
|
|
* an unhandled window event occurs. This event is ignored by default, but
|
|
* you can enable it with SDL_EventState().
|
|
*/
|
|
#ifdef SDL_PROTOTYPES_ONLY
|
|
struct SDL_SysWMinfo;
|
|
#else
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
|
|
#ifndef WIN32_LEAN_AND_MEAN
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
|
#include <Inspectable.h>
|
|
#endif
|
|
|
|
/* This is the structure for custom window manager events */
|
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
|
#if defined(__APPLE__) && defined(__MACH__)
|
|
/* conflicts with Quickdraw.h */
|
|
#define Cursor X11Cursor
|
|
#endif
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xatom.h>
|
|
|
|
#if defined(__APPLE__) && defined(__MACH__)
|
|
/* matches the re-define above */
|
|
#undef Cursor
|
|
#endif
|
|
|
|
#endif /* defined(SDL_VIDEO_DRIVER_X11) */
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
|
|
#include <directfb.h>
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_COCOA)
|
|
#ifdef __OBJC__
|
|
@class NSWindow;
|
|
#else
|
|
typedef struct _NSWindow NSWindow;
|
|
#endif
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_UIKIT)
|
|
#ifdef __OBJC__
|
|
#include <UIKit/UIKit.h>
|
|
#else
|
|
typedef struct _UIWindow UIWindow;
|
|
typedef struct _UIViewController UIViewController;
|
|
#endif
|
|
typedef Uint32 GLuint;
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_ANDROID)
|
|
typedef struct ANativeWindow ANativeWindow;
|
|
typedef void *EGLSurface;
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_VIVANTE)
|
|
#include "SDL_egl.h"
|
|
#endif
|
|
|
|
/**
|
|
* These are the various supported windowing subsystems
|
|
*/
|
|
typedef enum
|
|
{
|
|
SDL_SYSWM_UNKNOWN,
|
|
SDL_SYSWM_WINDOWS,
|
|
SDL_SYSWM_X11,
|
|
SDL_SYSWM_DIRECTFB,
|
|
SDL_SYSWM_COCOA,
|
|
SDL_SYSWM_UIKIT,
|
|
SDL_SYSWM_WAYLAND,
|
|
SDL_SYSWM_MIR,
|
|
SDL_SYSWM_WINRT,
|
|
SDL_SYSWM_ANDROID,
|
|
SDL_SYSWM_VIVANTE,
|
|
SDL_SYSWM_OS2
|
|
} SDL_SYSWM_TYPE;
|
|
|
|
/**
|
|
* The custom event structure.
|
|
*/
|
|
struct SDL_SysWMmsg
|
|
{
|
|
SDL_version version;
|
|
SDL_SYSWM_TYPE subsystem;
|
|
union
|
|
{
|
|
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
|
|
struct {
|
|
HWND hwnd; /**< The window for the message */
|
|
UINT msg; /**< The type of message */
|
|
WPARAM wParam; /**< WORD message parameter */
|
|
LPARAM lParam; /**< LONG message parameter */
|
|
} win;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
|
struct {
|
|
XEvent event;
|
|
} x11;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
|
|
struct {
|
|
DFBEvent event;
|
|
} dfb;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_COCOA)
|
|
struct
|
|
{
|
|
/* Latest version of Xcode clang complains about empty structs in C v. C++:
|
|
error: empty struct has size 0 in C, size 1 in C++
|
|
*/
|
|
int dummy;
|
|
/* No Cocoa window events yet */
|
|
} cocoa;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_UIKIT)
|
|
struct
|
|
{
|
|
int dummy;
|
|
/* No UIKit window events yet */
|
|
} uikit;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_VIVANTE)
|
|
struct
|
|
{
|
|
int dummy;
|
|
/* No Vivante window events yet */
|
|
} vivante;
|
|
#endif
|
|
/* Can't have an empty union */
|
|
int dummy;
|
|
} msg;
|
|
};
|
|
|
|
/**
|
|
* The custom window manager information structure.
|
|
*
|
|
* When this structure is returned, it holds information about which
|
|
* low level system it is using, and will be one of SDL_SYSWM_TYPE.
|
|
*/
|
|
struct SDL_SysWMinfo
|
|
{
|
|
SDL_version version;
|
|
SDL_SYSWM_TYPE subsystem;
|
|
union
|
|
{
|
|
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
|
|
struct
|
|
{
|
|
HWND window; /**< The window handle */
|
|
HDC hdc; /**< The window device context */
|
|
HINSTANCE hinstance; /**< The instance handle */
|
|
} win;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_WINRT)
|
|
struct
|
|
{
|
|
IInspectable * window; /**< The WinRT CoreWindow */
|
|
} winrt;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_X11)
|
|
struct
|
|
{
|
|
Display *display; /**< The X11 display */
|
|
Window window; /**< The X11 window */
|
|
} x11;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
|
|
struct
|
|
{
|
|
IDirectFB *dfb; /**< The directfb main interface */
|
|
IDirectFBWindow *window; /**< The directfb window handle */
|
|
IDirectFBSurface *surface; /**< The directfb client surface */
|
|
} dfb;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_COCOA)
|
|
struct
|
|
{
|
|
#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc)
|
|
NSWindow __unsafe_unretained *window; /**< The Cocoa window */
|
|
#else
|
|
NSWindow *window; /**< The Cocoa window */
|
|
#endif
|
|
} cocoa;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_UIKIT)
|
|
struct
|
|
{
|
|
#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc)
|
|
UIWindow __unsafe_unretained *window; /**< The UIKit window */
|
|
#else
|
|
UIWindow *window; /**< The UIKit window */
|
|
#endif
|
|
GLuint framebuffer; /**< The GL view's Framebuffer Object. It must be bound when rendering to the screen using GL. */
|
|
GLuint colorbuffer; /**< The GL view's color Renderbuffer Object. It must be bound when SDL_GL_SwapWindow is called. */
|
|
GLuint resolveFramebuffer; /**< The Framebuffer Object which holds the resolve color Renderbuffer, when MSAA is used. */
|
|
} uikit;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_WAYLAND)
|
|
struct
|
|
{
|
|
struct wl_display *display; /**< Wayland display */
|
|
struct wl_surface *surface; /**< Wayland surface */
|
|
struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
|
|
} wl;
|
|
#endif
|
|
#if defined(SDL_VIDEO_DRIVER_MIR)
|
|
struct
|
|
{
|
|
struct MirConnection *connection; /**< Mir display server connection */
|
|
struct MirSurface *surface; /**< Mir surface */
|
|
} mir;
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_ANDROID)
|
|
struct
|
|
{
|
|
ANativeWindow *window;
|
|
EGLSurface surface;
|
|
} android;
|
|
#endif
|
|
|
|
#if defined(SDL_VIDEO_DRIVER_VIVANTE)
|
|
struct
|
|
{
|
|
EGLNativeDisplayType display;
|
|
EGLNativeWindowType window;
|
|
} vivante;
|
|
#endif
|
|
|
|
/* Make sure this union is always 64 bytes (8 64-bit pointers). */
|
|
/* Be careful not to overflow this if you add a new target! */
|
|
Uint8 dummy[64];
|
|
} info;
|
|
};
|
|
|
|
#endif /* SDL_PROTOTYPES_ONLY */
|
|
|
|
typedef struct SDL_SysWMinfo SDL_SysWMinfo;
|
|
|
|
/* Function prototypes */
|
|
/**
|
|
* \brief This function allows access to driver-dependent window information.
|
|
*
|
|
* \param window The window about which information is being requested
|
|
* \param info This structure must be initialized with the SDL version, and is
|
|
* then filled in with information about the given window.
|
|
*
|
|
* \return SDL_TRUE if the function is implemented and the version member of
|
|
* the \c info struct is valid, SDL_FALSE otherwise.
|
|
*
|
|
* You typically use this function like this:
|
|
* \code
|
|
* SDL_SysWMinfo info;
|
|
* SDL_VERSION(&info.version);
|
|
* if ( SDL_GetWindowWMInfo(window, &info) ) { ... }
|
|
* \endcode
|
|
*/
|
|
extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
|
|
SDL_SysWMinfo * info);
|
|
|
|
|
|
/* Ends C function definitions when using C++ */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#include "close_code.h"
|
|
|
|
#endif /* SDL_syswm_h_ */
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|