Merge pull request #53 from BtbN/fixes

Fix gswindow display with Qt
obsproject · Apr 3, 2014 · 7b0feec · 7b0feec
2 parents c25f105 + a31e938
commit 7b0feec
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/libobs-opengl/gl-x11.c b/libobs-opengl/gl-x11.c
@@ -59,12 +59,7 @@ extern struct gl_windowinfo *gl_windowinfo_create(struct gs_init_data *info)
 {
 	struct gl_windowinfo *wi = bzalloc(sizeof(struct gl_windowinfo));
 	wi->id = info->window.id;
-	/* wi->display = info->window.display; */
-
-	/*
-		The above no longer works with Qt.
-		Let's hope it continues to work.
-	*/
+	wi->display = info->window.display;
 
 	return wi;
 }

diff --git a/libobs/util/base.c b/libobs/util/base.c
@@ -35,7 +35,7 @@ static void def_log_handler(int log_level, const char *format,
 	char out[4096];
 	vsnprintf(out, sizeof(out), format, args);
 
-	if (log_level >= log_output_level) {
+	if (log_level <= log_output_level) {
 		switch (log_level) {
 		case LOG_DEBUG:
 			printf("debug: %s\n", out);

diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
@@ -31,6 +31,8 @@ elseif(APPLE)
 
 	add_definitions(-fobjc-arc)
 elseif(UNIX)
+        find_package(Qt5X11Extras REQUIRED)
+
 	set(obs_PLATFORM_SOURCES
 		platform-x11.cpp)
 
@@ -44,6 +46,9 @@ elseif(UNIX)
 	set(obs_PLATFORM_LIBRARIES
 		${X11_LIBRARIES}
 		${X11_Xinerama_LIB})
+
+        set(obs_PLATFORM_QT_MODULES
+                X11Extras)
 endif()
 
 set(obs_SOURCES
@@ -87,7 +92,7 @@ add_executable(obs WIN32
 	${obs_UI_HEADERS}
 	${obs_QRC_SOURCES})
 
-qt5_use_modules(obs Widgets)
+qt5_use_modules(obs Widgets ${obs_PLATFORM_QT_MODULES})
 
 if(WIN32)
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)

diff --git a/obs/qt-wrappers.cpp b/obs/qt-wrappers.cpp
@@ -20,6 +20,10 @@
 #include <QWidget>
 #include <QMessageBox>
 
+#if !defined(_WIN32) && !defined(__APPLE__)
+#include <QX11Info>
+#endif
+
 static inline void OBSErrorBoxva(QWidget *parent, const char *msg, va_list args)
 {
 	char full_message[4096];
@@ -44,5 +48,6 @@ void QTToGSWindow(WId windowId, gs_window &gswindow)
 	gswindow.view = (id)windowId;
 #else
 	gswindow.id = windowId;
+	gswindow.display = QX11Info::display();
 #endif
 }