diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt index 1104b5fcb8..b103ad6202 100644 --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -267,7 +267,7 @@ set(testOpenGLContextAttributeBuilder_SRCS ) if (HAVE_EPOXY_GLX) - set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/plugins/platforms/x11/standalone/glx_context_attribute_builder.cpp) + set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/backends/x11/standalone/glx_context_attribute_builder.cpp) endif() add_executable(testOpenGLContextAttributeBuilder ${testOpenGLContextAttributeBuilder_SRCS}) target_link_libraries(testOpenGLContextAttributeBuilder Qt::Test) diff --git a/autotests/opengl_context_attribute_builder_test.cpp b/autotests/opengl_context_attribute_builder_test.cpp index e9869f2020..0ccf1942d9 100644 --- a/autotests/opengl_context_attribute_builder_test.cpp +++ b/autotests/opengl_context_attribute_builder_test.cpp @@ -13,7 +13,7 @@ #include #if HAVE_EPOXY_GLX -#include "../src/plugins/platforms/x11/standalone/glx_context_attribute_builder.h" +#include "../src/backends/x11/standalone/glx_context_attribute_builder.h" #include #ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt index bb6421a5ef..779d50ba8c 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/CMakeLists.txt @@ -1,2 +1,9 @@ +add_subdirectory(drm) add_subdirectory(fakeinput) +if (HAVE_LINUX_FB_H) + add_subdirectory(fbdev) +endif() add_subdirectory(libinput) +add_subdirectory(virtual) +add_subdirectory(wayland) +add_subdirectory(x11) diff --git a/src/plugins/platforms/drm/CMakeLists.txt b/src/backends/drm/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/drm/CMakeLists.txt rename to src/backends/drm/CMakeLists.txt diff --git a/src/plugins/platforms/drm/abstract_egl_drm_backend.cpp b/src/backends/drm/abstract_egl_drm_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/abstract_egl_drm_backend.cpp rename to src/backends/drm/abstract_egl_drm_backend.cpp diff --git a/src/plugins/platforms/drm/abstract_egl_drm_backend.h b/src/backends/drm/abstract_egl_drm_backend.h similarity index 100% rename from src/plugins/platforms/drm/abstract_egl_drm_backend.h rename to src/backends/drm/abstract_egl_drm_backend.h diff --git a/src/plugins/platforms/drm/drm.json b/src/backends/drm/drm.json similarity index 100% rename from src/plugins/platforms/drm/drm.json rename to src/backends/drm/drm.json diff --git a/src/plugins/platforms/drm/drm_abstract_output.cpp b/src/backends/drm/drm_abstract_output.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_abstract_output.cpp rename to src/backends/drm/drm_abstract_output.cpp diff --git a/src/plugins/platforms/drm/drm_abstract_output.h b/src/backends/drm/drm_abstract_output.h similarity index 100% rename from src/plugins/platforms/drm/drm_abstract_output.h rename to src/backends/drm/drm_abstract_output.h diff --git a/src/plugins/platforms/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_backend.cpp rename to src/backends/drm/drm_backend.cpp diff --git a/src/plugins/platforms/drm/drm_backend.h b/src/backends/drm/drm_backend.h similarity index 100% rename from src/plugins/platforms/drm/drm_backend.h rename to src/backends/drm/drm_backend.h diff --git a/src/plugins/platforms/drm/drm_buffer.cpp b/src/backends/drm/drm_buffer.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_buffer.cpp rename to src/backends/drm/drm_buffer.cpp diff --git a/src/plugins/platforms/drm/drm_buffer.h b/src/backends/drm/drm_buffer.h similarity index 100% rename from src/plugins/platforms/drm/drm_buffer.h rename to src/backends/drm/drm_buffer.h diff --git a/src/plugins/platforms/drm/drm_buffer_gbm.cpp b/src/backends/drm/drm_buffer_gbm.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_buffer_gbm.cpp rename to src/backends/drm/drm_buffer_gbm.cpp diff --git a/src/plugins/platforms/drm/drm_buffer_gbm.h b/src/backends/drm/drm_buffer_gbm.h similarity index 100% rename from src/plugins/platforms/drm/drm_buffer_gbm.h rename to src/backends/drm/drm_buffer_gbm.h diff --git a/src/plugins/platforms/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_gpu.cpp rename to src/backends/drm/drm_gpu.cpp diff --git a/src/plugins/platforms/drm/drm_gpu.h b/src/backends/drm/drm_gpu.h similarity index 100% rename from src/plugins/platforms/drm/drm_gpu.h rename to src/backends/drm/drm_gpu.h diff --git a/src/plugins/platforms/drm/drm_lease_output.cpp b/src/backends/drm/drm_lease_output.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_lease_output.cpp rename to src/backends/drm/drm_lease_output.cpp diff --git a/src/plugins/platforms/drm/drm_lease_output.h b/src/backends/drm/drm_lease_output.h similarity index 100% rename from src/plugins/platforms/drm/drm_lease_output.h rename to src/backends/drm/drm_lease_output.h diff --git a/src/plugins/platforms/drm/drm_object.cpp b/src/backends/drm/drm_object.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_object.cpp rename to src/backends/drm/drm_object.cpp diff --git a/src/plugins/platforms/drm/drm_object.h b/src/backends/drm/drm_object.h similarity index 100% rename from src/plugins/platforms/drm/drm_object.h rename to src/backends/drm/drm_object.h diff --git a/src/plugins/platforms/drm/drm_object_connector.cpp b/src/backends/drm/drm_object_connector.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_object_connector.cpp rename to src/backends/drm/drm_object_connector.cpp diff --git a/src/plugins/platforms/drm/drm_object_connector.h b/src/backends/drm/drm_object_connector.h similarity index 100% rename from src/plugins/platforms/drm/drm_object_connector.h rename to src/backends/drm/drm_object_connector.h diff --git a/src/plugins/platforms/drm/drm_object_crtc.cpp b/src/backends/drm/drm_object_crtc.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_object_crtc.cpp rename to src/backends/drm/drm_object_crtc.cpp diff --git a/src/plugins/platforms/drm/drm_object_crtc.h b/src/backends/drm/drm_object_crtc.h similarity index 100% rename from src/plugins/platforms/drm/drm_object_crtc.h rename to src/backends/drm/drm_object_crtc.h diff --git a/src/plugins/platforms/drm/drm_object_plane.cpp b/src/backends/drm/drm_object_plane.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_object_plane.cpp rename to src/backends/drm/drm_object_plane.cpp diff --git a/src/plugins/platforms/drm/drm_object_plane.h b/src/backends/drm/drm_object_plane.h similarity index 100% rename from src/plugins/platforms/drm/drm_object_plane.h rename to src/backends/drm/drm_object_plane.h diff --git a/src/plugins/platforms/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_output.cpp rename to src/backends/drm/drm_output.cpp diff --git a/src/plugins/platforms/drm/drm_output.h b/src/backends/drm/drm_output.h similarity index 100% rename from src/plugins/platforms/drm/drm_output.h rename to src/backends/drm/drm_output.h diff --git a/src/plugins/platforms/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_pipeline.cpp rename to src/backends/drm/drm_pipeline.cpp diff --git a/src/plugins/platforms/drm/drm_pipeline.h b/src/backends/drm/drm_pipeline.h similarity index 100% rename from src/plugins/platforms/drm/drm_pipeline.h rename to src/backends/drm/drm_pipeline.h diff --git a/src/plugins/platforms/drm/drm_pointer.h b/src/backends/drm/drm_pointer.h similarity index 100% rename from src/plugins/platforms/drm/drm_pointer.h rename to src/backends/drm/drm_pointer.h diff --git a/src/plugins/platforms/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_property.cpp rename to src/backends/drm/drm_property.cpp diff --git a/src/plugins/platforms/drm/drm_property.h b/src/backends/drm/drm_property.h similarity index 100% rename from src/plugins/platforms/drm/drm_property.h rename to src/backends/drm/drm_property.h diff --git a/src/plugins/platforms/drm/drm_virtual_output.cpp b/src/backends/drm/drm_virtual_output.cpp similarity index 100% rename from src/plugins/platforms/drm/drm_virtual_output.cpp rename to src/backends/drm/drm_virtual_output.cpp diff --git a/src/plugins/platforms/drm/drm_virtual_output.h b/src/backends/drm/drm_virtual_output.h similarity index 100% rename from src/plugins/platforms/drm/drm_virtual_output.h rename to src/backends/drm/drm_virtual_output.h diff --git a/src/plugins/platforms/drm/dumb_swapchain.cpp b/src/backends/drm/dumb_swapchain.cpp similarity index 100% rename from src/plugins/platforms/drm/dumb_swapchain.cpp rename to src/backends/drm/dumb_swapchain.cpp diff --git a/src/plugins/platforms/drm/dumb_swapchain.h b/src/backends/drm/dumb_swapchain.h similarity index 100% rename from src/plugins/platforms/drm/dumb_swapchain.h rename to src/backends/drm/dumb_swapchain.h diff --git a/src/plugins/platforms/drm/edid.cpp b/src/backends/drm/edid.cpp similarity index 100% rename from src/plugins/platforms/drm/edid.cpp rename to src/backends/drm/edid.cpp diff --git a/src/plugins/platforms/drm/edid.h b/src/backends/drm/edid.h similarity index 100% rename from src/plugins/platforms/drm/edid.h rename to src/backends/drm/edid.h diff --git a/src/plugins/platforms/drm/egl_gbm_backend.cpp b/src/backends/drm/egl_gbm_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/egl_gbm_backend.cpp rename to src/backends/drm/egl_gbm_backend.cpp diff --git a/src/plugins/platforms/drm/egl_gbm_backend.h b/src/backends/drm/egl_gbm_backend.h similarity index 100% rename from src/plugins/platforms/drm/egl_gbm_backend.h rename to src/backends/drm/egl_gbm_backend.h diff --git a/src/plugins/platforms/drm/egl_multi_backend.cpp b/src/backends/drm/egl_multi_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/egl_multi_backend.cpp rename to src/backends/drm/egl_multi_backend.cpp diff --git a/src/plugins/platforms/drm/egl_multi_backend.h b/src/backends/drm/egl_multi_backend.h similarity index 100% rename from src/plugins/platforms/drm/egl_multi_backend.h rename to src/backends/drm/egl_multi_backend.h diff --git a/src/plugins/platforms/drm/egl_stream_backend.cpp b/src/backends/drm/egl_stream_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/egl_stream_backend.cpp rename to src/backends/drm/egl_stream_backend.cpp diff --git a/src/plugins/platforms/drm/egl_stream_backend.h b/src/backends/drm/egl_stream_backend.h similarity index 100% rename from src/plugins/platforms/drm/egl_stream_backend.h rename to src/backends/drm/egl_stream_backend.h diff --git a/src/plugins/platforms/drm/gbm_dmabuf.cpp b/src/backends/drm/gbm_dmabuf.cpp similarity index 100% rename from src/plugins/platforms/drm/gbm_dmabuf.cpp rename to src/backends/drm/gbm_dmabuf.cpp diff --git a/src/plugins/platforms/drm/gbm_dmabuf.h b/src/backends/drm/gbm_dmabuf.h similarity index 100% rename from src/plugins/platforms/drm/gbm_dmabuf.h rename to src/backends/drm/gbm_dmabuf.h diff --git a/src/plugins/platforms/drm/gbm_surface.cpp b/src/backends/drm/gbm_surface.cpp similarity index 100% rename from src/plugins/platforms/drm/gbm_surface.cpp rename to src/backends/drm/gbm_surface.cpp diff --git a/src/plugins/platforms/drm/gbm_surface.h b/src/backends/drm/gbm_surface.h similarity index 100% rename from src/plugins/platforms/drm/gbm_surface.h rename to src/backends/drm/gbm_surface.h diff --git a/src/plugins/platforms/drm/logging.cpp b/src/backends/drm/logging.cpp similarity index 100% rename from src/plugins/platforms/drm/logging.cpp rename to src/backends/drm/logging.cpp diff --git a/src/plugins/platforms/drm/logging.h b/src/backends/drm/logging.h similarity index 100% rename from src/plugins/platforms/drm/logging.h rename to src/backends/drm/logging.h diff --git a/src/plugins/platforms/drm/scene_qpainter_drm_backend.cpp b/src/backends/drm/scene_qpainter_drm_backend.cpp similarity index 100% rename from src/plugins/platforms/drm/scene_qpainter_drm_backend.cpp rename to src/backends/drm/scene_qpainter_drm_backend.cpp diff --git a/src/plugins/platforms/drm/scene_qpainter_drm_backend.h b/src/backends/drm/scene_qpainter_drm_backend.h similarity index 100% rename from src/plugins/platforms/drm/scene_qpainter_drm_backend.h rename to src/backends/drm/scene_qpainter_drm_backend.h diff --git a/src/plugins/platforms/drm/shadowbuffer.cpp b/src/backends/drm/shadowbuffer.cpp similarity index 100% rename from src/plugins/platforms/drm/shadowbuffer.cpp rename to src/backends/drm/shadowbuffer.cpp diff --git a/src/plugins/platforms/drm/shadowbuffer.h b/src/backends/drm/shadowbuffer.h similarity index 100% rename from src/plugins/platforms/drm/shadowbuffer.h rename to src/backends/drm/shadowbuffer.h diff --git a/src/plugins/platforms/fbdev/CMakeLists.txt b/src/backends/fbdev/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/fbdev/CMakeLists.txt rename to src/backends/fbdev/CMakeLists.txt diff --git a/src/plugins/platforms/fbdev/fb_backend.cpp b/src/backends/fbdev/fb_backend.cpp similarity index 100% rename from src/plugins/platforms/fbdev/fb_backend.cpp rename to src/backends/fbdev/fb_backend.cpp diff --git a/src/plugins/platforms/fbdev/fb_backend.h b/src/backends/fbdev/fb_backend.h similarity index 100% rename from src/plugins/platforms/fbdev/fb_backend.h rename to src/backends/fbdev/fb_backend.h diff --git a/src/plugins/platforms/fbdev/fbdev.json b/src/backends/fbdev/fbdev.json similarity index 100% rename from src/plugins/platforms/fbdev/fbdev.json rename to src/backends/fbdev/fbdev.json diff --git a/src/plugins/platforms/fbdev/logging.cpp b/src/backends/fbdev/logging.cpp similarity index 100% rename from src/plugins/platforms/fbdev/logging.cpp rename to src/backends/fbdev/logging.cpp diff --git a/src/plugins/platforms/fbdev/logging.h b/src/backends/fbdev/logging.h similarity index 100% rename from src/plugins/platforms/fbdev/logging.h rename to src/backends/fbdev/logging.h diff --git a/src/plugins/platforms/fbdev/scene_qpainter_fb_backend.cpp b/src/backends/fbdev/scene_qpainter_fb_backend.cpp similarity index 100% rename from src/plugins/platforms/fbdev/scene_qpainter_fb_backend.cpp rename to src/backends/fbdev/scene_qpainter_fb_backend.cpp diff --git a/src/plugins/platforms/fbdev/scene_qpainter_fb_backend.h b/src/backends/fbdev/scene_qpainter_fb_backend.h similarity index 100% rename from src/plugins/platforms/fbdev/scene_qpainter_fb_backend.h rename to src/backends/fbdev/scene_qpainter_fb_backend.h diff --git a/src/plugins/platforms/virtual/CMakeLists.txt b/src/backends/virtual/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/virtual/CMakeLists.txt rename to src/backends/virtual/CMakeLists.txt diff --git a/src/plugins/platforms/virtual/egl_gbm_backend.cpp b/src/backends/virtual/egl_gbm_backend.cpp similarity index 100% rename from src/plugins/platforms/virtual/egl_gbm_backend.cpp rename to src/backends/virtual/egl_gbm_backend.cpp diff --git a/src/plugins/platforms/virtual/egl_gbm_backend.h b/src/backends/virtual/egl_gbm_backend.h similarity index 100% rename from src/plugins/platforms/virtual/egl_gbm_backend.h rename to src/backends/virtual/egl_gbm_backend.h diff --git a/src/plugins/platforms/virtual/scene_qpainter_virtual_backend.cpp b/src/backends/virtual/scene_qpainter_virtual_backend.cpp similarity index 100% rename from src/plugins/platforms/virtual/scene_qpainter_virtual_backend.cpp rename to src/backends/virtual/scene_qpainter_virtual_backend.cpp diff --git a/src/plugins/platforms/virtual/scene_qpainter_virtual_backend.h b/src/backends/virtual/scene_qpainter_virtual_backend.h similarity index 100% rename from src/plugins/platforms/virtual/scene_qpainter_virtual_backend.h rename to src/backends/virtual/scene_qpainter_virtual_backend.h diff --git a/src/plugins/platforms/virtual/virtual.json b/src/backends/virtual/virtual.json similarity index 100% rename from src/plugins/platforms/virtual/virtual.json rename to src/backends/virtual/virtual.json diff --git a/src/plugins/platforms/virtual/virtual_backend.cpp b/src/backends/virtual/virtual_backend.cpp similarity index 100% rename from src/plugins/platforms/virtual/virtual_backend.cpp rename to src/backends/virtual/virtual_backend.cpp diff --git a/src/plugins/platforms/virtual/virtual_backend.h b/src/backends/virtual/virtual_backend.h similarity index 100% rename from src/plugins/platforms/virtual/virtual_backend.h rename to src/backends/virtual/virtual_backend.h diff --git a/src/plugins/platforms/virtual/virtual_output.cpp b/src/backends/virtual/virtual_output.cpp similarity index 100% rename from src/plugins/platforms/virtual/virtual_output.cpp rename to src/backends/virtual/virtual_output.cpp diff --git a/src/plugins/platforms/virtual/virtual_output.h b/src/backends/virtual/virtual_output.h similarity index 100% rename from src/plugins/platforms/virtual/virtual_output.h rename to src/backends/virtual/virtual_output.h diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/backends/wayland/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/wayland/CMakeLists.txt rename to src/backends/wayland/CMakeLists.txt diff --git a/src/plugins/platforms/wayland/egl_wayland_backend.cpp b/src/backends/wayland/egl_wayland_backend.cpp similarity index 100% rename from src/plugins/platforms/wayland/egl_wayland_backend.cpp rename to src/backends/wayland/egl_wayland_backend.cpp diff --git a/src/plugins/platforms/wayland/egl_wayland_backend.h b/src/backends/wayland/egl_wayland_backend.h similarity index 100% rename from src/plugins/platforms/wayland/egl_wayland_backend.h rename to src/backends/wayland/egl_wayland_backend.h diff --git a/src/plugins/platforms/wayland/logging.cpp b/src/backends/wayland/logging.cpp similarity index 100% rename from src/plugins/platforms/wayland/logging.cpp rename to src/backends/wayland/logging.cpp diff --git a/src/plugins/platforms/wayland/logging.h b/src/backends/wayland/logging.h similarity index 100% rename from src/plugins/platforms/wayland/logging.h rename to src/backends/wayland/logging.h diff --git a/src/plugins/platforms/wayland/scene_qpainter_wayland_backend.cpp b/src/backends/wayland/scene_qpainter_wayland_backend.cpp similarity index 100% rename from src/plugins/platforms/wayland/scene_qpainter_wayland_backend.cpp rename to src/backends/wayland/scene_qpainter_wayland_backend.cpp diff --git a/src/plugins/platforms/wayland/scene_qpainter_wayland_backend.h b/src/backends/wayland/scene_qpainter_wayland_backend.h similarity index 100% rename from src/plugins/platforms/wayland/scene_qpainter_wayland_backend.h rename to src/backends/wayland/scene_qpainter_wayland_backend.h diff --git a/src/plugins/platforms/wayland/wayland.json b/src/backends/wayland/wayland.json similarity index 100% rename from src/plugins/platforms/wayland/wayland.json rename to src/backends/wayland/wayland.json diff --git a/src/plugins/platforms/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp similarity index 100% rename from src/plugins/platforms/wayland/wayland_backend.cpp rename to src/backends/wayland/wayland_backend.cpp diff --git a/src/plugins/platforms/wayland/wayland_backend.h b/src/backends/wayland/wayland_backend.h similarity index 100% rename from src/plugins/platforms/wayland/wayland_backend.h rename to src/backends/wayland/wayland_backend.h diff --git a/src/plugins/platforms/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp similarity index 100% rename from src/plugins/platforms/wayland/wayland_output.cpp rename to src/backends/wayland/wayland_output.cpp diff --git a/src/plugins/platforms/wayland/wayland_output.h b/src/backends/wayland/wayland_output.h similarity index 100% rename from src/plugins/platforms/wayland/wayland_output.h rename to src/backends/wayland/wayland_output.h diff --git a/src/plugins/platforms/x11/CMakeLists.txt b/src/backends/x11/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/x11/CMakeLists.txt rename to src/backends/x11/CMakeLists.txt diff --git a/src/plugins/platforms/x11/common/CMakeLists.txt b/src/backends/x11/common/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/x11/common/CMakeLists.txt rename to src/backends/x11/common/CMakeLists.txt diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/backends/x11/common/eglonxbackend.cpp similarity index 100% rename from src/plugins/platforms/x11/common/eglonxbackend.cpp rename to src/backends/x11/common/eglonxbackend.cpp diff --git a/src/plugins/platforms/x11/common/eglonxbackend.h b/src/backends/x11/common/eglonxbackend.h similarity index 100% rename from src/plugins/platforms/x11/common/eglonxbackend.h rename to src/backends/x11/common/eglonxbackend.h diff --git a/src/plugins/platforms/x11/common/ge_event_mem_mover.h b/src/backends/x11/common/ge_event_mem_mover.h similarity index 100% rename from src/plugins/platforms/x11/common/ge_event_mem_mover.h rename to src/backends/x11/common/ge_event_mem_mover.h diff --git a/src/plugins/platforms/x11/standalone/CMakeLists.txt b/src/backends/x11/standalone/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/x11/standalone/CMakeLists.txt rename to src/backends/x11/standalone/CMakeLists.txt diff --git a/src/plugins/platforms/x11/standalone/edge.cpp b/src/backends/x11/standalone/edge.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/edge.cpp rename to src/backends/x11/standalone/edge.cpp diff --git a/src/plugins/platforms/x11/standalone/edge.h b/src/backends/x11/standalone/edge.h similarity index 100% rename from src/plugins/platforms/x11/standalone/edge.h rename to src/backends/x11/standalone/edge.h diff --git a/src/plugins/platforms/x11/standalone/effects_mouse_interception_x11_filter.cpp b/src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/effects_mouse_interception_x11_filter.cpp rename to src/backends/x11/standalone/effects_mouse_interception_x11_filter.cpp diff --git a/src/plugins/platforms/x11/standalone/effects_mouse_interception_x11_filter.h b/src/backends/x11/standalone/effects_mouse_interception_x11_filter.h similarity index 100% rename from src/plugins/platforms/x11/standalone/effects_mouse_interception_x11_filter.h rename to src/backends/x11/standalone/effects_mouse_interception_x11_filter.h diff --git a/src/plugins/platforms/x11/standalone/effects_x11.cpp b/src/backends/x11/standalone/effects_x11.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/effects_x11.cpp rename to src/backends/x11/standalone/effects_x11.cpp diff --git a/src/plugins/platforms/x11/standalone/effects_x11.h b/src/backends/x11/standalone/effects_x11.h similarity index 100% rename from src/plugins/platforms/x11/standalone/effects_x11.h rename to src/backends/x11/standalone/effects_x11.h diff --git a/src/plugins/platforms/x11/standalone/eglbackend.cpp b/src/backends/x11/standalone/eglbackend.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/eglbackend.cpp rename to src/backends/x11/standalone/eglbackend.cpp diff --git a/src/plugins/platforms/x11/standalone/eglbackend.h b/src/backends/x11/standalone/eglbackend.h similarity index 100% rename from src/plugins/platforms/x11/standalone/eglbackend.h rename to src/backends/x11/standalone/eglbackend.h diff --git a/src/plugins/platforms/x11/standalone/glx_context_attribute_builder.cpp b/src/backends/x11/standalone/glx_context_attribute_builder.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/glx_context_attribute_builder.cpp rename to src/backends/x11/standalone/glx_context_attribute_builder.cpp diff --git a/src/plugins/platforms/x11/standalone/glx_context_attribute_builder.h b/src/backends/x11/standalone/glx_context_attribute_builder.h similarity index 100% rename from src/plugins/platforms/x11/standalone/glx_context_attribute_builder.h rename to src/backends/x11/standalone/glx_context_attribute_builder.h diff --git a/src/plugins/platforms/x11/standalone/glxbackend.cpp b/src/backends/x11/standalone/glxbackend.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/glxbackend.cpp rename to src/backends/x11/standalone/glxbackend.cpp diff --git a/src/plugins/platforms/x11/standalone/glxbackend.h b/src/backends/x11/standalone/glxbackend.h similarity index 100% rename from src/plugins/platforms/x11/standalone/glxbackend.h rename to src/backends/x11/standalone/glxbackend.h diff --git a/src/plugins/platforms/x11/standalone/glxconvenience.cpp b/src/backends/x11/standalone/glxconvenience.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/glxconvenience.cpp rename to src/backends/x11/standalone/glxconvenience.cpp diff --git a/src/plugins/platforms/x11/standalone/glxconvenience.h b/src/backends/x11/standalone/glxconvenience.h similarity index 100% rename from src/plugins/platforms/x11/standalone/glxconvenience.h rename to src/backends/x11/standalone/glxconvenience.h diff --git a/src/plugins/platforms/x11/standalone/logging.cpp b/src/backends/x11/standalone/logging.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/logging.cpp rename to src/backends/x11/standalone/logging.cpp diff --git a/src/plugins/platforms/x11/standalone/logging.h b/src/backends/x11/standalone/logging.h similarity index 100% rename from src/plugins/platforms/x11/standalone/logging.h rename to src/backends/x11/standalone/logging.h diff --git a/src/plugins/platforms/x11/standalone/non_composited_outline.cpp b/src/backends/x11/standalone/non_composited_outline.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/non_composited_outline.cpp rename to src/backends/x11/standalone/non_composited_outline.cpp diff --git a/src/plugins/platforms/x11/standalone/non_composited_outline.h b/src/backends/x11/standalone/non_composited_outline.h similarity index 100% rename from src/plugins/platforms/x11/standalone/non_composited_outline.h rename to src/backends/x11/standalone/non_composited_outline.h diff --git a/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp b/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.cpp rename to src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp diff --git a/src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.h b/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.h similarity index 100% rename from src/plugins/platforms/x11/standalone/omlsynccontrolvsyncmonitor.h rename to src/backends/x11/standalone/omlsynccontrolvsyncmonitor.h diff --git a/src/plugins/platforms/x11/standalone/overlaywindow_x11.cpp b/src/backends/x11/standalone/overlaywindow_x11.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/overlaywindow_x11.cpp rename to src/backends/x11/standalone/overlaywindow_x11.cpp diff --git a/src/plugins/platforms/x11/standalone/overlaywindow_x11.h b/src/backends/x11/standalone/overlaywindow_x11.h similarity index 100% rename from src/plugins/platforms/x11/standalone/overlaywindow_x11.h rename to src/backends/x11/standalone/overlaywindow_x11.h diff --git a/src/plugins/platforms/x11/standalone/screenedges_filter.cpp b/src/backends/x11/standalone/screenedges_filter.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/screenedges_filter.cpp rename to src/backends/x11/standalone/screenedges_filter.cpp diff --git a/src/plugins/platforms/x11/standalone/screenedges_filter.h b/src/backends/x11/standalone/screenedges_filter.h similarity index 100% rename from src/plugins/platforms/x11/standalone/screenedges_filter.h rename to src/backends/x11/standalone/screenedges_filter.h diff --git a/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp b/src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.cpp rename to src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp diff --git a/src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.h b/src/backends/x11/standalone/sgivideosyncvsyncmonitor.h similarity index 100% rename from src/plugins/platforms/x11/standalone/sgivideosyncvsyncmonitor.h rename to src/backends/x11/standalone/sgivideosyncvsyncmonitor.h diff --git a/src/plugins/platforms/x11/standalone/windowselector.cpp b/src/backends/x11/standalone/windowselector.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/windowselector.cpp rename to src/backends/x11/standalone/windowselector.cpp diff --git a/src/plugins/platforms/x11/standalone/windowselector.h b/src/backends/x11/standalone/windowselector.h similarity index 100% rename from src/plugins/platforms/x11/standalone/windowselector.h rename to src/backends/x11/standalone/windowselector.h diff --git a/src/plugins/platforms/x11/standalone/x11.json b/src/backends/x11/standalone/x11.json similarity index 100% rename from src/plugins/platforms/x11/standalone/x11.json rename to src/backends/x11/standalone/x11.json diff --git a/src/plugins/platforms/x11/standalone/x11_output.cpp b/src/backends/x11/standalone/x11_output.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/x11_output.cpp rename to src/backends/x11/standalone/x11_output.cpp diff --git a/src/plugins/platforms/x11/standalone/x11_output.h b/src/backends/x11/standalone/x11_output.h similarity index 100% rename from src/plugins/platforms/x11/standalone/x11_output.h rename to src/backends/x11/standalone/x11_output.h diff --git a/src/plugins/platforms/x11/standalone/x11_platform.cpp b/src/backends/x11/standalone/x11_platform.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/x11_platform.cpp rename to src/backends/x11/standalone/x11_platform.cpp diff --git a/src/plugins/platforms/x11/standalone/x11_platform.h b/src/backends/x11/standalone/x11_platform.h similarity index 100% rename from src/plugins/platforms/x11/standalone/x11_platform.h rename to src/backends/x11/standalone/x11_platform.h diff --git a/src/plugins/platforms/x11/standalone/x11cursor.cpp b/src/backends/x11/standalone/x11cursor.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/x11cursor.cpp rename to src/backends/x11/standalone/x11cursor.cpp diff --git a/src/plugins/platforms/x11/standalone/x11cursor.h b/src/backends/x11/standalone/x11cursor.h similarity index 100% rename from src/plugins/platforms/x11/standalone/x11cursor.h rename to src/backends/x11/standalone/x11cursor.h diff --git a/src/plugins/platforms/x11/standalone/x11placeholderoutput.cpp b/src/backends/x11/standalone/x11placeholderoutput.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/x11placeholderoutput.cpp rename to src/backends/x11/standalone/x11placeholderoutput.cpp diff --git a/src/plugins/platforms/x11/standalone/x11placeholderoutput.h b/src/backends/x11/standalone/x11placeholderoutput.h similarity index 100% rename from src/plugins/platforms/x11/standalone/x11placeholderoutput.h rename to src/backends/x11/standalone/x11placeholderoutput.h diff --git a/src/plugins/platforms/x11/standalone/xfixes_cursor_event_filter.cpp b/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/xfixes_cursor_event_filter.cpp rename to src/backends/x11/standalone/xfixes_cursor_event_filter.cpp diff --git a/src/plugins/platforms/x11/standalone/xfixes_cursor_event_filter.h b/src/backends/x11/standalone/xfixes_cursor_event_filter.h similarity index 100% rename from src/plugins/platforms/x11/standalone/xfixes_cursor_event_filter.h rename to src/backends/x11/standalone/xfixes_cursor_event_filter.h diff --git a/src/plugins/platforms/x11/standalone/xinputintegration.cpp b/src/backends/x11/standalone/xinputintegration.cpp similarity index 100% rename from src/plugins/platforms/x11/standalone/xinputintegration.cpp rename to src/backends/x11/standalone/xinputintegration.cpp diff --git a/src/plugins/platforms/x11/standalone/xinputintegration.h b/src/backends/x11/standalone/xinputintegration.h similarity index 100% rename from src/plugins/platforms/x11/standalone/xinputintegration.h rename to src/backends/x11/standalone/xinputintegration.h diff --git a/src/plugins/platforms/x11/windowed/CMakeLists.txt b/src/backends/x11/windowed/CMakeLists.txt similarity index 100% rename from src/plugins/platforms/x11/windowed/CMakeLists.txt rename to src/backends/x11/windowed/CMakeLists.txt diff --git a/src/plugins/platforms/x11/windowed/egl_x11_backend.cpp b/src/backends/x11/windowed/egl_x11_backend.cpp similarity index 100% rename from src/plugins/platforms/x11/windowed/egl_x11_backend.cpp rename to src/backends/x11/windowed/egl_x11_backend.cpp diff --git a/src/plugins/platforms/x11/windowed/egl_x11_backend.h b/src/backends/x11/windowed/egl_x11_backend.h similarity index 100% rename from src/plugins/platforms/x11/windowed/egl_x11_backend.h rename to src/backends/x11/windowed/egl_x11_backend.h diff --git a/src/plugins/platforms/x11/windowed/logging.cpp b/src/backends/x11/windowed/logging.cpp similarity index 100% rename from src/plugins/platforms/x11/windowed/logging.cpp rename to src/backends/x11/windowed/logging.cpp diff --git a/src/plugins/platforms/x11/windowed/logging.h b/src/backends/x11/windowed/logging.h similarity index 100% rename from src/plugins/platforms/x11/windowed/logging.h rename to src/backends/x11/windowed/logging.h diff --git a/src/plugins/platforms/x11/windowed/scene_qpainter_x11_backend.cpp b/src/backends/x11/windowed/scene_qpainter_x11_backend.cpp similarity index 100% rename from src/plugins/platforms/x11/windowed/scene_qpainter_x11_backend.cpp rename to src/backends/x11/windowed/scene_qpainter_x11_backend.cpp diff --git a/src/plugins/platforms/x11/windowed/scene_qpainter_x11_backend.h b/src/backends/x11/windowed/scene_qpainter_x11_backend.h similarity index 100% rename from src/plugins/platforms/x11/windowed/scene_qpainter_x11_backend.h rename to src/backends/x11/windowed/scene_qpainter_x11_backend.h diff --git a/src/plugins/platforms/x11/windowed/x11.json b/src/backends/x11/windowed/x11.json similarity index 100% rename from src/plugins/platforms/x11/windowed/x11.json rename to src/backends/x11/windowed/x11.json diff --git a/src/plugins/platforms/x11/windowed/x11windowed_backend.cpp b/src/backends/x11/windowed/x11windowed_backend.cpp similarity index 100% rename from src/plugins/platforms/x11/windowed/x11windowed_backend.cpp rename to src/backends/x11/windowed/x11windowed_backend.cpp diff --git a/src/plugins/platforms/x11/windowed/x11windowed_backend.h b/src/backends/x11/windowed/x11windowed_backend.h similarity index 100% rename from src/plugins/platforms/x11/windowed/x11windowed_backend.h rename to src/backends/x11/windowed/x11windowed_backend.h diff --git a/src/plugins/platforms/x11/windowed/x11windowed_output.cpp b/src/backends/x11/windowed/x11windowed_output.cpp similarity index 100% rename from src/plugins/platforms/x11/windowed/x11windowed_output.cpp rename to src/backends/x11/windowed/x11windowed_output.cpp diff --git a/src/plugins/platforms/x11/windowed/x11windowed_output.h b/src/backends/x11/windowed/x11windowed_output.h similarity index 100% rename from src/plugins/platforms/x11/windowed/x11windowed_output.h rename to src/backends/x11/windowed/x11windowed_output.h diff --git a/src/kcmkwin/kwinrules/CMakeLists.txt b/src/kcmkwin/kwinrules/CMakeLists.txt index 48f16dc611..652cfda3f9 100644 --- a/src/kcmkwin/kwinrules/CMakeLists.txt +++ b/src/kcmkwin/kwinrules/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories(../../) set(kwinrules_SRCS ../../rulebooksettings.cpp ../../cursor.cpp - ../../plugins/platforms/x11/standalone/x11cursor.cpp + ../../backends/x11/standalone/x11cursor.cpp ../../rules.cpp ../../placement.cpp ../../utils.cpp diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 9b26adaac7..fc258c1389 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,7 +1,6 @@ add_subdirectory(kglobalaccel) add_subdirectory(qpa) add_subdirectory(idletime) -add_subdirectory(platforms) add_subdirectory(scenes) add_subdirectory(windowsystem) add_subdirectory(kpackage) diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt deleted file mode 100644 index 083bac7c39..0000000000 --- a/src/plugins/platforms/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_subdirectory(drm) -if (HAVE_LINUX_FB_H) - add_subdirectory(fbdev) -endif() -add_subdirectory(virtual) -add_subdirectory(wayland) -add_subdirectory(x11)