Commit ff0e89b0 authored by Xaver Hugl's avatar Xaver Hugl
Browse files

backends/x11/standalone: rename files to be more consistent

parent d251d334
......@@ -194,7 +194,7 @@ set(testOpenGLContextAttributeBuilder_SRCS
)
if (HAVE_EPOXY_GLX)
set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/backends/x11/standalone/glx_context_attribute_builder.cpp)
set(testOpenGLContextAttributeBuilder_SRCS ${testOpenGLContextAttributeBuilder_SRCS} ../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.cpp)
endif()
add_executable(testOpenGLContextAttributeBuilder ${testOpenGLContextAttributeBuilder_SRCS})
target_link_libraries(testOpenGLContextAttributeBuilder Qt::Test)
......
......@@ -13,7 +13,7 @@
#include <kwinconfig.h>
#if HAVE_EPOXY_GLX
#include "../src/backends/x11/standalone/glx_context_attribute_builder.h"
#include "../src/backends/x11/standalone/x11_standalone_glx_context_attribute_builder.h"
#include <epoxy/glx.h>
#ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV
......
set(X11PLATFORM_SOURCES
edge.cpp
effects_mouse_interception_x11_filter.cpp
effects_x11.cpp
eglbackend.cpp
logging.cpp
non_composited_outline.cpp
overlaywindow_x11.cpp
screenedges_filter.cpp
windowselector.cpp
x11_output.cpp
x11_platform.cpp
x11cursor.cpp
x11placeholderoutput.cpp
xfixes_cursor_event_filter.cpp
x11_standalone_cursor.cpp
x11_standalone_edge.cpp
x11_standalone_effects.cpp
x11_standalone_effects_mouse_interception_filter.cpp
x11_standalone_egl_backend.cpp
x11_standalone_logging.cpp
x11_standalone_non_composited_outline.cpp
x11_standalone_output.cpp
x11_standalone_overlaywindow.cpp
x11_standalone_placeholderoutput.cpp
x11_standalone_platform.cpp
x11_standalone_screenedges_filter.cpp
x11_standalone_windowselector.cpp
x11_standalone_xfixes_cursor_event_filter.cpp
)
add_library(KWinX11Platform OBJECT ${X11PLATFORM_SOURCES})
......@@ -21,17 +21,17 @@ if (QT_MAJOR_VERSION EQUAL "5")
target_link_libraries(KWinX11Platform Qt::X11Extras)
endif()
if (X11_Xi_FOUND)
target_sources(KWinX11Platform PRIVATE xinputintegration.cpp)
target_sources(KWinX11Platform PRIVATE x11_standalone_xinputintegration.cpp)
target_link_libraries(KWinX11Platform X11::Xi)
endif()
if (HAVE_EPOXY_GLX)
target_sources(KWinX11Platform PRIVATE
glx_context_attribute_builder.cpp
glxbackend.cpp
glxconvenience.cpp
omlsynccontrolvsyncmonitor.cpp
sgivideosyncvsyncmonitor.cpp
x11_standalone_glx_context_attribute_builder.cpp
x11_standalone_glx_backend.cpp
x11_standalone_glxconvenience.cpp
x11_standalone_omlsynccontrolvsyncmonitor.cpp
x11_standalone_sgivideosyncvsyncmonitor.cpp
)
endif()
......
......@@ -6,12 +6,12 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "x11cursor.h"
#include "x11_standalone_cursor.h"
#include "input.h"
#include "keyboard_input.h"
#include "utils/common.h"
#include "utils/xcbutils.h"
#include "xfixes_cursor_event_filter.h"
#include "x11_standalone_xfixes_cursor_event_filter.h"
#include <QAbstractEventDispatcher>
#include <QTimer>
......
......@@ -15,7 +15,7 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "edge.h"
#include "x11_standalone_edge.h"
#include "atoms.h"
#include "cursor.h"
......
......@@ -7,13 +7,13 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "effects_x11.h"
#include "x11_standalone_effects.h"
#include "cursor.h"
#include "effects_mouse_interception_x11_filter.h"
#include "screenedge.h"
#include "screens.h"
#include "utils/common.h"
#include "workspace.h"
#include "x11_standalone_effects_mouse_interception_filter.h"
#include <QDesktopWidget>
......
......@@ -6,7 +6,7 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "effects_mouse_interception_x11_filter.h"
#include "x11_standalone_effects_mouse_interception_filter.h"
#include "effects.h"
#include "utils/common.h"
......
......@@ -5,9 +5,8 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "eglbackend.h"
#include "x11_standalone_egl_backend.h"
#include "kwinglplatform.h"
#include "logging.h"
#include "options.h"
#include "overlaywindow.h"
#include "platform.h"
......@@ -16,7 +15,8 @@
#include "screens.h"
#include "softwarevsyncmonitor.h"
#include "surfaceitem_x11.h"
#include "x11_platform.h"
#include "x11_standalone_logging.h"
#include "x11_standalone_platform.h"
#include <QOpenGLContext>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
......
......@@ -12,17 +12,15 @@
*/
// own
#include "glxbackend.h"
#include "glx_context_attribute_builder.h"
#include "glxconvenience.h"
#include "logging.h"
#include "omlsynccontrolvsyncmonitor.h"
#include "sgivideosyncvsyncmonitor.h"
#include "softwarevsyncmonitor.h"
#include "x11_platform.h"
#include "x11_standalone_glx_backend.h"
#include "../common/kwinxrenderutils.h"
#include "softwarevsyncmonitor.h"
#include "x11_standalone_glx_context_attribute_builder.h"
#include "x11_standalone_glxconvenience.h"
#include "x11_standalone_logging.h"
#include "x11_standalone_omlsynccontrolvsyncmonitor.h"
#include "x11_standalone_platform.h"
#include "x11_standalone_sgivideosyncvsyncmonitor.h"
// kwin
#include "composite.h"
#include "options.h"
......
......@@ -6,7 +6,7 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "glx_context_attribute_builder.h"
#include "x11_standalone_glx_context_attribute_builder.h"
#include <epoxy/glx.h>
#ifndef GLX_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV
......
......@@ -6,7 +6,7 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "glxconvenience.h"
#include "x11_standalone_glxconvenience.h"
#include <algorithm>
#include <deque>
......
......@@ -6,5 +6,5 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "logging.h"
#include "x11_standalone_logging.h"
Q_LOGGING_CATEGORY(KWIN_X11STANDALONE, "kwin_platform_x11_standalone", QtWarningMsg)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment