Moved some files around.

I'm hoping that this will give some clearer structure

diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
index f02a7f6..004d4f8 100644 (file)
--- a/examples/qwidget-compositor/main.cpp
+++ b/examples/qwidget-compositor/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
 
 #include "waylandsurface.h"
 

diff --git a/src/qt-compositor/compositor_api/compositor_api.pri b/src/qt-compositor/compositor_api/compositor_api.pri
new file mode 100644 (file)
index 0000000..7537036
--- /dev/null
+++ b/src/qt-compositor/compositor_api/compositor_api.pri
@@ -0,0 +1,9 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/waylandcompositor.h \
+    $$PWD/waylandsurface.h
+
+SOURCES += \
+    $$PWD/waylandcompositor.cpp \
+    $$PWD/waylandsurface.cpp

diff --git a/src/qt-compositor/qtcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp
similarity index 96%
rename from src/qt-compositor/qtcompositor.cpp
rename to src/qt-compositor/compositor_api/waylandcompositor.cpp
index bae0b48..0a3b5ae 100644 (file)
--- a/src/qt-compositor/qtcompositor.cpp
+++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp
@@ -38,10 +38,10 @@
 **
 ****************************************************************************/
 
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
 
-#include "private/wlcompositor.h"
-#include "private/wlsurface.h"
+#include "wayland_wrapper/wlcompositor.h"
+#include "wayland_wrapper/wlsurface.h"
 
 WaylandCompositor::WaylandCompositor(QWidget *topLevelWidget)
     : m_compositor(0)

diff --git a/src/qt-compositor/qtcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h
similarity index 100%
rename from src/qt-compositor/qtcompositor.h
rename to src/qt-compositor/compositor_api/waylandcompositor.h

diff --git a/src/qt-compositor/waylandsurface.cpp b/src/qt-compositor/compositor_api/waylandsurface.cpp
similarity index 98%
rename from src/qt-compositor/waylandsurface.cpp
rename to src/qt-compositor/compositor_api/waylandsurface.cpp
index d9fdc06..933e9fe 100644 (file)
--- a/src/qt-compositor/waylandsurface.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurface.cpp
@@ -1,6 +1,6 @@
 #include "waylandsurface.h"
 
