diff options
| author | MAN-AT-ARMS <donny@ecgnetwork.com> | 2014-03-08 22:00:38 -0500 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-08-28 11:03:31 +0100 |
| commit | 57e0583885b51fb736589f6187facfcfb9d06a67 (patch) | |
| tree | 2d48bf168880a3d5a0cbe3f6d5660db4cbb30995 /src/SDL2/include/SDL_syswm.h | |
| parent | 482262a75610e63d2a779fea5b37b8206d87e947 (diff) | |
Update SDL2 to 2.0.2
Diffstat (limited to 'src/SDL2/include/SDL_syswm.h')
| -rw-r--r-- | src/SDL2/include/SDL_syswm.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/SDL2/include/SDL_syswm.h b/src/SDL2/include/SDL_syswm.h index 5e4454f8..40e8ca7c 100644 --- a/src/SDL2/include/SDL_syswm.h +++ b/src/SDL2/include/SDL_syswm.h @@ -1,6 +1,6 @@ /* Simple DirectMedia Layer - Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org> + Copyright (C) 1997-2014 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 @@ -93,6 +93,11 @@ typedef struct _UIWindow UIWindow; #endif #endif +#if defined(SDL_VIDEO_DRIVER_MIR) +#include <mir_toolkit/mir_client_library.h> +#endif + + /** * These are the various supported windowing subsystems */ @@ -104,6 +109,8 @@ typedef enum SDL_SYSWM_DIRECTFB, SDL_SYSWM_COCOA, SDL_SYSWM_UIKIT, + SDL_SYSWM_WAYLAND, + SDL_SYSWM_MIR, } SDL_SYSWM_TYPE; /** @@ -195,6 +202,22 @@ struct SDL_SysWMinfo UIWindow *window; /* The UIKit window */ } 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 + { + MirConnection *connection; /**< Mir display server connection */ + MirSurface *surface; /**< Mir surface */ + } mir; +#endif + /* Can't have an empty union */ int dummy; } info; |