Dropsdl

xbmc/Application.cpp

@@ -794,7 +794,7 @@ bool CApplication::CreateGUI()
 
   uint32_t sdlFlags = 0;
 
-#if defined(HAS_SDL_OPENGL) || (HAS_GLES == 2)
+#if (defined(HAS_SDL_OPENGL) || (HAS_GLES == 2)) && !defined(HAS_GLX)
   sdlFlags |= SDL_INIT_VIDEO;
 #endif
 

xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp

@@ -277,7 +277,7 @@ bool CVDPAU::MakePixmapGL()
   };
 
   GLXFBConfig *fbConfigs;
-  fbConfigs = glXChooseFBConfig(m_Display, DefaultScreen(m_Display), doubleVisAttributes, &num);
+  fbConfigs = glXChooseFBConfig(m_Display, g_Windowing.GetVisual()->screen, doubleVisAttributes, &num);
   if (fbConfigs==NULL)
   {
     CLog::Log(LOGERROR, "GLX Error: MakePixmap: No compatible framebuffers found");
@@ -328,10 +328,10 @@ bool CVDPAU::MakePixmap(int width, int height)
 
     // Get our window attribs.
   XWindowAttributes wndattribs;
-  XGetWindowAttributes(m_Display, DefaultRootWindow(m_Display), &wndattribs); // returns a status but I don't know what success is
+  XGetWindowAttributes(m_Display, g_Windowing.GetWindow(), &wndattribs); // returns a status but I don't know what success is
 
   m_Pixmap = XCreatePixmap(m_Display,
-                           DefaultRootWindow(m_Display),
+                           g_Windowing.GetWindow(),
                            OutWidth,
                            OutHeight,
                            wndattribs.depth);
@@ -343,7 +343,7 @@ bool CVDPAU::MakePixmap(int width, int height)
 
   XGCValues values = {};
   GC xgc;
-  values.foreground = BlackPixel (m_Display, DefaultScreen (m_Display));
+  values.foreground = BlackPixel (m_Display, g_Windowing.GetVisual()->screen);
   xgc = XCreateGC(m_Display, m_Pixmap, GCForeground, &values);
   XFillRectangle(m_Display, m_Pixmap, xgc, 0, 0, OutWidth, OutHeight);
   XFreeGC(m_Display, xgc);
@@ -755,7 +755,7 @@ void CVDPAU::InitVDPAUProcs()
     return;
   }
 
-  int mScreen = DefaultScreen(m_Display);
+  int mScreen = g_Windowing.GetVisual()->screen;
   VdpStatus vdp_st;
 
   // Create Device

xbmc/guilib/Resolution.h

@@ -95,6 +95,7 @@ struct RESOLUTION_INFO
   CStdString strMode;
   CStdString strOutput;
   CStdString strId;
+  int iInternal; /* internal to windowing layer */
 public:
   RESOLUTION_INFO(int width = 1280, int height = 720, float aspect = 0, const CStdString &mode = "")
   {
@@ -105,6 +106,7 @@ struct RESOLUTION_INFO
     bFullScreen = true;
     fRefreshRate = 0;
     dwFlags = iSubtitles = iScreen = 0;
+    iInternal = 0;
   }
   float DisplayRatio() const
   {
@@ -117,5 +119,6 @@ struct RESOLUTION_INFO
     iSubtitles = res.iSubtitles; dwFlags = res.dwFlags;
     fPixelRatio = res.fPixelRatio; fRefreshRate = res.fRefreshRate;
     strMode = res.strMode; strOutput = res.strOutput; strId = res.strId;
+    iInternal = res.iInternal;
   }
 };

xbmc/input/XBMC_keytable.cpp

@@ -179,6 +179,8 @@ static const XBMCKEYTABLE XBMCKeyTable[] =
 , { XBMCK_LAUNCH_APP2,            0,    0, XBMCVK_LAUNCH_APP2,         "launch_app2_pc_icon" }
 , { XBMCK_LAUNCH_FILE_BROWSER,    0,    0, XBMCVK_LAUNCH_FILE_BROWSER, "launch_file_browser" }
 , { XBMCK_LAUNCH_MEDIA_CENTER,    0,    0, XBMCVK_LAUNCH_MEDIA_CENTER, "launch_media_center" }
+, { XBMCK_PLAY,                   0,    0, XBMCVK_MEDIA_PLAY_PAUSE,    "play_pause" }
+, { XBMCK_STOP,                   0,    0, XBMCVK_MEDIA_STOP,          "stop" }
 
 // Function keys
 , { XBMCK_F1,                     0,    0, XBMCVK_F1,            "f1"}

xbmc/rendering/gl/RenderSystemGL.cpp

@@ -175,6 +175,7 @@ bool CRenderSystemGL::ResetRenderSystem(int width, int height, bool fullScreen,
 {
   m_width = width;
   m_height = height;
+  m_bVsyncInit = false;
 
   glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
 

xbmc/system.h

@@ -162,16 +162,21 @@
 #define HAS_GL
 #ifdef HAVE_X11
 #define HAS_GLX
+#define HAS_X11_WIN_EVENTS
 #endif
 #ifdef HAVE_SDL
 #define HAS_SDL
 #ifndef HAS_SDL_OPENGL
 #define HAS_SDL_OPENGL
 #endif
+#ifndef HAS_X11_WIN_EVENTS
 #define HAS_SDL_WIN_EVENTS
+#endif
 #else
+#ifndef HAS_X11_WIN_EVENTS
 #define HAS_LINUX_EVENTS
 #endif
+#endif
 #define HAS_LINUX_NETWORK
 #define HAS_LIRC
 #ifdef HAVE_LIBPULSE

xbmc/windowing/Makefile

@@ -1,6 +1,7 @@
 SRCS=WinEventsSDL.cpp \
      WinEventsLinux.cpp \
      WinSystem.cpp \
+     WinEventsX11.cpp \
 
 LIB=windowing.a
 

xbmc/windowing/WinEvents.h

@@ -58,6 +58,10 @@ class CWinEventsBase
 #include "WinEventsSDL.h"
 #define CWinEvents CWinEventsSDL
 
+#elif defined(TARGET_LINUX) && defined(HAS_X11_WIN_EVENTS)
+#include "WinEventsX11.h"
+#define CWinEvents CWinEventsX11
+
 #elif defined(TARGET_LINUX) && defined(HAS_LINUX_EVENTS)
 #include "WinEventsLinux.h"
 #define CWinEvents CWinEventsLinux