From 72db1e63a342227aef07fa6a7682558fccacc0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 5 May 2015 12:45:07 +0200 Subject: [PATCH] [wayland] Move backend implementations into a backends/ directory The aim is to be able to create a plugin for each of the backends. The following directories are created: * backends/drm * backends/fbdev * backends/wayland * backends/x11 --- CMakeLists.txt | 20 +++++++++---------- .../drm/drm_backend.cpp | 0 drm_backend.h => backends/drm/drm_backend.h | 0 .../drm/egl_gbm_backend.cpp | 0 .../drm/egl_gbm_backend.h | 0 .../drm/screens_drm.cpp | 0 screens_drm.h => backends/drm/screens_drm.h | 0 .../fbdev/fb_backend.cpp | 0 fb_backend.h => backends/fbdev/fb_backend.h | 0 .../fbdev/screens_fb.cpp | 0 screens_fb.h => backends/fbdev/screens_fb.h | 0 .../wayland/egl_wayland_backend.cpp | 0 .../wayland/egl_wayland_backend.h | 0 .../wayland/screens_wayland.cpp | 0 .../wayland/screens_wayland.h | 0 .../wayland/wayland_backend.cpp | 0 .../wayland/wayland_backend.h | 0 .../x11/screens_x11windowed.cpp | 0 .../x11/screens_x11windowed.h | 0 .../x11/x11windowed_backend.cpp | 0 .../x11/x11windowed_backend.h | 0 composite.cpp | 2 +- eglonxbackend.cpp | 2 +- main_wayland.cpp | 8 ++++---- scene_qpainter.cpp | 8 ++++---- workspace.cpp | 3 --- 26 files changed, 20 insertions(+), 23 deletions(-) rename drm_backend.cpp => backends/drm/drm_backend.cpp (100%) rename drm_backend.h => backends/drm/drm_backend.h (100%) rename egl_gbm_backend.cpp => backends/drm/egl_gbm_backend.cpp (100%) rename egl_gbm_backend.h => backends/drm/egl_gbm_backend.h (100%) rename screens_drm.cpp => backends/drm/screens_drm.cpp (100%) rename screens_drm.h => backends/drm/screens_drm.h (100%) rename fb_backend.cpp => backends/fbdev/fb_backend.cpp (100%) rename fb_backend.h => backends/fbdev/fb_backend.h (100%) rename screens_fb.cpp => backends/fbdev/screens_fb.cpp (100%) rename screens_fb.h => backends/fbdev/screens_fb.h (100%) rename egl_wayland_backend.cpp => backends/wayland/egl_wayland_backend.cpp (100%) rename egl_wayland_backend.h => backends/wayland/egl_wayland_backend.h (100%) rename screens_wayland.cpp => backends/wayland/screens_wayland.cpp (100%) rename screens_wayland.h => backends/wayland/screens_wayland.h (100%) rename wayland_backend.cpp => backends/wayland/wayland_backend.cpp (100%) rename wayland_backend.h => backends/wayland/wayland_backend.h (100%) rename screens_x11windowed.cpp => backends/x11/screens_x11windowed.cpp (100%) rename screens_x11windowed.h => backends/x11/screens_x11windowed.h (100%) rename x11windowed_backend.cpp => backends/x11/x11windowed_backend.cpp (100%) rename x11windowed_backend.h => backends/x11/x11windowed_backend.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9efc21c0fc..5412b16973 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,29 +436,29 @@ if(HAVE_WAYLAND) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} abstract_backend.cpp - fb_backend.cpp - screens_fb.cpp - screens_wayland.cpp - screens_x11windowed.cpp + backends/fbdev/fb_backend.cpp + backends/fbdev/screens_fb.cpp + backends/wayland/screens_wayland.cpp + backends/x11/screens_x11windowed.cpp virtual_terminal.cpp - wayland_backend.cpp + backends/wayland/wayland_backend.cpp wayland_server.cpp - x11windowed_backend.cpp + backends/x11/x11windowed_backend.cpp ) if(KWIN_HAVE_EGL AND Wayland_Egl_FOUND) - set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} egl_wayland_backend.cpp) + set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} backends/wayland/egl_wayland_backend.cpp) endif() if(HAVE_DRM) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} - drm_backend.cpp - screens_drm.cpp + backends/drm/drm_backend.cpp + backends/drm/screens_drm.cpp ) endif() if(HAVE_GBM) set(kwin_KDEINIT_SRCS ${kwin_KDEINIT_SRCS} - egl_gbm_backend.cpp + backends/drm/egl_gbm_backend.cpp ) endif() if(HAVE_WAYLAND_CURSOR) diff --git a/drm_backend.cpp b/backends/drm/drm_backend.cpp similarity index 100% rename from drm_backend.cpp rename to backends/drm/drm_backend.cpp diff --git a/drm_backend.h b/backends/drm/drm_backend.h similarity index 100% rename from drm_backend.h rename to backends/drm/drm_backend.h diff --git a/egl_gbm_backend.cpp b/backends/drm/egl_gbm_backend.cpp similarity index 100% rename from egl_gbm_backend.cpp rename to backends/drm/egl_gbm_backend.cpp diff --git a/egl_gbm_backend.h b/backends/drm/egl_gbm_backend.h similarity index 100% rename from egl_gbm_backend.h rename to backends/drm/egl_gbm_backend.h diff --git a/screens_drm.cpp b/backends/drm/screens_drm.cpp similarity index 100% rename from screens_drm.cpp rename to backends/drm/screens_drm.cpp diff --git a/screens_drm.h b/backends/drm/screens_drm.h similarity index 100% rename from screens_drm.h rename to backends/drm/screens_drm.h diff --git a/fb_backend.cpp b/backends/fbdev/fb_backend.cpp similarity index 100% rename from fb_backend.cpp rename to backends/fbdev/fb_backend.cpp diff --git a/fb_backend.h b/backends/fbdev/fb_backend.h similarity index 100% rename from fb_backend.h rename to backends/fbdev/fb_backend.h diff --git a/screens_fb.cpp b/backends/fbdev/screens_fb.cpp similarity index 100% rename from screens_fb.cpp rename to backends/fbdev/screens_fb.cpp diff --git a/screens_fb.h b/backends/fbdev/screens_fb.h similarity index 100% rename from screens_fb.h rename to backends/fbdev/screens_fb.h diff --git a/egl_wayland_backend.cpp b/backends/wayland/egl_wayland_backend.cpp similarity index 100% rename from egl_wayland_backend.cpp rename to backends/wayland/egl_wayland_backend.cpp diff --git a/egl_wayland_backend.h b/backends/wayland/egl_wayland_backend.h similarity index 100% rename from egl_wayland_backend.h rename to backends/wayland/egl_wayland_backend.h diff --git a/screens_wayland.cpp b/backends/wayland/screens_wayland.cpp similarity index 100% rename from screens_wayland.cpp rename to backends/wayland/screens_wayland.cpp diff --git a/screens_wayland.h b/backends/wayland/screens_wayland.h similarity index 100% rename from screens_wayland.h rename to backends/wayland/screens_wayland.h diff --git a/wayland_backend.cpp b/backends/wayland/wayland_backend.cpp similarity index 100% rename from wayland_backend.cpp rename to backends/wayland/wayland_backend.cpp diff --git a/wayland_backend.h b/backends/wayland/wayland_backend.h similarity index 100% rename from wayland_backend.h rename to backends/wayland/wayland_backend.h diff --git a/screens_x11windowed.cpp b/backends/x11/screens_x11windowed.cpp similarity index 100% rename from screens_x11windowed.cpp rename to backends/x11/screens_x11windowed.cpp diff --git a/screens_x11windowed.h b/backends/x11/screens_x11windowed.h similarity index 100% rename from screens_x11windowed.h rename to backends/x11/screens_x11windowed.h diff --git a/x11windowed_backend.cpp b/backends/x11/x11windowed_backend.cpp similarity index 100% rename from x11windowed_backend.cpp rename to backends/x11/x11windowed_backend.cpp diff --git a/x11windowed_backend.h b/backends/x11/x11windowed_backend.h similarity index 100% rename from x11windowed_backend.h rename to backends/x11/x11windowed_backend.h diff --git a/composite.cpp b/composite.cpp index a62ab3033d..5710ff4eaa 100644 --- a/composite.cpp +++ b/composite.cpp @@ -38,7 +38,7 @@ along with this program. If not, see . #include "compositingprefs.h" #include "xcbutils.h" #if HAVE_WAYLAND -#include "wayland_backend.h" +#include "backends/wayland/wayland_backend.h" #include "wayland_server.h" #endif #include "decorations/decoratedclient.h" diff --git a/eglonxbackend.cpp b/eglonxbackend.cpp index 1e78f46dc8..f06497e4d5 100644 --- a/eglonxbackend.cpp +++ b/eglonxbackend.cpp @@ -25,7 +25,7 @@ along with this program. If not, see . #include "screens.h" #include "xcbutils.h" #if HAVE_X11_XCB -#include "x11windowed_backend.h" +#include "backends/x11/x11windowed_backend.h" #endif // kwin libs #include diff --git a/main_wayland.cpp b/main_wayland.cpp index 11c886dfbf..d71352cfe3 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -21,14 +21,14 @@ along with this program. If not, see . #include "workspace.h" #include // kwin -#include "fb_backend.h" +#include "backends/fbdev/fb_backend.h" #if HAVE_DRM -#include "drm_backend.h" +#include "backends/drm/drm_backend.h" #endif -#include "wayland_backend.h" +#include "backends/wayland/wayland_backend.h" #include "wayland_server.h" #include "xcbutils.h" -#include "x11windowed_backend.h" +#include "backends/x11/x11windowed_backend.h" // KWayland #include diff --git a/scene_qpainter.cpp b/scene_qpainter.cpp index 3f62928d9b..ca2faac2cb 100644 --- a/scene_qpainter.cpp +++ b/scene_qpainter.cpp @@ -29,13 +29,13 @@ along with this program. If not, see . #include "toplevel.h" #if HAVE_WAYLAND #if HAVE_DRM -#include "drm_backend.h" +#include "backends/drm/drm_backend.h" #endif -#include "fb_backend.h" +#include "backends/fbdev/fb_backend.h" #include "virtual_terminal.h" -#include "wayland_backend.h" +#include "backends/wayland/wayland_backend.h" #include "wayland_server.h" -#include "x11windowed_backend.h" +#include "backends/x11/x11windowed_backend.h" #include #include #include diff --git a/workspace.cpp b/workspace.cpp index 4b0189b988..aefb7740ea 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -52,9 +52,6 @@ along with this program. If not, see . #include "unmanaged.h" #include "useractions.h" #include "virtualdesktops.h" -#if HAVE_WAYLAND -#include "wayland_backend.h" -#endif #include "xcbutils.h" #include "main.h" #include "decorations/decorationbridge.h"