diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -574,7 +574,6 @@ install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS} ) -add_subdirectory(backends) add_subdirectory(plugins) ########### install files ############### diff --git a/autotests/wayland/CMakeLists.txt b/autotests/wayland/CMakeLists.txt --- a/autotests/wayland/CMakeLists.txt +++ b/autotests/wayland/CMakeLists.txt @@ -1,4 +1,4 @@ -add_definitions(-DKWINBACKENDPATH="${CMAKE_BINARY_DIR}/backends/virtual/KWinWaylandVirtualBackend.so") +add_definitions(-DKWINBACKENDPATH="${CMAKE_BINARY_DIR}/plugins/platforms/virtual/KWinWaylandVirtualBackend.so") add_definitions(-DKWINQPAPATH="${CMAKE_BINARY_DIR}/plugins/qpa/") ######################################################## # Test Start diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,3 +1,4 @@ add_subdirectory(kglobalaccel) add_subdirectory(qpa) add_subdirectory(idletime) +add_subdirectory(platforms) diff --git a/backends/CMakeLists.txt b/plugins/platforms/CMakeLists.txt rename from backends/CMakeLists.txt rename to plugins/platforms/CMakeLists.txt diff --git a/backends/drm/CMakeLists.txt b/plugins/platforms/drm/CMakeLists.txt rename from backends/drm/CMakeLists.txt rename to plugins/platforms/drm/CMakeLists.txt diff --git a/backends/drm/drm.json b/plugins/platforms/drm/drm.json rename from backends/drm/drm.json rename to plugins/platforms/drm/drm.json diff --git a/backends/drm/drm_backend.h b/plugins/platforms/drm/drm_backend.h rename from backends/drm/drm_backend.h rename to plugins/platforms/drm/drm_backend.h diff --git a/backends/drm/drm_backend.cpp b/plugins/platforms/drm/drm_backend.cpp rename from backends/drm/drm_backend.cpp rename to plugins/platforms/drm/drm_backend.cpp diff --git a/backends/drm/drm_buffer.h b/plugins/platforms/drm/drm_buffer.h rename from backends/drm/drm_buffer.h rename to plugins/platforms/drm/drm_buffer.h diff --git a/backends/drm/drm_buffer.cpp b/plugins/platforms/drm/drm_buffer.cpp rename from backends/drm/drm_buffer.cpp rename to plugins/platforms/drm/drm_buffer.cpp diff --git a/backends/drm/drm_inputeventfilter.h b/plugins/platforms/drm/drm_inputeventfilter.h rename from backends/drm/drm_inputeventfilter.h rename to plugins/platforms/drm/drm_inputeventfilter.h diff --git a/backends/drm/drm_inputeventfilter.cpp b/plugins/platforms/drm/drm_inputeventfilter.cpp rename from backends/drm/drm_inputeventfilter.cpp rename to plugins/platforms/drm/drm_inputeventfilter.cpp diff --git a/backends/drm/drm_output.h b/plugins/platforms/drm/drm_output.h rename from backends/drm/drm_output.h rename to plugins/platforms/drm/drm_output.h diff --git a/backends/drm/drm_output.cpp b/plugins/platforms/drm/drm_output.cpp rename from backends/drm/drm_output.cpp rename to plugins/platforms/drm/drm_output.cpp diff --git a/backends/drm/drm_pointer.h b/plugins/platforms/drm/drm_pointer.h rename from backends/drm/drm_pointer.h rename to plugins/platforms/drm/drm_pointer.h diff --git a/backends/drm/egl_gbm_backend.h b/plugins/platforms/drm/egl_gbm_backend.h rename from backends/drm/egl_gbm_backend.h rename to plugins/platforms/drm/egl_gbm_backend.h diff --git a/backends/drm/egl_gbm_backend.cpp b/plugins/platforms/drm/egl_gbm_backend.cpp rename from backends/drm/egl_gbm_backend.cpp rename to plugins/platforms/drm/egl_gbm_backend.cpp diff --git a/backends/drm/logging.h b/plugins/platforms/drm/logging.h rename from backends/drm/logging.h rename to plugins/platforms/drm/logging.h diff --git a/backends/drm/logging.cpp b/plugins/platforms/drm/logging.cpp rename from backends/drm/logging.cpp rename to plugins/platforms/drm/logging.cpp diff --git a/backends/drm/scene_qpainter_drm_backend.h b/plugins/platforms/drm/scene_qpainter_drm_backend.h rename from backends/drm/scene_qpainter_drm_backend.h rename to plugins/platforms/drm/scene_qpainter_drm_backend.h diff --git a/backends/drm/scene_qpainter_drm_backend.cpp b/plugins/platforms/drm/scene_qpainter_drm_backend.cpp rename from backends/drm/scene_qpainter_drm_backend.cpp rename to plugins/platforms/drm/scene_qpainter_drm_backend.cpp diff --git a/backends/drm/screens_drm.h b/plugins/platforms/drm/screens_drm.h rename from backends/drm/screens_drm.h rename to plugins/platforms/drm/screens_drm.h diff --git a/backends/drm/screens_drm.cpp b/plugins/platforms/drm/screens_drm.cpp rename from backends/drm/screens_drm.cpp rename to plugins/platforms/drm/screens_drm.cpp diff --git a/backends/fbdev/CMakeLists.txt b/plugins/platforms/fbdev/CMakeLists.txt rename from backends/fbdev/CMakeLists.txt rename to plugins/platforms/fbdev/CMakeLists.txt diff --git a/backends/fbdev/fb_backend.h b/plugins/platforms/fbdev/fb_backend.h rename from backends/fbdev/fb_backend.h rename to plugins/platforms/fbdev/fb_backend.h diff --git a/backends/fbdev/fb_backend.cpp b/plugins/platforms/fbdev/fb_backend.cpp rename from backends/fbdev/fb_backend.cpp rename to plugins/platforms/fbdev/fb_backend.cpp diff --git a/backends/fbdev/fbdev.json b/plugins/platforms/fbdev/fbdev.json rename from backends/fbdev/fbdev.json rename to plugins/platforms/fbdev/fbdev.json diff --git a/backends/fbdev/logging.h b/plugins/platforms/fbdev/logging.h rename from backends/fbdev/logging.h rename to plugins/platforms/fbdev/logging.h diff --git a/backends/fbdev/logging.cpp b/plugins/platforms/fbdev/logging.cpp rename from backends/fbdev/logging.cpp rename to plugins/platforms/fbdev/logging.cpp diff --git a/backends/fbdev/scene_qpainter_fb_backend.h b/plugins/platforms/fbdev/scene_qpainter_fb_backend.h rename from backends/fbdev/scene_qpainter_fb_backend.h rename to plugins/platforms/fbdev/scene_qpainter_fb_backend.h diff --git a/backends/fbdev/scene_qpainter_fb_backend.cpp b/plugins/platforms/fbdev/scene_qpainter_fb_backend.cpp rename from backends/fbdev/scene_qpainter_fb_backend.cpp rename to plugins/platforms/fbdev/scene_qpainter_fb_backend.cpp diff --git a/backends/hwcomposer/CMakeLists.txt b/plugins/platforms/hwcomposer/CMakeLists.txt rename from backends/hwcomposer/CMakeLists.txt rename to plugins/platforms/hwcomposer/CMakeLists.txt diff --git a/backends/hwcomposer/egl_hwcomposer_backend.h b/plugins/platforms/hwcomposer/egl_hwcomposer_backend.h rename from backends/hwcomposer/egl_hwcomposer_backend.h rename to plugins/platforms/hwcomposer/egl_hwcomposer_backend.h diff --git a/backends/hwcomposer/egl_hwcomposer_backend.cpp b/plugins/platforms/hwcomposer/egl_hwcomposer_backend.cpp rename from backends/hwcomposer/egl_hwcomposer_backend.cpp rename to plugins/platforms/hwcomposer/egl_hwcomposer_backend.cpp diff --git a/backends/hwcomposer/hwcomposer.json b/plugins/platforms/hwcomposer/hwcomposer.json rename from backends/hwcomposer/hwcomposer.json rename to plugins/platforms/hwcomposer/hwcomposer.json diff --git a/backends/hwcomposer/hwcomposer_backend.h b/plugins/platforms/hwcomposer/hwcomposer_backend.h rename from backends/hwcomposer/hwcomposer_backend.h rename to plugins/platforms/hwcomposer/hwcomposer_backend.h diff --git a/backends/hwcomposer/hwcomposer_backend.cpp b/plugins/platforms/hwcomposer/hwcomposer_backend.cpp rename from backends/hwcomposer/hwcomposer_backend.cpp rename to plugins/platforms/hwcomposer/hwcomposer_backend.cpp diff --git a/backends/hwcomposer/logging.h b/plugins/platforms/hwcomposer/logging.h rename from backends/hwcomposer/logging.h rename to plugins/platforms/hwcomposer/logging.h diff --git a/backends/hwcomposer/logging.cpp b/plugins/platforms/hwcomposer/logging.cpp rename from backends/hwcomposer/logging.cpp rename to plugins/platforms/hwcomposer/logging.cpp diff --git a/backends/hwcomposer/screens_hwcomposer.h b/plugins/platforms/hwcomposer/screens_hwcomposer.h rename from backends/hwcomposer/screens_hwcomposer.h rename to plugins/platforms/hwcomposer/screens_hwcomposer.h diff --git a/backends/hwcomposer/screens_hwcomposer.cpp b/plugins/platforms/hwcomposer/screens_hwcomposer.cpp rename from backends/hwcomposer/screens_hwcomposer.cpp rename to plugins/platforms/hwcomposer/screens_hwcomposer.cpp diff --git a/backends/virtual/CMakeLists.txt b/plugins/platforms/virtual/CMakeLists.txt rename from backends/virtual/CMakeLists.txt rename to plugins/platforms/virtual/CMakeLists.txt diff --git a/backends/virtual/egl_gbm_backend.h b/plugins/platforms/virtual/egl_gbm_backend.h rename from backends/virtual/egl_gbm_backend.h rename to plugins/platforms/virtual/egl_gbm_backend.h diff --git a/backends/virtual/egl_gbm_backend.cpp b/plugins/platforms/virtual/egl_gbm_backend.cpp rename from backends/virtual/egl_gbm_backend.cpp rename to plugins/platforms/virtual/egl_gbm_backend.cpp diff --git a/backends/virtual/scene_qpainter_virtual_backend.h b/plugins/platforms/virtual/scene_qpainter_virtual_backend.h rename from backends/virtual/scene_qpainter_virtual_backend.h rename to plugins/platforms/virtual/scene_qpainter_virtual_backend.h diff --git a/backends/virtual/scene_qpainter_virtual_backend.cpp b/plugins/platforms/virtual/scene_qpainter_virtual_backend.cpp rename from backends/virtual/scene_qpainter_virtual_backend.cpp rename to plugins/platforms/virtual/scene_qpainter_virtual_backend.cpp diff --git a/backends/virtual/screens_virtual.h b/plugins/platforms/virtual/screens_virtual.h rename from backends/virtual/screens_virtual.h rename to plugins/platforms/virtual/screens_virtual.h diff --git a/backends/virtual/screens_virtual.cpp b/plugins/platforms/virtual/screens_virtual.cpp rename from backends/virtual/screens_virtual.cpp rename to plugins/platforms/virtual/screens_virtual.cpp diff --git a/backends/virtual/virtual.json b/plugins/platforms/virtual/virtual.json rename from backends/virtual/virtual.json rename to plugins/platforms/virtual/virtual.json diff --git a/backends/virtual/virtual_backend.h b/plugins/platforms/virtual/virtual_backend.h rename from backends/virtual/virtual_backend.h rename to plugins/platforms/virtual/virtual_backend.h diff --git a/backends/virtual/virtual_backend.cpp b/plugins/platforms/virtual/virtual_backend.cpp rename from backends/virtual/virtual_backend.cpp rename to plugins/platforms/virtual/virtual_backend.cpp diff --git a/backends/wayland/CMakeLists.txt b/plugins/platforms/wayland/CMakeLists.txt rename from backends/wayland/CMakeLists.txt rename to plugins/platforms/wayland/CMakeLists.txt diff --git a/backends/wayland/egl_wayland_backend.h b/plugins/platforms/wayland/egl_wayland_backend.h rename from backends/wayland/egl_wayland_backend.h rename to plugins/platforms/wayland/egl_wayland_backend.h diff --git a/backends/wayland/egl_wayland_backend.cpp b/plugins/platforms/wayland/egl_wayland_backend.cpp rename from backends/wayland/egl_wayland_backend.cpp rename to plugins/platforms/wayland/egl_wayland_backend.cpp diff --git a/backends/wayland/logging.h b/plugins/platforms/wayland/logging.h rename from backends/wayland/logging.h rename to plugins/platforms/wayland/logging.h diff --git a/backends/wayland/logging.cpp b/plugins/platforms/wayland/logging.cpp rename from backends/wayland/logging.cpp rename to plugins/platforms/wayland/logging.cpp diff --git a/backends/wayland/scene_qpainter_wayland_backend.h b/plugins/platforms/wayland/scene_qpainter_wayland_backend.h rename from backends/wayland/scene_qpainter_wayland_backend.h rename to plugins/platforms/wayland/scene_qpainter_wayland_backend.h diff --git a/backends/wayland/scene_qpainter_wayland_backend.cpp b/plugins/platforms/wayland/scene_qpainter_wayland_backend.cpp rename from backends/wayland/scene_qpainter_wayland_backend.cpp rename to plugins/platforms/wayland/scene_qpainter_wayland_backend.cpp diff --git a/backends/wayland/wayland.json b/plugins/platforms/wayland/wayland.json rename from backends/wayland/wayland.json rename to plugins/platforms/wayland/wayland.json diff --git a/backends/wayland/wayland_backend.h b/plugins/platforms/wayland/wayland_backend.h rename from backends/wayland/wayland_backend.h rename to plugins/platforms/wayland/wayland_backend.h diff --git a/backends/wayland/wayland_backend.cpp b/plugins/platforms/wayland/wayland_backend.cpp rename from backends/wayland/wayland_backend.cpp rename to plugins/platforms/wayland/wayland_backend.cpp diff --git a/backends/x11/CMakeLists.txt b/plugins/platforms/x11/CMakeLists.txt rename from backends/x11/CMakeLists.txt rename to plugins/platforms/x11/CMakeLists.txt diff --git a/backends/x11/egl_x11_backend.h b/plugins/platforms/x11/egl_x11_backend.h rename from backends/x11/egl_x11_backend.h rename to plugins/platforms/x11/egl_x11_backend.h diff --git a/backends/x11/egl_x11_backend.cpp b/plugins/platforms/x11/egl_x11_backend.cpp rename from backends/x11/egl_x11_backend.cpp rename to plugins/platforms/x11/egl_x11_backend.cpp diff --git a/backends/x11/logging.h b/plugins/platforms/x11/logging.h rename from backends/x11/logging.h rename to plugins/platforms/x11/logging.h diff --git a/backends/x11/logging.cpp b/plugins/platforms/x11/logging.cpp rename from backends/x11/logging.cpp rename to plugins/platforms/x11/logging.cpp diff --git a/backends/x11/scene_qpainter_x11_backend.h b/plugins/platforms/x11/scene_qpainter_x11_backend.h rename from backends/x11/scene_qpainter_x11_backend.h rename to plugins/platforms/x11/scene_qpainter_x11_backend.h diff --git a/backends/x11/scene_qpainter_x11_backend.cpp b/plugins/platforms/x11/scene_qpainter_x11_backend.cpp rename from backends/x11/scene_qpainter_x11_backend.cpp rename to plugins/platforms/x11/scene_qpainter_x11_backend.cpp diff --git a/backends/x11/x11.json b/plugins/platforms/x11/x11.json rename from backends/x11/x11.json rename to plugins/platforms/x11/x11.json diff --git a/backends/x11/x11windowed_backend.h b/plugins/platforms/x11/x11windowed_backend.h rename from backends/x11/x11windowed_backend.h rename to plugins/platforms/x11/x11windowed_backend.h diff --git a/backends/x11/x11windowed_backend.cpp b/plugins/platforms/x11/x11windowed_backend.cpp rename from backends/x11/x11windowed_backend.cpp rename to plugins/platforms/x11/x11windowed_backend.cpp