-#include "private/wlsurface.h"
+#include "wayland_wrapper/wlsurface.h"
 
 class WaylandSurfacePrivate : public QObjectPrivate
 {

diff --git a/src/qt-compositor/waylandsurface.h b/src/qt-compositor/compositor_api/waylandsurface.h
similarity index 100%
rename from src/qt-compositor/waylandsurface.h
rename to src/qt-compositor/compositor_api/waylandsurface.h

diff --git a/src/qt-compositor/dri2_xcb/README b/src/qt-compositor/hardware_integration/dri2_xcb/README
similarity index 100%
rename from src/qt-compositor/dri2_xcb/README
rename to src/qt-compositor/hardware_integration/dri2_xcb/README

diff --git a/src/qt-compositor/dri2_xcb/dri2_xcb.pri b/src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
similarity index 63%
rename from src/qt-compositor/dri2_xcb/dri2_xcb.pri
rename to src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
index 74d70a9..a86a5f7 100644 (file)
--- a/src/qt-compositor/dri2_xcb/dri2_xcb.pri
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2_xcb.pri
@@ -4,9 +4,9 @@ LIBS += -lxcb -lxcb-dri2 -lEGL
 SOURCES += \
     $$PWD/dri2xcbhwintegration.cpp \
     $$PWD/dri2xcbbuffer.cpp \
-    $$PWD/../../3rdparty/wayland/wayland-drm-protocol.c \
+    $$PWD/../../../3rdparty/wayland/wayland-drm-protocol.c \
 
 HEADERS += \
     $$PWD/dri2xcbhwintegration.h \
     $$PWD/dri2xcbbuffer.h \
-    $$PWD/../../3rdparty/wayland/wayland-drm-server-protocol.h \
+    $$PWD/../../../3rdparty/wayland/wayland-drm-server-protocol.h \

diff --git a/src/qt-compositor/dri2_xcb/dri2xcbbuffer.cpp b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
similarity index 97%
rename from src/qt-compositor/dri2_xcb/dri2xcbbuffer.cpp
rename to src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
index c564b24..eb516d1 100644 (file)
--- a/src/qt-compositor/dri2_xcb/dri2xcbbuffer.cpp
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.cpp
@@ -1,6 +1,6 @@
 #include "dri2xcbbuffer.h"
 
-#include "wlobject.h"
+#include "waylandobject.h"
 
 #define EGL_EGLEXT_PROTOTYPES
 #include <EGL/egl.h>

diff --git a/src/qt-compositor/dri2_xcb/dri2xcbbuffer.h b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
similarity index 92%
rename from src/qt-compositor/dri2_xcb/dri2xcbbuffer.h
rename to src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
index 23fb259..81fa067 100644 (file)
--- a/src/qt-compositor/dri2_xcb/dri2xcbbuffer.h
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbbuffer.h
@@ -1,8 +1,8 @@
 #ifndef DRI2XCBBUFFER_H
 #define DRI2XCBBUFFER_H
 
-#include "wlobject.h"
-#include "wlcompositor.h"
+#include "waylandobject.h"
+#include "wayland_wrapper/wlcompositor.h"
 
 #include <wayland-server.h>
 

diff --git a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
similarity index 97%
rename from src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp
rename to src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
index 282f2f7..6e6bb53 100644 (file)
--- a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.cpp
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.cpp
@@ -2,9 +2,9 @@
 
 #include "dri2xcbbuffer.h"
 
-#include "wlobject.h"
-#include "wldisplay.h"
-#include "wlcompositor.h"
+#include "waylandobject.h"
+#include "wayland_wrapper/wldisplay.h"
+#include "wayland_wrapper/wlcompositor.h"
 
 #include "wayland-server.h"
 #include "wayland-drm-server-protocol.h"

diff --git a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.h b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
similarity index 86%
rename from src/qt-compositor/dri2_xcb/dri2xcbhwintegration.h
rename to src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
index ae013ba..e54debd 100644 (file)
--- a/src/qt-compositor/dri2_xcb/dri2xcbhwintegration.h
+++ b/src/qt-compositor/hardware_integration/dri2_xcb/dri2xcbhwintegration.h
@@ -1,7 +1,7 @@
 #ifndef DRI2XCBHWINTEGRATION_H
 #define DRI2XCBHWINTEGRATION_H
 
-#include "../graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
 
 class DrmObject;
 

diff --git a/src/qt-compositor/graphicshardwareintegration.cpp b/src/qt-compositor/hardware_integration/graphicshardwareintegration.cpp
similarity index 100%
rename from src/qt-compositor/graphicshardwareintegration.cpp
rename to src/qt-compositor/hardware_integration/graphicshardwareintegration.cpp

diff --git a/src/qt-compositor/graphicshardwareintegration.h b/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
similarity index 97%
rename from src/qt-compositor/graphicshardwareintegration.h
rename to src/qt-compositor/hardware_integration/graphicshardwareintegration.h
index 7e0e76c..d74ea55 100644 (file)
--- a/src/qt-compositor/graphicshardwareintegration.h
+++ b/src/qt-compositor/hardware_integration/graphicshardwareintegration.h
@@ -44,8 +44,8 @@
 #include <QtOpenGL/qgl.h>
 #include <wayland-server.h>
 
-#include "qtcompositor.h"
-#include "private/wldisplay.h"
+#include "waylandcompositor.h"
+#include "wayland_wrapper/wldisplay.h"
 
 class GraphicsHardwareIntegration
 {

diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri
new file mode 100644 (file)
index 0000000..22cd0fe
--- /dev/null
+++ b/src/qt-compositor/hardware_integration/hardware_integration.pri
@@ -0,0 +1,17 @@
+HEADERS += \
+    $$PWD/graphicshardwareintegration.h
+
+SOURCES += \
+    $$PWD/graphicshardwareintegration.cpp
+
+wayland_gl {
+    mesa_egl {
+        include (mesa_egl/mesa_egl.pri)
+        DEFINES += QT_COMPOSITOR_MESA_EGL
+    }
+
+    dri2_xcb {
+        include (dri2_xcb/dri2_xcb.pri)
+        DEFINES += QT_COMPOSITOR_DRI2_XCB
+    }
+}

diff --git a/src/qt-compositor/mesa_egl/mesa_egl.pri b/src/qt-compositor/hardware_integration/mesa_egl/mesa_egl.pri
similarity index 100%
rename from src/qt-compositor/mesa_egl/mesa_egl.pri
rename to src/qt-compositor/hardware_integration/mesa_egl/mesa_egl.pri

diff --git a/src/qt-compositor/mesa_egl/mesaeglintegration.cpp b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp
similarity index 100%
rename from src/qt-compositor/mesa_egl/mesaeglintegration.cpp
rename to src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp

diff --git a/src/qt-compositor/mesa_egl/mesaeglintegration.h b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.h
similarity index 97%
rename from src/qt-compositor/mesa_egl/mesaeglintegration.h
rename to src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.h
index 8faba18..333a079 100644 (file)
--- a/src/qt-compositor/mesa_egl/mesaeglintegration.h
+++ b/src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.h
@@ -41,7 +41,7 @@
 #ifndef MESAEGLINTEGRATION_H
 #define MESAEGLINTEGRATION_H
 
-#include "../graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
 #include <QtCore/QScopedPointer>
 
 class MesaEglIntegrationPrivate;

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index 58e1840..0bc9bbd 100644 (file)
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -1,5 +1,4 @@
 INCLUDEPATH += $$PWD
-
 use_pkgconfig {
     QMAKE_CXXFLAGS += $$system(pkg-config --cflags wayland-server)
     #for some reason this is not included in the cflags line
@@ -15,16 +14,6 @@ wayland_gl {
     system(echo "Qt-Compositor configured with openGL")
     QT += opengl
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
-    mesa_egl {
-        include (mesa_egl/mesa_egl.pri)
-        DEFINES += QT_COMPOSITOR_MESA_EGL
-    }
-
-    dri2_xcb {
-        include (dri2_xcb/dri2_xcb.pri)
-        DEFINES += QT_COMPOSITOR_DRI2_XCB
-    }
-
     use_pkgconfig {
         QMAKE_CXXFLAGS += $$system(pkg-config --cflags glesv2)
         #for some reason this is not included in the cflags line
@@ -35,22 +24,7 @@ wayland_gl {
     system(echo "Qt-Compositor configured as raster only compositor")
 }
 
-SOURCES += $$PWD/qtcompositor.cpp \
-        $$PWD/graphicshardwareintegration.cpp \
-        $$PWD/waylandsurface.cpp \
-        $$PWD/private/wlcompositor.cpp \
-        $$PWD/private/wlsurface.cpp \
-        $$PWD/private/wloutput.cpp \
-        $$PWD/private/wldisplay.cpp \
-        $$PWD/private/wlshmbuffer.cpp
-
-
-HEADERS += $$PWD/qtcompositor.h \
-        $$PWD/graphicshardwareintegration.h \
-        $$PWD/waylandsurface.h \
-        $$PWD/private/wlcompositor.h \
-        $$PWD/private/wlsurface.h \
-        $$PWD/private/wloutput.h \
-        $$PWD/private/wlshmbuffer.h \
-        $$PWD/private/wldisplay.h \
-        $$PWD/private/wlobject.h
+include ($$PWD/util/util.pri)
+include ($$PWD/wayland_wrapper/wayland_wrapper.pri)
+include ($$PWD/hardware_integration/hardware_integration.pri)
+include ($$PWD/compositor_api/compositor_api.pri)

diff --git a/src/qt-compositor/util/util.pri b/src/qt-compositor/util/util.pri
new file mode 100644 (file)
index 0000000..6a7a5ee
--- /dev/null
+++ b/src/qt-compositor/util/util.pri
@@ -0,0 +1,4 @@
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+    $$PWD/waylandobject.h

diff --git a/src/qt-compositor/private/wlobject.h b/src/qt-compositor/util/waylandobject.h
similarity index 100%
rename from src/qt-compositor/private/wlobject.h
rename to src/qt-compositor/util/waylandobject.h

diff --git a/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri b/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri
new file mode 100644 (file)
index 0000000..c65dffb
--- /dev/null
+++ b/src/qt-compositor/wayland_wrapper/wayland_wrapper.pri
@@ -0,0 +1,13 @@
+HEADERS += \
+    $$PWD/wlcompositor.h \
+    $$PWD/wldisplay.h \
+    $$PWD/wloutput.h \
+    $$PWD/wlshmbuffer.h \
+    $$PWD/wlsurface.h
+
+SOURCES += \
+    $$PWD/wlcompositor.cpp \
+    $$PWD/wldisplay.cpp \
+    $$PWD/wloutput.cpp \
+    $$PWD/wlshmbuffer.cpp \
+    $$PWD/wlsurface.cpp

diff --git a/src/qt-compositor/private/wlcompositor.cpp b/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
similarity index 97%
rename from src/qt-compositor/private/wlcompositor.cpp
rename to src/qt-compositor/wayland_wrapper/wlcompositor.cpp
index 8650899..b18d811 100644 (file)
--- a/src/qt-compositor/private/wlcompositor.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
@@ -40,11 +40,11 @@
 
 #include "wlcompositor.h"
 
-#include "wlobject.h"
+#include "waylandobject.h"
 #include "wldisplay.h"
 #include "wlshmbuffer.h"
 #include "wlsurface.h"
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
 
 #include <QApplication>
 #include <QDesktopWidget>
@@ -66,15 +66,7 @@
 
 #include <wayland-server.h>
 
-#ifdef QT_COMPOSITOR_MESA_EGL
-#include "../mesa_egl/mesaeglintegration.h"
-#endif
-
-#ifdef QT_COMPOSITOR_DRI2_XCB
-#include "../dri2_xcb/dri2xcbhwintegration.h"
-#endif
-
-#include "graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
 
 namespace Wayland {
 

diff --git a/src/qt-compositor/private/wlcompositor.h b/src/qt-compositor/wayland_wrapper/wlcompositor.h
similarity index 100%
rename from src/qt-compositor/private/wlcompositor.h
rename to src/qt-compositor/wayland_wrapper/wlcompositor.h

diff --git a/src/qt-compositor/private/wldisplay.cpp b/src/qt-compositor/wayland_wrapper/wldisplay.cpp
similarity index 100%
rename from src/qt-compositor/private/wldisplay.cpp
rename to src/qt-compositor/wayland_wrapper/wldisplay.cpp

diff --git a/src/qt-compositor/private/wldisplay.h b/src/qt-compositor/wayland_wrapper/wldisplay.h
similarity index 100%
rename from src/qt-compositor/private/wldisplay.h
rename to src/qt-compositor/wayland_wrapper/wldisplay.h

diff --git a/src/qt-compositor/private/wloutput.cpp b/src/qt-compositor/wayland_wrapper/wloutput.cpp
similarity index 100%
rename from src/qt-compositor/private/wloutput.cpp
rename to src/qt-compositor/wayland_wrapper/wloutput.cpp

diff --git a/src/qt-compositor/private/wloutput.h b/src/qt-compositor/wayland_wrapper/wloutput.h
similarity index 98%
rename from src/qt-compositor/private/wloutput.h
rename to src/qt-compositor/wayland_wrapper/wloutput.h
index 82a2fbf..0a0410e 100644 (file)
--- a/src/qt-compositor/private/wloutput.h
+++ b/src/qt-compositor/wayland_wrapper/wloutput.h
@@ -41,7 +41,7 @@
 #ifndef WL_OUTPUT_H
 #define WL_OUTPUT_H
 
-#include "wlobject.h"
+#include "waylandobject.h"
 
 #include <QtCore/QSize>
 

diff --git a/src/qt-compositor/private/wlshmbuffer.cpp b/src/qt-compositor/wayland_wrapper/wlshmbuffer.cpp
similarity index 100%
rename from src/qt-compositor/private/wlshmbuffer.cpp
rename to src/qt-compositor/wayland_wrapper/wlshmbuffer.cpp

diff --git a/src/qt-compositor/private/wlshmbuffer.h b/src/qt-compositor/wayland_wrapper/wlshmbuffer.h
similarity index 99%
rename from src/qt-compositor/private/wlshmbuffer.h
rename to src/qt-compositor/wayland_wrapper/wlshmbuffer.h
index 55a0ec1..c2a686b 100644 (file)
--- a/src/qt-compositor/private/wlshmbuffer.h
+++ b/src/qt-compositor/wayland_wrapper/wlshmbuffer.h
@@ -41,7 +41,7 @@
 #ifndef WL_SHMBUFFER_H
 #define WL_SHMBUFFER_H
 
-#include "wlobject.h"
+#include "waylandobject.h"
 
 #include <QtCore/QRect>
 #include <QtGui/QImage>

diff --git a/src/qt-compositor/private/wlsurface.cpp b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
similarity index 98%
rename from src/qt-compositor/private/wlsurface.cpp
rename to src/qt-compositor/wayland_wrapper/wlsurface.cpp
index ae226b2..f281c01 100644 (file)
--- a/src/qt-compositor/private/wlsurface.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
@@ -40,7 +40,7 @@
 
 #include "wlsurface.h"
 
-#include "../waylandsurface.h"
+#include "waylandsurface.h"
 
 #include "wlcompositor.h"
 #include "wlshmbuffer.h"
@@ -52,7 +52,7 @@
 #include <linux/input.h>
 
 #ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "../graphicshardwareintegration.cpp"
+#include "hardware_integration/graphicshardwareintegration.h"
 #include <QtGui/QPlatformGLContext>
 #endif
 

diff --git a/src/qt-compositor/private/wlsurface.h b/src/qt-compositor/wayland_wrapper/wlsurface.h
similarity index 98%
rename from src/qt-compositor/private/wlsurface.h
rename to src/qt-compositor/wayland_wrapper/wlsurface.h
index 4e9bb4e..17877e9 100644 (file)
--- a/src/qt-compositor/private/wlsurface.h
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.h
@@ -41,8 +41,9 @@
 #ifndef WL_SURFACE_H
 #define WL_SURFACE_H
 
-#include "wlobject.h"
+#include "waylandobject.h"
 #include "wlshmbuffer.h"
+#include "waylandsurface.h"
 
 #include <QtCore/QRect>
 #include <QtGui/QImage>
@@ -51,8 +52,6 @@
 #include <QtCore/QMetaType>
 #include <QtGui/private/qapplication_p.h>
 
-#include "../waylandsurface.h"
-
 #ifdef QT_COMPOSITOR_WAYLAND_GL
 #define GL_GLEXT_PROTOTYPES
 #include <GLES2/gl2.h>