Skip to content
Permalink
Browse files

Added some SysWM bits for Mir.

  • Loading branch information
icculus committed Feb 3, 2014
1 parent 8674b7a commit 6bc297704347ee29b42a930f9c28d872e9eed32e
Showing with 17 additions and 0 deletions.
  1. +13 −0 include/SDL_syswm.h
  2. +4 −0 src/video/mir/SDL_mirwindow.c
@@ -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
*/
@@ -205,6 +210,14 @@ struct SDL_SysWMinfo
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;
@@ -158,8 +158,12 @@ MIR_GetWindowWMInfo(_THIS, SDL_Window* window, SDL_SysWMinfo* info)
{
if (info->version.major == SDL_MAJOR_VERSION &&
info->version.minor == SDL_MINOR_VERSION) {
MIR_Window* mir_window = window->driverdata;

info->subsystem = SDL_SYSWM_MIR;
info->info.mir.connection = mir_window->mir_data->connection;
info->info.mir.surface = mir_window->surface;

return SDL_TRUE;
}

0 comments on commit 6bc2977

Please sign in to comment.