From 0625d11639324b2d788a41d080646e435e3c4653 Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Thu, 8 Feb 2024 21:42:56 +0100 Subject: [PATCH 01/15] build: create kwin-binaries only as tests We don't install them, but still build them as this ensures the full feature set can be built. --- CMakeLists.txt | 48 ------------------- tests/CMakeLists.txt | 1 + tests/plasma/CMakeLists.txt | 27 +++++++++++ main.h => tests/plasma/main.h | 0 .../plasma/main_wayland.cpp | 0 main_x11.cpp => tests/plasma/main_x11.cpp | 0 6 files changed, 28 insertions(+), 48 deletions(-) create mode 100644 tests/plasma/CMakeLists.txt rename main.h => tests/plasma/main.h (100%) rename main_wayland.cpp => tests/plasma/main_wayland.cpp (100%) rename main_x11.cpp => tests/plasma/main_x11.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b6d9d61b0..b756d82807 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,49 +331,6 @@ if (KWIN_BUILD_KCMS) add_subdirectory(kcms) endif() -add_executable(kwin_x11 ${kwin_X11_SRCS} main_x11.cpp) -target_link_libraries(kwin_x11 - desktop-kde - kwinft::script - kwinft::x11 - KF6::Crash -) - -install(TARGETS kwin_x11) - -kcoreaddons_target_static_plugins(kwin_x11 NAMESPACE "kwin/effects/plugins") - -add_executable(kwin_wayland main_wayland.cpp) -target_link_libraries(kwin_wayland - desktop-kde - kwinft::script - kwinft::wayland - kwinft::xwayland - KF6IdleTimeKWinPlugin - KF6WindowSystemKWinPlugin - KWinQpaPlugin - KF6::DBusAddons -) - -install(TARGETS kwin_wayland) -if (HAVE_LIBCAP) - install( - CODE "execute_process( - COMMAND - ${SETCAP_EXECUTABLE} - CAP_SYS_NICE=+ep - \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)" - ) -endif() - -kcoreaddons_target_static_plugins(kwin_wayland NAMESPACE "kwin/effects/plugins") - -# Required for Plasma Wayland session. It expects a binary with this name to launch on startup. -add_custom_target(kwin_wayland_wrapper ALL COMMAND - ${CMAKE_COMMAND} -E create_symlink - kwin_wayland ${CMAKE_CURRENT_BINARY_DIR}/bin/kwin_wayland_wrapper -) - ########### install files ############### if (BUILD_TESTING) @@ -386,8 +343,3 @@ if (KF6DocTools_FOUND) endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) - -install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/kwin_wayland_wrapper - DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} -) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e9708e6d88..48789144a7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,6 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later add_subdirectory(minico) +add_subdirectory(plasma) set(normalhintsbasesizetest_SRCS normalhintsbasesizetest.cpp) add_executable(normalhintsbasesizetest ${normalhintsbasesizetest_SRCS}) diff --git a/tests/plasma/CMakeLists.txt b/tests/plasma/CMakeLists.txt new file mode 100644 index 0000000000..503073853b --- /dev/null +++ b/tests/plasma/CMakeLists.txt @@ -0,0 +1,27 @@ +# SPDX-FileCopyrightText: 2024 Roman Gilg +# +# SPDX-License-Identifier: GPL-2.0-or-later + +add_executable(kwin_x11 ${kwin_X11_SRCS} main_x11.cpp) +target_link_libraries(kwin_x11 + desktop-kde + kwinft::script + kwinft::x11 + KF6::Crash +) + +kcoreaddons_target_static_plugins(kwin_x11 NAMESPACE "kwin/effects/plugins") + +add_executable(kwin_wayland main_wayland.cpp) +target_link_libraries(kwin_wayland + desktop-kde + kwinft::script + kwinft::wayland + kwinft::xwayland + KF6IdleTimeKWinPlugin + KF6WindowSystemKWinPlugin + KWinQpaPlugin + KF6::DBusAddons +) + +kcoreaddons_target_static_plugins(kwin_wayland NAMESPACE "kwin/effects/plugins") diff --git a/main.h b/tests/plasma/main.h similarity index 100% rename from main.h rename to tests/plasma/main.h diff --git a/main_wayland.cpp b/tests/plasma/main_wayland.cpp similarity index 100% rename from main_wayland.cpp rename to tests/plasma/main_wayland.cpp diff --git a/main_x11.cpp b/tests/plasma/main_x11.cpp similarity index 100% rename from main_x11.cpp rename to tests/plasma/main_x11.cpp From a740f63929ac252dde2a765a1ccb14073c7153f9 Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Thu, 8 Feb 2024 22:05:24 +0100 Subject: [PATCH 02/15] build: rename project The project will evolve to be a library called "The Compositor Modules", abbreviated to "como". We change the project name in the CMake build files, library names and config as well as export definitions. --- CMakeLists.txt | 39 +++--- autotests/integration/CMakeLists.txt | 18 +-- autotests/integration/effects/fade.cpp | 2 +- .../effects/maximize_animation.cpp | 2 +- .../effects/minimize_animation.cpp | 2 +- .../effects/popup_open_close_animation.cpp | 2 +- .../integration/effects/scripted_effects.cpp | 2 +- .../integration/effects/slidingpopups.cpp | 2 +- .../effects/subspace_switching_animation.cpp | 2 +- .../integration/effects/translucency.cpp | 2 +- .../effects/window_open_close_animation.cpp | 2 +- autotests/integration/global_shortcuts.cpp | 10 +- autotests/integration/lib/client.h | 4 +- autotests/integration/lib/helpers.cpp | 2 +- autotests/integration/lib/helpers.h | 123 +++++++++--------- autotests/integration/lockscreen.cpp | 2 +- .../no_crash_reinitialize_compositor.cpp | 2 +- autotests/integration/no_global_shortcuts.cpp | 2 +- .../opengl_context_attribute_builder.cpp | 2 +- kcms/CMakeLists.txt | 2 +- kcms/common/CMakeLists.txt | 4 +- kcms/common/effectsmodel.h | 4 +- kcms/common/generic_scripted_config.cpp | 4 +- kcms/compositing/CMakeLists.txt | 2 +- kcms/decoration/kcm.cpp | 2 +- kcms/decoration/kwindecorationsettings.kcfg | 2 +- kcms/options/CMakeLists.txt | 2 +- kcms/screenedges/CMakeLists.txt | 2 +- kcms/scripts/module.cpp | 2 +- kcms/tabbox/CMakeLists.txt | 2 +- lib/CMakeLists.txt | 18 +-- lib/base/CMakeLists.txt | 10 +- lib/base/app_singleton.h | 4 +- lib/base/backend/wlroots/drm_lease.h | 4 +- lib/base/backend/x11/wm_selection_owner.h | 4 +- ...onfig-kwin.h.cmake => config-como.h.cmake} | 11 +- lib/base/logging.h | 4 +- lib/base/options.h | 6 +- lib/base/os/clock/skew_notifier.h | 4 +- lib/base/output.h | 4 +- lib/base/platform_qobject.h | 3 +- lib/base/seat/backend/logind/session.cpp | 2 +- lib/base/seat/backend/logind/session.h | 3 +- lib/base/seat/backend/wlroots/session.cpp | 2 +- lib/base/seat/backend/wlroots/session.h | 3 +- lib/base/seat/session.h | 4 +- lib/base/singleton_interface.h | 4 +- lib/base/wayland/app_singleton.h | 2 +- lib/base/wayland/filtered_display.h | 4 +- lib/base/wayland/server.h | 4 +- lib/base/x11/event_filter.h | 4 +- lib/base/x11/event_filter_container.h | 4 +- lib/base/x11/event_filter_manager.h | 4 +- lib/base/x11/grabs.h | 6 +- lib/base/x11/selection_owner.h | 4 +- lib/base/x11/xcb/extensions.h | 4 +- lib/debug/CMakeLists.txt | 6 +- lib/debug/console/console.h | 8 +- .../console/wayland/input_device_model.h | 3 +- lib/debug/console/wayland/wayland_console.h | 7 +- lib/debug/console/wayland/xwl_console.h | 3 +- lib/debug/perf/ftrace.cpp | 2 +- lib/debug/perf/ftrace.h | 10 +- lib/debug/support_info.h | 16 +-- lib/desktop/CMakeLists.txt | 8 +- lib/desktop/kde/dbus/kwin.h | 4 +- lib/desktop/screen_locker_watcher.h | 4 +- lib/input/CMakeLists.txt | 6 +- .../wlroots/control/headless/keyboard.h | 3 +- lib/input/backend/wlroots/control/keyboard.h | 3 +- lib/input/backend/wlroots/control/pointer.h | 3 +- lib/input/backend/wlroots/control/switch.h | 3 +- lib/input/backend/wlroots/control/touch.h | 3 +- lib/input/backend/wlroots/keyboard.h | 2 +- lib/input/backend/wlroots/pointer.h | 2 +- lib/input/backend/wlroots/switch.h | 2 +- lib/input/backend/wlroots/touch.h | 2 +- lib/input/control/device.cpp | 2 +- lib/input/control/device.h | 4 +- lib/input/control/keyboard.h | 2 +- lib/input/control/pointer.h | 2 +- lib/input/control/switch.h | 2 +- lib/input/control/touch.h | 2 +- lib/input/cursor.h | 4 +- lib/input/dbus/device.h | 4 +- lib/input/dbus/device_manager.h | 4 +- lib/input/dbus/keyboard_layout.h | 4 +- lib/input/dbus/keyboard_layouts_v2.h | 12 +- lib/input/dbus/tablet_mode_manager.h | 4 +- lib/input/device_redirect.h | 2 - lib/input/keyboard.h | 4 +- lib/input/keyboard_redirect.h | 4 +- lib/input/logging.h | 4 +- lib/input/platform_qobject.h | 4 +- lib/input/pointer.h | 4 +- lib/input/qt_event.h | 2 - lib/input/redirect_qobject.h | 4 +- lib/input/singleton_interface.h | 4 +- lib/input/spies/keyboard_repeat.h | 3 +- lib/input/spies/modifier_only_shortcuts.h | 4 +- lib/input/switch.h | 4 +- lib/input/touch.h | 4 +- lib/input/wayland/cursor_image.h | 4 +- lib/input/wayland/global_shortcuts_manager.h | 4 +- lib/input/wayland/redirect.h | 4 +- lib/input/wayland/xcursor_theme.h | 6 +- lib/input/x11/cursor.h | 3 +- lib/input/x11/global_shortcuts_manager.h | 4 +- lib/input/x11/platform.h | 2 +- lib/input/x11/xfixes_cursor_event_filter.h | 3 +- lib/input/xkb/keyboard.h | 5 +- lib/input/xkb/keymap.h | 4 +- lib/input/xkb/layout_manager.h | 4 +- lib/input/xkb/layout_policies.h | 3 +- lib/render/CMakeLists.txt | 12 +- lib/render/backend/wlroots/egl_backend.h | 2 +- lib/render/backend/wlroots/qpainter_backend.h | 2 +- lib/render/backend/wlroots/wlr_helpers.h | 2 +- lib/render/backend/wlroots/wlr_includes.h | 2 +- .../x11/glx_context_attribute_builder.h | 3 +- .../backend/x11/non_composited_outline.h | 4 +- lib/render/compositor_qobject.h | 4 +- lib/render/cursor.h | 4 +- lib/render/dbus/compositing.h | 4 +- lib/render/effect/basic_effect_loader.h | 4 +- lib/render/effect/frame.cpp | 4 +- lib/render/effect/frame.h | 4 +- lib/render/effect/interface/anidata_p.h | 3 +- .../effect/interface/animation_effect.h | 6 +- lib/render/effect/interface/effect.h | 4 +- lib/render/effect/interface/effect_frame.h | 4 +- .../effect/interface/effect_plugin_factory.h | 8 +- lib/render/effect/interface/effect_screen.h | 4 +- .../effect/interface/effect_togglable_state.h | 8 +- lib/render/effect/interface/effect_window.h | 4 +- lib/render/effect/interface/effects_handler.h | 6 +- .../effect/interface/offscreen_effect.h | 4 +- .../effect/interface/offscreen_quick_view.h | 6 +- lib/render/effect/interface/paint_clipper.h | 6 +- lib/render/effect/interface/quick_scene.h | 6 +- lib/render/effect/interface/time_line.h | 4 +- lib/render/effect/interface/window_quad.h | 6 +- lib/render/effect/setup_handler.h | 6 +- lib/render/effect_loader.h | 6 +- lib/render/effects.h | 16 +-- lib/render/gl/context_attribute_builder.h | 4 +- lib/render/gl/egl_context_attribute_builder.h | 6 +- lib/render/gl/interface/framebuffer.h | 4 +- lib/render/gl/interface/platform.h | 4 +- lib/render/gl/interface/shader.h | 4 +- lib/render/gl/interface/shader_manager.h | 6 +- lib/render/gl/interface/texture.h | 4 +- lib/render/gl/interface/texture_p.h | 4 +- lib/render/gl/interface/utils.h | 16 +-- lib/render/gl/interface/utils_funcs.h | 10 +- lib/render/gl/interface/vertex_buffer.h | 4 +- lib/render/options.h | 6 +- lib/render/outline.cpp | 4 +- lib/render/outline.h | 8 +- .../post/color_correct_dbus_interface.h | 4 +- .../post/kconfig/color_correct_settings.kcfgc | 4 +- lib/render/post/night_color_setup.h | 4 +- lib/render/post/suncalc.h | 4 +- lib/render/singleton_interface.h | 4 +- lib/render/x11/compositor_selection_owner.h | 4 +- lib/render/xrender/utils.h | 40 +++--- lib/script/CMakeLists.txt | 8 +- lib/script/dbus_call.h | 4 +- lib/script/desktop_background_item.h | 2 +- lib/script/effect.cpp | 9 +- lib/script/effect.h | 6 +- lib/script/gesture_handler.h | 6 +- lib/script/options.h | 4 +- lib/script/output.h | 4 +- lib/script/platform.cpp | 2 +- lib/script/platform.h | 4 +- lib/script/quick_scene_effect.h | 4 +- lib/script/screen_edge_handler.cpp | 2 +- lib/script/screen_edge_handler.h | 4 +- lib/script/script.h | 6 +- lib/script/scripting_logging.h | 4 +- lib/script/shortcut_handler.h | 4 +- lib/script/singleton_interface.h | 4 +- lib/script/space.h | 10 +- lib/script/virtual_desktop_model.h | 4 +- lib/script/window.h | 4 +- lib/script/window_model.h | 6 +- lib/script/window_thumbnail_item.h | 4 +- lib/utils/CMakeLists.txt | 6 +- lib/win/CMakeLists.txt | 16 +-- lib/win/control.h | 2 +- lib/win/cursor_shape.h | 4 +- lib/win/dbus/appmenu.h | 4 +- lib/win/dbus/virtual_desktop_manager.h | 4 +- lib/win/dbus/virtual_desktop_types.h | 10 +- lib/win/deco/bridge.h | 2 +- lib/win/deco/bridge_qobject.h | 4 +- lib/win/deco/decorations_logging.h | 4 +- lib/win/deco/palette.h | 4 +- lib/win/deco/renderer.h | 4 +- lib/win/focus_chain.h | 2 +- lib/win/input/gestures.h | 10 +- lib/win/input/global_shortcut.h | 4 +- lib/win/options.cpp | 4 +- lib/win/options.h | 6 +- lib/win/osd_notification.h | 9 +- lib/win/property_window.h | 4 +- lib/win/rules/book.cpp | 2 +- lib/win/rules/book.h | 4 +- lib/win/rules/book_edit.h | 2 +- lib/win/rules/book_settings.h | 4 +- lib/win/rules/ruling.h | 4 +- lib/win/rules/window.h | 4 +- lib/win/screen_edges.h | 6 +- lib/win/shortcut_dialog.h | 4 +- lib/win/shortcut_set.h | 4 +- lib/win/shortcuts_init.h | 8 +- lib/win/singleton_interface.h | 4 +- lib/win/space_qobject.h | 4 +- lib/win/space_setup.h | 4 +- lib/win/stacking_order.h | 4 +- lib/win/subspace.h | 4 +- lib/win/subspace_grid.h | 4 +- lib/win/subspace_manager_qobject.h | 4 +- lib/win/tabbox.h | 4 +- lib/win/tabbox/tabbox.h | 8 +- lib/win/tabbox/tabbox_client_model.h | 2 +- lib/win/tabbox/tabbox_config.h | 4 +- lib/win/tabbox/tabbox_handler.h | 6 +- lib/win/tabbox/tabbox_logging.h | 4 +- lib/win/user_actions_menu.h | 4 +- lib/win/wayland/window_release.h | 6 +- lib/win/window_qobject.h | 4 +- lib/win/x11/client.h | 4 +- lib/win/x11/client_machine.h | 4 +- lib/win/x11/extras.h | 2 +- lib/win/x11/helpers/killer.cpp | 6 +- lib/win/x11/key_server.h | 42 +++--- lib/win/x11/net/info_p.h | 6 +- lib/win/x11/net/net.h | 6 +- lib/win/x11/net/root_info.h | 4 +- lib/win/x11/net/win_info.h | 4 +- lib/win/x11/session_manager.h | 4 +- lib/win/x11/window_release.h | 4 +- lib/xwl/CMakeLists.txt | 8 +- lib/xwl/drag.h | 4 +- lib/xwl/selection_data.h | 2 +- lib/xwl/socket.h | 4 +- lib/xwl/sources.h | 4 +- lib/xwl/sources_ext.h | 6 +- lib/xwl/transfer.h | 8 +- lib/xwl/wl_visit.h | 2 +- lib/xwl/x11_visit.h | 2 +- lib/xwl/xauthority.h | 4 +- plugins/CMakeLists.txt | 2 +- plugins/effects/CMakeLists.txt | 2 +- plugins/effects/blur/blur_config.cpp | 2 +- plugins/effects/cube/cube_config.cpp | 2 +- .../effects/cubeslide/cubeslide_config.cpp | 2 +- .../diminactive/diminactive_config.cpp | 2 +- plugins/effects/glide/glide_config.cpp | 2 +- .../lookingglass/lookingglass_config.cpp | 2 +- .../effects/magiclamp/magiclamp_config.cpp | 2 +- .../effects/magnifier/magnifier_config.cpp | 2 +- .../effects/mouseclick/mouseclick_config.cpp | 2 +- .../effects/mousemark/mousemark_config.cpp | 2 +- .../overview/kcm/overvieweffectkcm.cpp | 2 +- plugins/effects/resize/resize_config.cpp | 2 +- plugins/effects/slide/slide_config.cpp | 2 +- .../thumbnailaside/thumbnailaside_config.cpp | 2 +- plugins/effects/trackmouse/trackmouse.cpp | 2 +- .../effects/trackmouse/trackmouse_config.cpp | 2 +- .../windowview/kcm/windowvieweffectkcm.cpp | 2 +- .../wobblywindows/wobblywindows_config.cpp | 2 +- plugins/effects/zoom/zoom.h | 2 +- plugins/effects/zoom/zoom_config.cpp | 2 +- plugins/idletime/CMakeLists.txt | 6 +- .../kdecorations/aurorae/src/CMakeLists.txt | 2 +- plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- .../aurorae/themes/plastik/CMakeLists.txt | 2 +- plugins/qpa/CMakeLists.txt | 6 +- plugins/windowsystem/CMakeLists.txt | 6 +- tests/CMakeLists.txt | 2 +- tests/minico/CMakeLists.txt | 8 +- tests/plasma/CMakeLists.txt | 16 +-- tests/plasma/main.h | 21 +-- tests/plasma/main_wayland.cpp | 2 +- tests/plasma/main_x11.cpp | 2 +- 288 files changed, 749 insertions(+), 741 deletions(-) rename lib/base/{config-kwin.h.cmake => config-como.h.cmake} (68%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b756d82807..402f434a41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.23 FATAL_ERROR) -project(KWinFT VERSION 5.27.80) +project("The Compositor Modules" VERSION 5.27.80) set(QT_MIN_VERSION "6.4.0") set(KF6_MIN_VERSION "5.240.0") @@ -126,7 +126,7 @@ find_package(KDecoration2 ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION find_package(KScreenLocker CONFIG REQUIRED) set_package_properties(KScreenLocker PROPERTIES TYPE REQUIRED - PURPOSE "For screenlocker integration in kwin_wayland" + PURPOSE "For screenlocker integration in the Wayland session" ) find_package(Breeze 5.9.0 CONFIG) @@ -148,7 +148,7 @@ add_feature_info("Breeze-Decoration" HAVE_BREEZE_DECO "Default decoration plugin find_package(EGL) set_package_properties(EGL PROPERTIES TYPE RUNTIME - PURPOSE "Required to build KWin with EGL support" + PURPOSE "Required to build with EGL support" ) find_package(epoxy 1.3) @@ -170,13 +170,13 @@ endif() find_package(Wayland 1.2 REQUIRED COMPONENTS Cursor Server OPTIONAL_COMPONENTS Egl) set_package_properties(Wayland PROPERTIES TYPE REQUIRED - PURPOSE "Required for building KWin with Wayland support" + PURPOSE "Required for building with Wayland support" ) find_package(XKB 0.7.0) set_package_properties(XKB PROPERTIES TYPE REQUIRED - PURPOSE "Required for building KWin with Wayland support" + PURPOSE "Required for building with Wayland support" ) # TODO(romangg): Only required for X11 session. @@ -186,7 +186,7 @@ add_feature_info(XKBX11 XKBX11_FOUND "Required for handling keyboard events in X find_package(Threads) set_package_properties(Threads PROPERTIES TYPE REQUIRED - PURPOSE "Required for building KWin with Wayland support" + PURPOSE "Required for building with Wayland support" ) find_package(Libinput 1.9) @@ -241,12 +241,12 @@ set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine" URL "https://www.freetype.org" TYPE REQUIRED - PURPOSE "Needed for KWin's QPA plugin." + PURPOSE "Needed for own QPA plugin." ) find_package(Fontconfig REQUIRED) set_package_properties(Fontconfig PROPERTIES TYPE REQUIRED - PURPOSE "Needed for KWin's QPA plugin." + PURPOSE "Needed for own QPA plugin." ) find_package(Wrapland REQUIRED) @@ -260,13 +260,13 @@ set_package_properties(Xwayland PROPERTIES URL "https://x.org" DESCRIPTION "Xwayland X server" TYPE RUNTIME - PURPOSE "Needed for running kwin_wayland" + PURPOSE "Needed for running Wayland" ) find_package(Libcap) set_package_properties(Libcap PROPERTIES TYPE OPTIONAL - PURPOSE "Needed for running kwin_wayland with real-time scheduling policy" + PURPOSE "Needed for running Wayland session with real-time scheduling policy" ) set(HAVE_LIBCAP ${Libcap_FOUND}) @@ -290,16 +290,13 @@ ecm_find_qmlmodule(org.kde.plasma.core 2.0) ecm_find_qmlmodule(org.kde.plasma.components 2.0) ########### configure tests ############### -option(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON) -option(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON) -option(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON) -option(KWIN_BUILD_PERF "Build internal tools for performance analysis at runtime." ON) +option(COMO_BUILD_DECORATIONS "Enable building of decorations." ON) +option(COMO_BUILD_KCMS "Enable building of configuration modules." ON) +option(COMO_BUILD_TABBOX "Enable building of Tabbox functionality" ON) +option(COMO_BUILD_PERF "Build internal tools for performance analysis at runtime." ON) -# Binary name of KWin -set(KWIN_NAME "kwin") -set(KWIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - -set(HAVE_PERF ${KWIN_BUILD_PERF}) +set(COMO_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(HAVE_PERF ${COMO_BUILD_PERF}) include_directories(${XKB_INCLUDE_DIR}) @@ -312,7 +309,7 @@ include(CheckSymbolExists) check_symbol_exists(SCHED_RESET_ON_FORK "sched.h" HAVE_SCHED_RESET_ON_FORK) add_feature_info("SCHED_RESET_ON_FORK" HAVE_SCHED_RESET_ON_FORK - "Required for running kwin_wayland with real-time scheduling") + "Required for running Wayland session with real-time scheduling") ########### global ############### include_directories(BEFORE @@ -327,7 +324,7 @@ add_subdirectory(kconf_update) add_subdirectory(lib) add_subdirectory(plugins) -if (KWIN_BUILD_KCMS) +if (COMO_BUILD_KCMS) add_subdirectory(kcms) endif() diff --git a/autotests/integration/CMakeLists.txt b/autotests/integration/CMakeLists.txt index 478b7115b1..86d24a6d54 100644 --- a/autotests/integration/CMakeLists.txt +++ b/autotests/integration/CMakeLists.txt @@ -114,8 +114,8 @@ target_compile_definitions(tests PRIVATE USE_XWL=1) target_link_libraries(tests PRIVATE desktop-kde - kwinft::wayland - kwinft::xwayland + como::wayland + como::xwayland script Qt::Test Catch2::Catch2WithMain @@ -123,9 +123,9 @@ PRIVATE KF6::WindowSystem WraplandClient # Static plugins - KWinQpaPlugin - KF6WindowSystemKWinPlugin - KF6IdleTimeKWinPlugin + ComoQpaPlugin + KF6WindowSystemComoPlugin + KF6IdleTimeComoPlugin ) add_executable(tests-wl @@ -196,7 +196,7 @@ target_compile_definitions(tests-wl PRIVATE USE_XWL=0) target_link_libraries(tests-wl PRIVATE desktop-kde - kwinft::wayland + como::wayland script Qt::Test Catch2::Catch2WithMain @@ -204,9 +204,9 @@ PRIVATE KF6::WindowSystem WraplandClient # Static plugins - KWinQpaPlugin - KF6WindowSystemKWinPlugin - KF6IdleTimeKWinPlugin + ComoQpaPlugin + KF6WindowSystemComoPlugin + KF6IdleTimeComoPlugin ) include(Catch) diff --git a/autotests/integration/effects/fade.cpp b/autotests/integration/effects/fade.cpp index 0647c8eaf7..04d4b117b2 100644 --- a/autotests/integration/effects/fade.cpp +++ b/autotests/integration/effects/fade.cpp @@ -17,7 +17,7 @@ namespace KWin::detail::test TEST_CASE("fade", "[effect]") { - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", "1"); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); qRegisterMetaType(); diff --git a/autotests/integration/effects/maximize_animation.cpp b/autotests/integration/effects/maximize_animation.cpp index 5c465ee6a8..19c2c93c4c 100644 --- a/autotests/integration/effects/maximize_animation.cpp +++ b/autotests/integration/effects/maximize_animation.cpp @@ -15,7 +15,7 @@ namespace KWin::detail::test TEST_CASE("maximize animation", "[effect]") { - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); #if USE_XWL diff --git a/autotests/integration/effects/minimize_animation.cpp b/autotests/integration/effects/minimize_animation.cpp index 63b16d8675..34700600c6 100644 --- a/autotests/integration/effects/minimize_animation.cpp +++ b/autotests/integration/effects/minimize_animation.cpp @@ -18,7 +18,7 @@ namespace KWin::detail::test TEST_CASE("minimize animation", "[effect]") { qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); #if USE_XWL diff --git a/autotests/integration/effects/popup_open_close_animation.cpp b/autotests/integration/effects/popup_open_close_animation.cpp index 34f4711f89..3cadfd2811 100644 --- a/autotests/integration/effects/popup_open_close_animation.cpp +++ b/autotests/integration/effects/popup_open_close_animation.cpp @@ -17,7 +17,7 @@ namespace KWin::detail::test TEST_CASE("popup open close animation", "[effect]") { - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); #if USE_XWL diff --git a/autotests/integration/effects/scripted_effects.cpp b/autotests/integration/effects/scripted_effects.cpp index 55c30c65eb..63f27bc876 100644 --- a/autotests/integration/effects/scripted_effects.cpp +++ b/autotests/integration/effects/scripted_effects.cpp @@ -98,7 +98,7 @@ TEST_CASE("scripted effects", "[effect]") { qRegisterMetaType(); qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", "1"); #if USE_XWL auto operation_mode = GENERATE(base::operation_mode::wayland, base::operation_mode::xwayland); diff --git a/autotests/integration/effects/slidingpopups.cpp b/autotests/integration/effects/slidingpopups.cpp index 62bb15e4f5..113efd9ddf 100644 --- a/autotests/integration/effects/slidingpopups.cpp +++ b/autotests/integration/effects/slidingpopups.cpp @@ -20,7 +20,7 @@ namespace KWin::detail::test TEST_CASE("slidingpopups", "[effect]") { qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", "1"); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); qRegisterMetaType(); diff --git a/autotests/integration/effects/subspace_switching_animation.cpp b/autotests/integration/effects/subspace_switching_animation.cpp index 4b0d3ae16a..38aa35aa0e 100644 --- a/autotests/integration/effects/subspace_switching_animation.cpp +++ b/autotests/integration/effects/subspace_switching_animation.cpp @@ -22,7 +22,7 @@ TEST_CASE("subspace switching animation", "[effect]") auto effectName = GENERATE(QString("cubeslide"), QString("fadedesktop"), QString("slide")); qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); test::setup setup("subspace-switching-animation"); diff --git a/autotests/integration/effects/translucency.cpp b/autotests/integration/effects/translucency.cpp index c6603d4156..a1a80741bb 100644 --- a/autotests/integration/effects/translucency.cpp +++ b/autotests/integration/effects/translucency.cpp @@ -14,7 +14,7 @@ namespace KWin::detail::test TEST_CASE("translucency", "[effect]") { - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", "1"); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", "1"); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); qRegisterMetaType(); diff --git a/autotests/integration/effects/window_open_close_animation.cpp b/autotests/integration/effects/window_open_close_animation.cpp index 5a4c57dfb3..82e23d11b2 100644 --- a/autotests/integration/effects/window_open_close_animation.cpp +++ b/autotests/integration/effects/window_open_close_animation.cpp @@ -16,7 +16,7 @@ namespace KWin::detail::test TEST_CASE("window open close animation", "[effect]") { qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); #if USE_XWL diff --git a/autotests/integration/global_shortcuts.cpp b/autotests/integration/global_shortcuts.cpp index 60a092aa53..6704d4b73c 100644 --- a/autotests/integration/global_shortcuts.cpp +++ b/autotests/integration/global_shortcuts.cpp @@ -77,7 +77,7 @@ TEST_CASE("global shortcuts", "[input]") QKeySequence const seq(mod_test_data.qt | key_test_data.qt); auto action = std::make_unique(); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", "kwin"); action->setObjectName("globalshortcuts-test-non-latin-layout"); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -103,7 +103,7 @@ TEST_CASE("global shortcuts", "[input]") { // Verifies that a shortcut with a consumed shift modifier triggers create the action. auto action = std::make_unique(); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", "kwin"); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -134,7 +134,7 @@ TEST_CASE("global shortcuts", "[input]") // another key should stop triggering the shortcut. auto action = std::make_unique(); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", "kwin"); action->setObjectName(QStringLiteral("globalshortcuts-test-consumed-shift")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); @@ -204,7 +204,7 @@ TEST_CASE("global shortcuts", "[input]") { // BUG 370341 auto action = std::make_unique(); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", QStringLiteral("kwin")); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QVERIFY(triggeredSpy.isValid()); @@ -234,7 +234,7 @@ TEST_CASE("global shortcuts", "[input]") { // BUG 390110 auto action = std::make_unique(); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", QStringLiteral("kwin")); action->setObjectName(QStringLiteral("globalshortcuts-accent")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); diff --git a/autotests/integration/lib/client.h b/autotests/integration/lib/client.h index fc0870e3c3..2ff9421746 100644 --- a/autotests/integration/lib/client.h +++ b/autotests/integration/lib/client.h @@ -7,7 +7,7 @@ #include "types.h" -#include "kwin_export.h" +#include #include #include @@ -39,7 +39,7 @@ namespace KWin::detail::test { -class KWIN_EXPORT client +class COMO_EXPORT client { public: Wrapland::Client::ConnectionThread* connection{nullptr}; diff --git a/autotests/integration/lib/helpers.cpp b/autotests/integration/lib/helpers.cpp index 14e6b6167a..b0aab84b49 100644 --- a/autotests/integration/lib/helpers.cpp +++ b/autotests/integration/lib/helpers.cpp @@ -573,7 +573,7 @@ void keyboard_key_pressed(uint32_t key, uint32_t time, wlr_keyboard* keyboard) keyboard_key_impl(key, time, true, WL_KEYBOARD_KEY_STATE_PRESSED, keyboard); } -KWIN_EXPORT void keyboard_key_released(uint32_t key, uint32_t time, wlr_keyboard* keyboard) +void keyboard_key_released(uint32_t key, uint32_t time, wlr_keyboard* keyboard) { keyboard_key_impl(key, time, true, WL_KEYBOARD_KEY_STATE_RELEASED, keyboard); } diff --git a/autotests/integration/lib/helpers.h b/autotests/integration/lib/helpers.h index 7c8aeabde8..c389bb1755 100644 --- a/autotests/integration/lib/helpers.h +++ b/autotests/integration/lib/helpers.h @@ -10,6 +10,7 @@ #include #include "types.h" +#include #include "base/output.h" #include "win/wayland/window.h" @@ -88,7 +89,7 @@ using base_t = base::wayland::platform; using space = base_t::space_t; using wayland_window = win::wayland::window; -struct KWIN_EXPORT output { +struct COMO_EXPORT output { explicit output(QRect const& geometry); output(QRect const& geometry, double scale); @@ -97,14 +98,14 @@ struct KWIN_EXPORT output { double scale; }; -KWIN_EXPORT input::wayland::cursor* cursor(); +COMO_EXPORT input::wayland::cursor* cursor(); /** * Creates a Wayland Connection in a dedicated thread and creates various * client side objects which can be used to create windows. * @see destroy_wayland_connection */ -KWIN_EXPORT void setup_wayland_connection(global_selection globals = {}); +COMO_EXPORT void setup_wayland_connection(global_selection globals = {}); /** * Destroys the Wayland Connection created with @link{setup_wayland_connection}. @@ -112,27 +113,27 @@ KWIN_EXPORT void setup_wayland_connection(global_selection globals = {}); * leaks into the next test method. * @see setup_wayland_connection */ -KWIN_EXPORT void destroy_wayland_connection(); +COMO_EXPORT void destroy_wayland_connection(); -KWIN_EXPORT base::output* get_output(size_t index); -KWIN_EXPORT void set_current_output(int index); +COMO_EXPORT base::output* get_output(size_t index); +COMO_EXPORT void set_current_output(int index); -KWIN_EXPORT void test_outputs_default(); -KWIN_EXPORT void test_outputs_geometries(std::vector const& geometries); +COMO_EXPORT void test_outputs_default(); +COMO_EXPORT void test_outputs_geometries(std::vector const& geometries); -KWIN_EXPORT client& get_client(); -KWIN_EXPORT std::vector& get_all_clients(); +COMO_EXPORT client& get_client(); +COMO_EXPORT std::vector& get_all_clients(); -KWIN_EXPORT bool wait_for_wayland_pointer(); -KWIN_EXPORT bool wait_for_wayland_touch(); -KWIN_EXPORT bool wait_for_wayland_keyboard(); +COMO_EXPORT bool wait_for_wayland_pointer(); +COMO_EXPORT bool wait_for_wayland_touch(); +COMO_EXPORT bool wait_for_wayland_keyboard(); -KWIN_EXPORT void flush_wayland_connection(); -KWIN_EXPORT void flush_wayland_connection(client const& clt); +COMO_EXPORT void flush_wayland_connection(); +COMO_EXPORT void flush_wayland_connection(client const& clt); -KWIN_EXPORT std::unique_ptr create_surface(); -KWIN_EXPORT std::unique_ptr create_surface(client const& clt); -KWIN_EXPORT std::unique_ptr +COMO_EXPORT std::unique_ptr create_surface(); +COMO_EXPORT std::unique_ptr create_surface(client const& clt); +COMO_EXPORT std::unique_ptr create_subsurface(std::unique_ptr const& surface, std::unique_ptr const& parentSurface); @@ -142,20 +143,20 @@ enum class CreationSetup { /// commit buffers }; -KWIN_EXPORT std::unique_ptr +COMO_EXPORT std::unique_ptr create_xdg_shell_toplevel(std::unique_ptr const& surface, CreationSetup = CreationSetup::CreateAndConfigure); -KWIN_EXPORT std::unique_ptr +COMO_EXPORT std::unique_ptr create_xdg_shell_toplevel(client const& clt, std::unique_ptr const& surface, CreationSetup = CreationSetup::CreateAndConfigure); -KWIN_EXPORT std::unique_ptr +COMO_EXPORT std::unique_ptr create_xdg_shell_popup(std::unique_ptr const& surface, std::unique_ptr const& parent_toplevel, Wrapland::Client::xdg_shell_positioner_data positioner_data, CreationSetup = CreationSetup::CreateAndConfigure); -KWIN_EXPORT std::unique_ptr +COMO_EXPORT std::unique_ptr create_xdg_shell_popup(client const& clt, std::unique_ptr const& surface, std::unique_ptr const& parent_toplevel, @@ -166,10 +167,10 @@ create_xdg_shell_popup(client const& clt, * Commits the XdgShellToplevel to the given surface, and waits for the configure event from the * compositor */ -KWIN_EXPORT void +COMO_EXPORT void init_xdg_shell_toplevel(std::unique_ptr const& surface, std::unique_ptr const& shell_toplevel); -KWIN_EXPORT void +COMO_EXPORT void init_xdg_shell_popup(std::unique_ptr const& surface, std::unique_ptr const& popup); @@ -177,11 +178,11 @@ init_xdg_shell_popup(std::unique_ptr const& surface, * Creates a shared memory buffer of @p size in @p color and attaches it to the @p surface. * The @p surface gets damaged and committed, thus it's rendered. */ -KWIN_EXPORT void render(std::unique_ptr const& surface, +COMO_EXPORT void render(std::unique_ptr const& surface, const QSize& size, const QColor& color, const QImage::Format& format = QImage::Format_ARGB32_Premultiplied); -KWIN_EXPORT void render(client const& clt, +COMO_EXPORT void render(client const& clt, std::unique_ptr const& surface, const QSize& size, const QColor& color, @@ -190,9 +191,9 @@ KWIN_EXPORT void render(client const& clt, /** * Creates a shared memory buffer using the supplied image @p img and attaches it to the @p surface */ -KWIN_EXPORT void render(std::unique_ptr const& surface, +COMO_EXPORT void render(std::unique_ptr const& surface, const QImage& img); -KWIN_EXPORT void render(client const& clt, +COMO_EXPORT void render(client const& clt, std::unique_ptr const& surface, const QImage& img); @@ -200,13 +201,13 @@ KWIN_EXPORT void render(client const& clt, * Renders and then waits untill the new window is shown. Returns the created window. * If no window gets shown during @p timeout @c null is returned. */ -KWIN_EXPORT wayland_window* +COMO_EXPORT wayland_window* render_and_wait_for_shown(std::unique_ptr const& surface, QSize const& size, QColor const& color, QImage::Format const& format = QImage::Format_ARGB32_Premultiplied, int timeout = 5000); -KWIN_EXPORT wayland_window* +COMO_EXPORT wayland_window* render_and_wait_for_shown(client const& clt, std::unique_ptr const& surface, QSize const& size, @@ -290,57 +291,57 @@ auto get_internal_window(Window window) * Locks the screen and waits till the screen is locked. * @returns @c true if the screen could be locked, @c false otherwise */ -KWIN_EXPORT void lock_screen(); +COMO_EXPORT void lock_screen(); /** * Unlocks the screen and waits till the screen is unlocked. * @returns @c true if the screen could be unlocked, @c false otherwise */ -KWIN_EXPORT void unlock_screen(); +COMO_EXPORT void unlock_screen(); -KWIN_EXPORT void wlr_signal_emit_safe(wl_signal* signal, void* data); +COMO_EXPORT void wlr_signal_emit_safe(wl_signal* signal, void* data); -KWIN_EXPORT void pointer_motion_absolute(QPointF const& position, uint32_t time); +COMO_EXPORT void pointer_motion_absolute(QPointF const& position, uint32_t time); -KWIN_EXPORT void pointer_button_pressed(uint32_t button, uint32_t time); -KWIN_EXPORT void pointer_button_released(uint32_t button, uint32_t time); +COMO_EXPORT void pointer_button_pressed(uint32_t button, uint32_t time); +COMO_EXPORT void pointer_button_released(uint32_t button, uint32_t time); -KWIN_EXPORT void pointer_axis_horizontal(double delta, uint32_t time, int32_t discrete_delta); -KWIN_EXPORT void pointer_axis_vertical(double delta, uint32_t time, int32_t discrete_delta); +COMO_EXPORT void pointer_axis_horizontal(double delta, uint32_t time, int32_t discrete_delta); +COMO_EXPORT void pointer_axis_vertical(double delta, uint32_t time, int32_t discrete_delta); -KWIN_EXPORT void keyboard_key_pressed(uint32_t key, uint32_t time); -KWIN_EXPORT void keyboard_key_released(uint32_t key, uint32_t time); +COMO_EXPORT void keyboard_key_pressed(uint32_t key, uint32_t time); +COMO_EXPORT void keyboard_key_released(uint32_t key, uint32_t time); -KWIN_EXPORT void keyboard_key_pressed(uint32_t key, uint32_t time, wlr_keyboard* keyboard); -KWIN_EXPORT void keyboard_key_released(uint32_t key, uint32_t time, wlr_keyboard* keyboard); +COMO_EXPORT void keyboard_key_pressed(uint32_t key, uint32_t time, wlr_keyboard* keyboard); +COMO_EXPORT void keyboard_key_released(uint32_t key, uint32_t time, wlr_keyboard* keyboard); -KWIN_EXPORT void touch_down(int32_t id, QPointF const& position, uint32_t time); -KWIN_EXPORT void touch_up(int32_t id, uint32_t time); -KWIN_EXPORT void touch_motion(int32_t id, QPointF const& position, uint32_t time); -KWIN_EXPORT void touch_cancel(); +COMO_EXPORT void touch_down(int32_t id, QPointF const& position, uint32_t time); +COMO_EXPORT void touch_up(int32_t id, uint32_t time); +COMO_EXPORT void touch_motion(int32_t id, QPointF const& position, uint32_t time); +COMO_EXPORT void touch_cancel(); -KWIN_EXPORT void swipe_begin(uint32_t fingers, uint32_t time); -KWIN_EXPORT void swipe_update(uint32_t fingers, double dx, double dy, uint32_t time); -KWIN_EXPORT void swipe_end(uint32_t time); -KWIN_EXPORT void swipe_cancel(uint32_t time); +COMO_EXPORT void swipe_begin(uint32_t fingers, uint32_t time); +COMO_EXPORT void swipe_update(uint32_t fingers, double dx, double dy, uint32_t time); +COMO_EXPORT void swipe_end(uint32_t time); +COMO_EXPORT void swipe_cancel(uint32_t time); -KWIN_EXPORT void pinch_begin(uint32_t fingers, uint32_t time); -KWIN_EXPORT void +COMO_EXPORT void pinch_begin(uint32_t fingers, uint32_t time); +COMO_EXPORT void pinch_update(uint32_t fingers, double dx, double dy, double scale, double rotation, uint32_t time); -KWIN_EXPORT void pinch_end(uint32_t time); -KWIN_EXPORT void pinch_cancel(uint32_t time); +COMO_EXPORT void pinch_end(uint32_t time); +COMO_EXPORT void pinch_cancel(uint32_t time); -KWIN_EXPORT void hold_begin(uint32_t fingers, uint32_t time); -KWIN_EXPORT void hold_end(uint32_t time); -KWIN_EXPORT void hold_cancel(uint32_t time); +COMO_EXPORT void hold_begin(uint32_t fingers, uint32_t time); +COMO_EXPORT void hold_end(uint32_t time); +COMO_EXPORT void hold_cancel(uint32_t time); -KWIN_EXPORT void prepare_app_env(std::string const& qpa_plugin_path); -KWIN_EXPORT void prepare_sys_env(std::string const& socket_name); -KWIN_EXPORT std::string create_socket_name(std::string base); +COMO_EXPORT void prepare_app_env(std::string const& qpa_plugin_path); +COMO_EXPORT void prepare_sys_env(std::string const& socket_name); +COMO_EXPORT std::string create_socket_name(std::string base); #if USE_XWL using xcb_connection_ptr = std::unique_ptr; -KWIN_EXPORT xcb_connection_ptr xcb_connection_create(); +COMO_EXPORT xcb_connection_ptr xcb_connection_create(); #endif } diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index a529a8aa08..a05f0bf2b0 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -646,7 +646,7 @@ TEST_CASE("lockscreen", "[base]") QSignalSpy actionSpy(action.get(), &QAction::triggered); QVERIFY(actionSpy.isValid()); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", "kwin"); action->setObjectName("LockScreentestKeyboardShortcut"); KGlobalAccel::self()->setDefaultShortcut( diff --git a/autotests/integration/no_crash_reinitialize_compositor.cpp b/autotests/integration/no_crash_reinitialize_compositor.cpp index 17f59afc72..0543b542c5 100644 --- a/autotests/integration/no_crash_reinitialize_compositor.cpp +++ b/autotests/integration/no_crash_reinitialize_compositor.cpp @@ -21,7 +21,7 @@ TEST_CASE("no crash reinit compositor", "[render]") using namespace Wrapland::Client; qputenv("XDG_DATA_DIRS", QCoreApplication::applicationDirPath().toUtf8()); - qputenv("KWIN_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); + qputenv("COMO_EFFECTS_FORCE_ANIMATIONS", QByteArrayLiteral("1")); qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2")); test::setup setup("no-crash-reinit-compositor"); diff --git a/autotests/integration/no_global_shortcuts.cpp b/autotests/integration/no_global_shortcuts.cpp index a9615797a5..55f31e4c35 100644 --- a/autotests/integration/no_global_shortcuts.cpp +++ b/autotests/integration/no_global_shortcuts.cpp @@ -168,7 +168,7 @@ TEST_CASE("no global shortcuts", "[input]") SECTION("kglobalaccel") { std::unique_ptr action(new QAction(nullptr)); - action->setProperty("componentName", QStringLiteral(KWIN_NAME)); + action->setProperty("componentName", "kwin"); action->setObjectName(QStringLiteral("globalshortcuts-test-meta-shift-w")); QSignalSpy triggeredSpy(action.get(), &QAction::triggered); QVERIFY(triggeredSpy.isValid()); diff --git a/autotests/opengl_context_attribute_builder.cpp b/autotests/opengl_context_attribute_builder.cpp index 6ed51e4799..ac22c7851d 100644 --- a/autotests/opengl_context_attribute_builder.cpp +++ b/autotests/opengl_context_attribute_builder.cpp @@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "render/gl/context_attribute_builder.h" #include "render/gl/egl_context_attribute_builder.h" -#include +#include #include #include diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt index 0d10808da2..95ab9a7744 100644 --- a/kcms/CMakeLists.txt +++ b/kcms/CMakeLists.txt @@ -14,6 +14,6 @@ add_subdirectory(scripts) add_subdirectory(desktop) add_subdirectory(effects) -if (KWIN_BUILD_TABBOX) +if (COMO_BUILD_TABBOX) add_subdirectory(tabbox) endif() diff --git a/kcms/common/CMakeLists.txt b/kcms/common/CMakeLists.txt index 04c8c62ab2..0c3b9bec24 100644 --- a/kcms/common/CMakeLists.txt +++ b/kcms/common/CMakeLists.txt @@ -10,7 +10,7 @@ set(kcmkwincommon_SRC ) qt_add_dbus_interface(kcmkwincommon_SRC - ${KWIN_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface + ${COMO_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface ) add_library(kcmkwincommon SHARED ${kcmkwincommon_SRC}) @@ -35,7 +35,7 @@ install(TARGETS kcmkwincommon LIBRARY NAMELINK_SKIP) set(kcm_kwin4_genericscripted_SRCS generic_scripted_config.cpp) qt_add_dbus_interface(kcm_kwin4_genericscripted_SRCS - ${KWIN_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface + ${COMO_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface ) add_library(kcm_kwin4_genericscripted MODULE ${kcm_kwin4_genericscripted_SRCS}) target_link_libraries(kcm_kwin4_genericscripted diff --git a/kcms/common/effectsmodel.h b/kcms/common/effectsmodel.h index cc6602e030..8dd1ffe422 100644 --- a/kcms/common/effectsmodel.h +++ b/kcms/common/effectsmodel.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include +#include #include @@ -19,7 +19,7 @@ SPDX-License-Identifier: GPL-2.0-or-later namespace KWin { -class KWIN_EXPORT EffectsModel : public QAbstractItemModel +class COMO_EXPORT EffectsModel : public QAbstractItemModel { Q_OBJECT diff --git a/kcms/common/generic_scripted_config.cpp b/kcms/common/generic_scripted_config.cpp index 7e3a6a3e68..fc17f745d7 100644 --- a/kcms/common/generic_scripted_config.cpp +++ b/kcms/common/generic_scripted_config.cpp @@ -5,7 +5,7 @@ */ #include "generic_scripted_config.h" -#include +#include #include #include @@ -65,7 +65,7 @@ void generic_scripted_config::createUi() const QString packageRoot = QStandardPaths::locate( QStandardPaths::GenericDataLocation, - QLatin1String(KWIN_NAME) + QLatin1Char('/') + typeName() + QLatin1Char('/') + m_packageName, + "kwin" + QLatin1Char('/') + typeName() + QLatin1Char('/') + m_packageName, QStandardPaths::LocateDirectory); if (packageRoot.isEmpty()) { layout->addWidget(new QLabel(i18nc("Error message", "Could not locate package metadata"))); diff --git a/kcms/compositing/CMakeLists.txt b/kcms/compositing/CMakeLists.txt index 7a7a737fc0..670f083b47 100644 --- a/kcms/compositing/CMakeLists.txt +++ b/kcms/compositing/CMakeLists.txt @@ -16,7 +16,7 @@ set(kwincompositing_SRC kconfig_add_kcfg_files(kwincompositing_SRC kwincompositing_setting.kcfgc GENERATE_MOC) qt_add_dbus_interface(kwincompositing_SRC - ${KWIN_SOURCE_DIR}/lib/render/dbus/org.kde.kwin.Compositing.xml kwin_compositing_interface + ${COMO_SOURCE_DIR}/lib/render/dbus/org.kde.kwin.Compositing.xml kwin_compositing_interface ) ki18n_wrap_ui(kwincompositing_SRC compositing.ui) diff --git a/kcms/decoration/kcm.cpp b/kcms/decoration/kcm.cpp index 689302e43d..91833f5f0d 100644 --- a/kcms/decoration/kcm.cpp +++ b/kcms/decoration/kcm.cpp @@ -8,7 +8,7 @@ #include "kcm.h" #include "decorationmodel.h" #include "declarative-plugin/buttonsmodel.h" -#include +#include #include #include diff --git a/kcms/decoration/kwindecorationsettings.kcfg b/kcms/decoration/kwindecorationsettings.kcfg index d6404c55af..c215b1eead 100644 --- a/kcms/decoration/kwindecorationsettings.kcfg +++ b/kcms/decoration/kwindecorationsettings.kcfg @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-or-later xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - config-kwin.h + config-como.h diff --git a/kcms/options/CMakeLists.txt b/kcms/options/CMakeLists.txt index 9bae13fdaf..6c7b4d7355 100644 --- a/kcms/options/CMakeLists.txt +++ b/kcms/options/CMakeLists.txt @@ -32,7 +32,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_settings.kcfgc GENE kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings.kcfgc GENERATE_MOC) qt_add_dbus_interface(kcm_kwinoptions_PART_SRCS - ${KWIN_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml + ${COMO_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface ) diff --git a/kcms/screenedges/CMakeLists.txt b/kcms/screenedges/CMakeLists.txt index b6a23f025f..3d5e0bdba0 100644 --- a/kcms/screenedges/CMakeLists.txt +++ b/kcms/screenedges/CMakeLists.txt @@ -12,7 +12,7 @@ set(kcm_screenedges_SRCS kwinscreenedgeconfigform.cpp ) qt_add_dbus_interface(kcm_screenedges_SRCS - ${KWIN_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml + ${COMO_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface ) diff --git a/kcms/scripts/module.cpp b/kcms/scripts/module.cpp index 2962b4ca85..3c9612f66e 100644 --- a/kcms/scripts/module.cpp +++ b/kcms/scripts/module.cpp @@ -20,7 +20,7 @@ #include #include -#include "config-kwin.h" +#include "config-como.h" #include "kwinscriptsdata.h" Module::Module(QObject *parent, const KPluginMetaData &data) diff --git a/kcms/tabbox/CMakeLists.txt b/kcms/tabbox/CMakeLists.txt index 84b2e78341..a7282fe1f3 100644 --- a/kcms/tabbox/CMakeLists.txt +++ b/kcms/tabbox/CMakeLists.txt @@ -18,7 +18,7 @@ set(kcm_kwintabbox_PART_SRCS ki18n_wrap_ui(kcm_kwintabbox_PART_SRCS main.ui) qt_add_dbus_interface(kcm_kwintabbox_PART_SRCS - ${KWIN_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml + ${COMO_SOURCE_DIR}/lib/render/effect/interface/org.kde.kwin.Effects.xml kwin_effects_interface ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c41ac0b743..c92947e7a5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory(debug) add_subdirectory(desktop) add_library(x11 SHARED) -add_library(kwinft::x11 ALIAS x11) +add_library(como::x11 ALIAS x11) target_link_libraries(x11 PUBLIC @@ -33,7 +33,7 @@ target_sources(x11 ) add_library(wayland SHARED) -add_library(kwinft::wayland ALIAS wayland) +add_library(como::wayland ALIAS wayland) target_link_libraries(wayland PUBLIC @@ -89,22 +89,22 @@ target_sources(wayland set_target_properties(x11 wayland PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) target_compile_definitions(wayland PUBLIC WLR_USE_UNSTABLE) kcoreaddons_target_static_plugins(wayland - NAMESPACE "kwin/effects/plugins" + NAMESPACE "como/effects/plugins" ) install(TARGETS x11 wayland - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como ) -install(EXPORT kwinft-export - NAMESPACE kwinft:: - DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/kwinft +install(EXPORT como-export + NAMESPACE como:: + DESTINATION ${KDE_INSTALL_CMAKEPACKAGEDIR}/como ) diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt index 43ff3ed10a..87e59800cb 100644 --- a/lib/base/CMakeLists.txt +++ b/lib/base/CMakeLists.txt @@ -57,8 +57,8 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") ) endif() -configure_file(config-kwin.h.cmake config-kwin.h) -generate_export_header(base BASE_NAME kwin) +configure_file(config-como.h.cmake config-como.h) +generate_export_header(base BASE_NAME como) add_library(base-x11 SHARED) @@ -157,11 +157,11 @@ target_sources(base-wl set_target_properties(base base-x11 base-wl PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) install(TARGETS base base-x11 base-x11-backend base-wl - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/base + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/base ) diff --git a/lib/base/app_singleton.h b/lib/base/app_singleton.h index e55b5b29a6..579b4563d4 100644 --- a/lib/base/app_singleton.h +++ b/lib/base/app_singleton.h @@ -9,12 +9,12 @@ #include #include -#include +#include namespace KWin::base { -class KWIN_EXPORT app_singleton : public QObject +class COMO_EXPORT app_singleton : public QObject { Q_OBJECT public: diff --git a/lib/base/backend/wlroots/drm_lease.h b/lib/base/backend/wlroots/drm_lease.h index 7977a4df7d..0ab0cf944b 100644 --- a/lib/base/backend/wlroots/drm_lease.h +++ b/lib/base/backend/wlroots/drm_lease.h @@ -6,7 +6,7 @@ #pragma once #include "base/utils.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -25,7 +25,7 @@ namespace KWin::base::backend::wlroots class non_desktop_output_wrap; -class KWIN_EXPORT drm_lease : public QObject +class COMO_EXPORT drm_lease : public QObject { Q_OBJECT public: diff --git a/lib/base/backend/x11/wm_selection_owner.h b/lib/base/backend/x11/wm_selection_owner.h index e090b47fc9..dbf501c618 100644 --- a/lib/base/backend/x11/wm_selection_owner.h +++ b/lib/base/backend/x11/wm_selection_owner.h @@ -6,14 +6,14 @@ #pragma once #include -#include +#include #include namespace KWin::base::backend::x11 { -class KWIN_EXPORT wm_selection_owner : public base::x11::selection_owner +class COMO_EXPORT wm_selection_owner : public base::x11::selection_owner { public: wm_selection_owner(xcb_connection_t* con, int screen); diff --git a/lib/base/config-kwin.h.cmake b/lib/base/config-como.h.cmake similarity index 68% rename from lib/base/config-kwin.h.cmake rename to lib/base/config-como.h.cmake index 87256dfa7c..ed318ac50d 100644 --- a/lib/base/config-kwin.h.cmake +++ b/lib/base/config-como.h.cmake @@ -4,13 +4,12 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#cmakedefine01 KWIN_BUILD_DECORATIONS -#cmakedefine01 KWIN_BUILD_TABBOX -#define KWIN_NAME "${KWIN_NAME}" -#define KWIN_CONFIG "${KWIN_NAME}rc" -#define KWIN_VERSION_STRING "${CMAKE_PROJECT_VERSION}" +#cmakedefine01 COMO_BUILD_DECORATIONS +#cmakedefine01 COMO_BUILD_TABBOX +#define KWIN_CONFIG "kwinrc" +#define COMO_VERSION_STRING "${CMAKE_PROJECT_VERSION}" #define XCB_VERSION_STRING "${XCB_VERSION}" -#define KWIN_KILLER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/kwin_killer_helper" +#define COMO_KILLER_BIN "${CMAKE_INSTALL_FULL_LIBEXECDIR}/como_killer_helper" #cmakedefine01 HAVE_PERF #cmakedefine01 HAVE_BREEZE_DECO #cmakedefine01 HAVE_SCHED_RESET_ON_FORK diff --git a/lib/base/logging.h b/lib/base/logging.h index 0530671a46..042245a60f 100644 --- a/lib/base/logging.h +++ b/lib/base/logging.h @@ -5,9 +5,9 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include -KWIN_EXPORT Q_DECLARE_LOGGING_CATEGORY(KWIN_CORE) +COMO_EXPORT Q_DECLARE_LOGGING_CATEGORY(KWIN_CORE) diff --git a/lib/base/options.h b/lib/base/options.h index 33cd0fe332..5c88178fd7 100644 --- a/lib/base/options.h +++ b/lib/base/options.h @@ -10,14 +10,14 @@ #include "types.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::base { -class KWIN_EXPORT options_qobject : public QObject +class COMO_EXPORT options_qobject : public QObject { Q_OBJECT @@ -29,7 +29,7 @@ class KWIN_EXPORT options_qobject : public QObject void configChanged(); }; -class KWIN_EXPORT options +class COMO_EXPORT options { public: options(base::operation_mode mode, KSharedConfigPtr config); diff --git a/lib/base/os/clock/skew_notifier.h b/lib/base/os/clock/skew_notifier.h index 94a1e9118a..212844f68d 100644 --- a/lib/base/os/clock/skew_notifier.h +++ b/lib/base/os/clock/skew_notifier.h @@ -7,7 +7,7 @@ #include "skew_notifier_engine.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -22,7 +22,7 @@ namespace KWin::base::os::clock * the system clock. Such changes are usually initiated by the user adjusting values * in the Date and Time KCM or calls made to functions like settimeofday(). */ -class KWIN_EXPORT skew_notifier : public QObject +class COMO_EXPORT skew_notifier : public QObject { Q_OBJECT public: diff --git a/lib/base/output.h b/lib/base/output.h index 500c4c0514..46042517ae 100644 --- a/lib/base/output.h +++ b/lib/base/output.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "utils/gamma_ramp.h" #include @@ -23,7 +23,7 @@ enum class dpms_mode { off, }; -class KWIN_EXPORT output_qobject : public QObject +class COMO_EXPORT output_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/base/platform_qobject.h b/lib/base/platform_qobject.h index 5190a8d813..6c729c706e 100644 --- a/lib/base/platform_qobject.h +++ b/lib/base/platform_qobject.h @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -14,7 +15,7 @@ namespace KWin::base { -class KWIN_EXPORT platform_qobject : public QObject +class COMO_EXPORT platform_qobject : public QObject { Q_OBJECT diff --git a/lib/base/seat/backend/logind/session.cpp b/lib/base/seat/backend/logind/session.cpp index 6ab1a0a201..45070b7ebf 100644 --- a/lib/base/seat/backend/logind/session.cpp +++ b/lib/base/seat/backend/logind/session.cpp @@ -8,7 +8,7 @@ #include "base/logging.h" -#include "config-kwin.h" +#include #include #include diff --git a/lib/base/seat/backend/logind/session.h b/lib/base/seat/backend/logind/session.h index ec0f5b837d..85457e0535 100644 --- a/lib/base/seat/backend/logind/session.h +++ b/lib/base/seat/backend/logind/session.h @@ -7,6 +7,7 @@ #pragma once #include "base/seat/session.h" +#include #include @@ -15,7 +16,7 @@ class QDBusServiceWatcher; namespace KWin::base::seat::backend::logind { -class KWIN_EXPORT session : public seat::session +class COMO_EXPORT session : public seat::session { Q_OBJECT public: diff --git a/lib/base/seat/backend/wlroots/session.cpp b/lib/base/seat/backend/wlroots/session.cpp index 044a33dc44..05cdfcdaa6 100644 --- a/lib/base/seat/backend/wlroots/session.cpp +++ b/lib/base/seat/backend/wlroots/session.cpp @@ -8,7 +8,7 @@ #include "base/backend/wlroots/helpers.h" #include "base/logging.h" #include "base/wayland/server.h" -#include +#include #include diff --git a/lib/base/seat/backend/wlroots/session.h b/lib/base/seat/backend/wlroots/session.h index d681100013..b09a5fabe2 100644 --- a/lib/base/seat/backend/wlroots/session.h +++ b/lib/base/seat/backend/wlroots/session.h @@ -7,6 +7,7 @@ #include "base/seat/session.h" #include "base/utils.h" +#include #include #include @@ -21,7 +22,7 @@ namespace KWin::base::seat::backend::wlroots class session; -class KWIN_EXPORT session : public seat::session +class COMO_EXPORT session : public seat::session { Q_OBJECT public: diff --git a/lib/base/seat/session.h b/lib/base/seat/session.h index 5744c59f91..72ed382831 100644 --- a/lib/base/seat/session.h +++ b/lib/base/seat/session.h @@ -5,14 +5,14 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::base::seat { -class KWIN_EXPORT session : public QObject +class COMO_EXPORT session : public QObject { Q_OBJECT public: diff --git a/lib/base/singleton_interface.h b/lib/base/singleton_interface.h index 57073eb674..a288a22750 100644 --- a/lib/base/singleton_interface.h +++ b/lib/base/singleton_interface.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -18,7 +18,7 @@ class output; class platform_qobject; /// Only for exceptional use in environments without dependency injection support (e.g. Qt plugins). -struct KWIN_EXPORT singleton_interface { +struct COMO_EXPORT singleton_interface { static base::app_singleton* app_singleton; static base::platform_qobject* platform; static std::function()> get_outputs; diff --git a/lib/base/wayland/app_singleton.h b/lib/base/wayland/app_singleton.h index a6212244cb..daef94a7a2 100644 --- a/lib/base/wayland/app_singleton.h +++ b/lib/base/wayland/app_singleton.h @@ -6,7 +6,7 @@ #pragma once #include -#include +#include namespace KWin::base::wayland { diff --git a/lib/base/wayland/filtered_display.h b/lib/base/wayland/filtered_display.h index e4dcbc58fa..15a409a148 100644 --- a/lib/base/wayland/filtered_display.h +++ b/lib/base/wayland/filtered_display.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -13,7 +13,7 @@ namespace KWin::base::wayland { -class KWIN_EXPORT filtered_display : public Wrapland::Server::FilteredDisplay +class COMO_EXPORT filtered_display : public Wrapland::Server::FilteredDisplay { Q_OBJECT public: diff --git a/lib/base/wayland/server.h b/lib/base/wayland/server.h index b562afbe1f..ce83f2532a 100644 --- a/lib/base/wayland/server.h +++ b/lib/base/wayland/server.h @@ -10,7 +10,7 @@ #include "output_helpers.h" #include "base/logging.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -40,7 +40,7 @@ namespace KWin::base::wayland { -class KWIN_EXPORT server_qobject : public QObject +class COMO_EXPORT server_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/base/x11/event_filter.h b/lib/base/x11/event_filter.h index aac462bea7..a593b7fc10 100644 --- a/lib/base/x11/event_filter.h +++ b/lib/base/x11/event_filter.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include #include @@ -16,7 +16,7 @@ namespace KWin::base::x11 class event_filter_manager; -class KWIN_EXPORT event_filter +class COMO_EXPORT event_filter { public: /** diff --git a/lib/base/x11/event_filter_container.h b/lib/base/x11/event_filter_container.h index 63bc699bac..42e46573d9 100644 --- a/lib/base/x11/event_filter_container.h +++ b/lib/base/x11/event_filter_container.h @@ -6,7 +6,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include @@ -15,7 +15,7 @@ namespace KWin::base::x11 class event_filter; -class KWIN_EXPORT event_filter_container : public QObject +class COMO_EXPORT event_filter_container : public QObject { Q_OBJECT diff --git a/lib/base/x11/event_filter_manager.h b/lib/base/x11/event_filter_manager.h index 0e2cfd1cd3..f86d084163 100644 --- a/lib/base/x11/event_filter_manager.h +++ b/lib/base/x11/event_filter_manager.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include @@ -14,7 +14,7 @@ namespace KWin::base::x11 class event_filter; class event_filter_container; -class KWIN_EXPORT event_filter_manager +class COMO_EXPORT event_filter_manager { public: std::vector> filters; diff --git a/lib/base/x11/grabs.h b/lib/base/x11/grabs.h index dfe25d42ca..3528c744d6 100644 --- a/lib/base/x11/grabs.h +++ b/lib/base/x11/grabs.h @@ -9,15 +9,15 @@ #include "data.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::base::x11 { -void KWIN_EXPORT grab_server(xcb_connection_t* con); -void KWIN_EXPORT ungrab_server(xcb_connection_t* con); +void COMO_EXPORT grab_server(xcb_connection_t* con); +void COMO_EXPORT ungrab_server(xcb_connection_t* con); /** * Small helper class which performs grabXServer in the ctor and diff --git a/lib/base/x11/selection_owner.h b/lib/base/x11/selection_owner.h index 2dd8b5af7a..1fb5353baa 100644 --- a/lib/base/x11/selection_owner.h +++ b/lib/base/x11/selection_owner.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -15,7 +15,7 @@ namespace KWin::base::x11 { -class KWIN_EXPORT selection_owner : public QObject +class COMO_EXPORT selection_owner : public QObject { Q_OBJECT public: diff --git a/lib/base/x11/xcb/extensions.h b/lib/base/x11/xcb/extensions.h index 2f39123446..33700a36bc 100644 --- a/lib/base/x11/xcb/extensions.h +++ b/lib/base/x11/xcb/extensions.h @@ -7,7 +7,7 @@ #pragma once #include "base/x11/data.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -29,7 +29,7 @@ class extension_data QVector errorCodes; }; -class KWIN_EXPORT extensions +class COMO_EXPORT extensions { public: bool is_shape_available() const diff --git a/lib/debug/CMakeLists.txt b/lib/debug/CMakeLists.txt index 31d66cfa64..862bd35798 100644 --- a/lib/debug/CMakeLists.txt +++ b/lib/debug/CMakeLists.txt @@ -67,11 +67,11 @@ target_sources(debug-wl set_target_properties(debug-common debug-wl PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) install(TARGETS debug-common debug-wl - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/debug + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/debug ) diff --git a/lib/debug/console/console.h b/lib/debug/console/console.h index 5a5c40456c..9bc76a7579 100644 --- a/lib/debug/console/console.h +++ b/lib/debug/console/console.h @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "model_helpers.h" #include "ui_debug_console.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -30,7 +30,7 @@ class property_window; namespace debug { -class KWIN_EXPORT console_model : public QAbstractItemModel +class COMO_EXPORT console_model : public QAbstractItemModel { Q_OBJECT public: @@ -75,7 +75,7 @@ class KWIN_EXPORT console_model : public QAbstractItemModel std::vector> m_unmanageds; }; -class KWIN_EXPORT console_delegate : public QStyledItemDelegate +class COMO_EXPORT console_delegate : public QStyledItemDelegate { Q_OBJECT public: @@ -95,7 +95,7 @@ class console : public QWidget , space{space} { setAttribute(Qt::WA_ShowWithoutActivating); - this->setWindowTitle("kwin_debugconsole"); + this->setWindowTitle("como_debugconsole"); m_ui->setupUi(this); diff --git a/lib/debug/console/wayland/input_device_model.h b/lib/debug/console/wayland/input_device_model.h index e519000c9e..c0a0b4c5a0 100644 --- a/lib/debug/console/wayland/input_device_model.h +++ b/lib/debug/console/wayland/input_device_model.h @@ -7,6 +7,7 @@ #pragma once #include "input/dbus/device.h" +#include #include #include @@ -14,7 +15,7 @@ namespace KWin::debug { -class KWIN_EXPORT input_device_model : public QAbstractItemModel +class COMO_EXPORT input_device_model : public QAbstractItemModel { Q_OBJECT public: diff --git a/lib/debug/console/wayland/wayland_console.h b/lib/debug/console/wayland/wayland_console.h index 7706ebd8c6..f332ccd720 100644 --- a/lib/debug/console/wayland/wayland_console.h +++ b/lib/debug/console/wayland/wayland_console.h @@ -12,11 +12,12 @@ #include "debug/console/console.h" #include "input/redirect_qobject.h" +#include namespace KWin::debug { -class KWIN_EXPORT wayland_console_model : public console_model +class COMO_EXPORT wayland_console_model : public console_model { Q_OBJECT public: @@ -43,7 +44,7 @@ class KWIN_EXPORT wayland_console_model : public console_model std::vector> internal_windows; }; -class KWIN_EXPORT wayland_console_delegate : public console_delegate +class COMO_EXPORT wayland_console_delegate : public console_delegate { Q_OBJECT public: @@ -53,7 +54,7 @@ class KWIN_EXPORT wayland_console_delegate : public console_delegate }; template -class KWIN_EXPORT wayland_console : public console +class COMO_EXPORT wayland_console : public console { public: wayland_console(Space& space) diff --git a/lib/debug/console/wayland/xwl_console.h b/lib/debug/console/wayland/xwl_console.h index e4121642f6..637e331235 100644 --- a/lib/debug/console/wayland/xwl_console.h +++ b/lib/debug/console/wayland/xwl_console.h @@ -13,12 +13,13 @@ #include "debug/console/console.h" #include "input/redirect_qobject.h" +#include namespace KWin::debug { template -class KWIN_EXPORT xwl_console : public console +class COMO_EXPORT xwl_console : public console { public: xwl_console(Space& space) diff --git a/lib/debug/perf/ftrace.cpp b/lib/debug/perf/ftrace.cpp index dfc230632f..0271af67e3 100644 --- a/lib/debug/perf/ftrace.cpp +++ b/lib/debug/perf/ftrace.cpp @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "ftrace.h" -#include "config-kwin.h" +#include "config-como.h" #if HAVE_PERF #include "ftrace_impl.h" diff --git a/lib/debug/perf/ftrace.h b/lib/debug/perf/ftrace.h index c919fc5f13..b161d1c759 100644 --- a/lib/debug/perf/ftrace.h +++ b/lib/debug/perf/ftrace.h @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -21,11 +21,11 @@ namespace Ftrace /** * Internal perf API for consumers */ -void KWIN_EXPORT mark(const QString& message); -void KWIN_EXPORT begin(const QString& message, ulong ctx); -void KWIN_EXPORT end(const QString& message, ulong ctx); +void COMO_EXPORT mark(const QString& message); +void COMO_EXPORT begin(const QString& message, ulong ctx); +void COMO_EXPORT end(const QString& message, ulong ctx); -bool KWIN_EXPORT setEnabled(bool enable); +bool COMO_EXPORT setEnabled(bool enable); } } diff --git a/lib/debug/support_info.h b/lib/debug/support_info.h index a4a27dc5ec..2589b4f73b 100644 --- a/lib/debug/support_info.h +++ b/lib/debug/support_info.h @@ -6,7 +6,7 @@ #pragma once #include "base/options.h" -#include +#include #include #include @@ -44,8 +44,8 @@ QString get_support_info(Space const& space) support.append(QStringLiteral("\n==========================\n\n")); support.append(QStringLiteral("Version\n")); support.append(QStringLiteral("=======\n")); - support.append(QStringLiteral("KWinFT version: ")); - support.append(QStringLiteral(KWIN_VERSION_STRING)); + support.append(QStringLiteral("The Compositor Modules version: ")); + support.append(QStringLiteral(COMO_VERSION_STRING)); support.append(QStringLiteral("\n")); support.append(QStringLiteral("Qt Version: ")); support.append(QString::fromUtf8(qVersion())); @@ -70,12 +70,10 @@ QString get_support_info(Space const& space) support.append(QStringLiteral("Build Options\n")); support.append(QStringLiteral("=============\n")); - support.append(QStringLiteral("KWIN_BUILD_DECORATIONS: ")); - support.append(KWIN_BUILD_DECORATIONS ? yes : no); - support.append(QStringLiteral("KWIN_BUILD_TABBOX: ")); - support.append(KWIN_BUILD_TABBOX ? yes : no); - support.append(QStringLiteral("KWIN_BUILD_ACTIVITIES (deprecated): ")); - support.append(no); + support.append(QStringLiteral("COMO_BUILD_DECORATIONS: ")); + support.append(COMO_BUILD_DECORATIONS ? yes : no); + support.append(QStringLiteral("COMO_BUILD_TABBOX: ")); + support.append(COMO_BUILD_TABBOX ? yes : no); support.append(QStringLiteral("HAVE_PERF: ")); support.append(HAVE_PERF ? yes : no); support.append(QStringLiteral("HAVE_EPOXY_GLX: ")); diff --git a/lib/desktop/CMakeLists.txt b/lib/desktop/CMakeLists.txt index 9de7754e43..c9754c69dd 100644 --- a/lib/desktop/CMakeLists.txt +++ b/lib/desktop/CMakeLists.txt @@ -61,13 +61,13 @@ target_sources(desktop-kde set_target_properties(desktop desktop-kde PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) # TODO(romangg): Below should only be installed as part of a consumer install linking desktop-kde. install(FILES kde/kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR} - RENAME ${KWIN_NAME}.notifyrc + RENAME kwin.notifyrc ) install( FILES @@ -101,7 +101,7 @@ ecm_install_configured_files( ) install(TARGETS desktop desktop-kde - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/desktop + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/desktop ) diff --git a/lib/desktop/kde/dbus/kwin.h b/lib/desktop/kde/dbus/kwin.h index 0e2cc3e4a7..0a008c1b9c 100644 --- a/lib/desktop/kde/dbus/kwin.h +++ b/lib/desktop/kde/dbus/kwin.h @@ -6,8 +6,8 @@ */ #pragma once +#include "como_export.h" #include "debug/support_info.h" -#include "kwin_export.h" #include "win/kill_window.h" #include "win/placement.h" #include @@ -42,7 +42,7 @@ namespace desktop::kde * * @author Martin Gräßlin */ -class KWIN_EXPORT kwin : public QObject, protected QDBusContext +class COMO_EXPORT kwin : public QObject, protected QDBusContext { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KWin") diff --git a/lib/desktop/screen_locker_watcher.h b/lib/desktop/screen_locker_watcher.h index 1fbb1a9703..33244b87a8 100644 --- a/lib/desktop/screen_locker_watcher.h +++ b/lib/desktop/screen_locker_watcher.h @@ -6,7 +6,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include @@ -18,7 +18,7 @@ class QDBusPendingCallWatcher; namespace KWin::desktop { -class KWIN_EXPORT screen_locker_watcher : public QObject +class COMO_EXPORT screen_locker_watcher : public QObject { Q_OBJECT public: diff --git a/lib/input/CMakeLists.txt b/lib/input/CMakeLists.txt index 9a249d2277..54ff363a64 100644 --- a/lib/input/CMakeLists.txt +++ b/lib/input/CMakeLists.txt @@ -188,7 +188,7 @@ target_sources(input-wl set_target_properties(input input-x11-backend input-wl PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) qt6_generate_dbus_interface(dbus/device.h org.kde.kwin.InputDevice.xml OPTIONS -A) @@ -203,7 +203,7 @@ install( ) install(TARGETS input input-x11-backend input-wl - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/input + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/input ) diff --git a/lib/input/backend/wlroots/control/headless/keyboard.h b/lib/input/backend/wlroots/control/headless/keyboard.h index aac52b3f03..f269b898a2 100644 --- a/lib/input/backend/wlroots/control/headless/keyboard.h +++ b/lib/input/backend/wlroots/control/headless/keyboard.h @@ -6,6 +6,7 @@ #pragma once #include "input/control/keyboard.h" +#include namespace KWin::input::backend::wlroots::headless { @@ -18,7 +19,7 @@ struct keyboard_control_data { bool is_alpha_numeric_keyboard{false}; }; -class KWIN_EXPORT keyboard_control : public input::control::keyboard +class COMO_EXPORT keyboard_control : public input::control::keyboard { Q_OBJECT diff --git a/lib/input/backend/wlroots/control/keyboard.h b/lib/input/backend/wlroots/control/keyboard.h index 0638d5aa18..21900a928f 100644 --- a/lib/input/backend/wlroots/control/keyboard.h +++ b/lib/input/backend/wlroots/control/keyboard.h @@ -6,6 +6,7 @@ #pragma once #include "input/control/keyboard.h" +#include #include #include @@ -13,7 +14,7 @@ namespace KWin::input::backend::wlroots { -class KWIN_EXPORT keyboard_control : public input::control::keyboard +class COMO_EXPORT keyboard_control : public input::control::keyboard { Q_OBJECT diff --git a/lib/input/backend/wlroots/control/pointer.h b/lib/input/backend/wlroots/control/pointer.h index e2ec236066..184e32d3a3 100644 --- a/lib/input/backend/wlroots/control/pointer.h +++ b/lib/input/backend/wlroots/control/pointer.h @@ -6,6 +6,7 @@ #pragma once #include "input/control/pointer.h" +#include #include #include @@ -14,7 +15,7 @@ namespace KWin::input::backend::wlroots { -class KWIN_EXPORT pointer_control : public input::control::pointer +class COMO_EXPORT pointer_control : public input::control::pointer { Q_OBJECT diff --git a/lib/input/backend/wlroots/control/switch.h b/lib/input/backend/wlroots/control/switch.h index 1ed24cf94e..33bdbc9537 100644 --- a/lib/input/backend/wlroots/control/switch.h +++ b/lib/input/backend/wlroots/control/switch.h @@ -6,6 +6,7 @@ #pragma once #include "input/control/switch.h" +#include #include #include @@ -13,7 +14,7 @@ namespace KWin::input::backend::wlroots { -class KWIN_EXPORT switch_control : public input::control::switch_device +class COMO_EXPORT switch_control : public input::control::switch_device { Q_OBJECT public: diff --git a/lib/input/backend/wlroots/control/touch.h b/lib/input/backend/wlroots/control/touch.h index b907025744..cc6938a2cc 100644 --- a/lib/input/backend/wlroots/control/touch.h +++ b/lib/input/backend/wlroots/control/touch.h @@ -6,6 +6,7 @@ #pragma once #include "input/control/touch.h" +#include #include #include @@ -15,7 +16,7 @@ namespace KWin::input::backend::wlroots { -class KWIN_EXPORT touch_control : public input::control::touch +class COMO_EXPORT touch_control : public input::control::touch { Q_OBJECT diff --git a/lib/input/backend/wlroots/keyboard.h b/lib/input/backend/wlroots/keyboard.h index e56ddbef92..071745422e 100644 --- a/lib/input/backend/wlroots/keyboard.h +++ b/lib/input/backend/wlroots/keyboard.h @@ -11,7 +11,7 @@ #include #include "base/utils.h" -#include "config-kwin.h" +#include "config-como.h" #include "input/keyboard.h" extern "C" { diff --git a/lib/input/backend/wlroots/pointer.h b/lib/input/backend/wlroots/pointer.h index 944a31b4ff..49a82e3e08 100644 --- a/lib/input/backend/wlroots/pointer.h +++ b/lib/input/backend/wlroots/pointer.h @@ -8,7 +8,7 @@ #include "control/pointer.h" #include "base/utils.h" -#include "config-kwin.h" +#include "config-como.h" #include "input/pointer.h" #include diff --git a/lib/input/backend/wlroots/switch.h b/lib/input/backend/wlroots/switch.h index a29dedc0dd..a6b08c964a 100644 --- a/lib/input/backend/wlroots/switch.h +++ b/lib/input/backend/wlroots/switch.h @@ -9,7 +9,7 @@ #include #include "base/utils.h" -#include "config-kwin.h" +#include "config-como.h" #include "input/platform.h" #include "input/switch.h" diff --git a/lib/input/backend/wlroots/touch.h b/lib/input/backend/wlroots/touch.h index 501ce6362f..b29763071a 100644 --- a/lib/input/backend/wlroots/touch.h +++ b/lib/input/backend/wlroots/touch.h @@ -9,7 +9,7 @@ #include #include "base/utils.h" -#include "config-kwin.h" +#include "config-como.h" #include "input/platform.h" #include "input/touch.h" diff --git a/lib/input/control/device.cpp b/lib/input/control/device.cpp index a093473be5..30cc56ce22 100644 --- a/lib/input/control/device.cpp +++ b/lib/input/control/device.cpp @@ -8,7 +8,7 @@ #include "config.h" -#include "config-kwin.h" +#include "config-como.h" namespace KWin::input::control { diff --git a/lib/input/control/device.h b/lib/input/control/device.h index 0b8dcddecd..55daaa3809 100644 --- a/lib/input/control/device.h +++ b/lib/input/control/device.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -18,7 +18,7 @@ namespace control { class device_config; -class KWIN_EXPORT device : public QObject +class COMO_EXPORT device : public QObject { Q_OBJECT diff --git a/lib/input/control/keyboard.h b/lib/input/control/keyboard.h index e052a24d9f..5204e31412 100644 --- a/lib/input/control/keyboard.h +++ b/lib/input/control/keyboard.h @@ -12,7 +12,7 @@ namespace KWin::input::control { -class KWIN_EXPORT keyboard : public device +class COMO_EXPORT keyboard : public device { Q_OBJECT diff --git a/lib/input/control/pointer.h b/lib/input/control/pointer.h index e7657efea0..e93ee624bd 100644 --- a/lib/input/control/pointer.h +++ b/lib/input/control/pointer.h @@ -12,7 +12,7 @@ namespace KWin::input::control { -class KWIN_EXPORT pointer : public device +class COMO_EXPORT pointer : public device { Q_OBJECT public: diff --git a/lib/input/control/switch.h b/lib/input/control/switch.h index 45258bf763..e1ef8b3e83 100644 --- a/lib/input/control/switch.h +++ b/lib/input/control/switch.h @@ -10,7 +10,7 @@ namespace KWin::input::control { -class KWIN_EXPORT switch_device : public device +class COMO_EXPORT switch_device : public device { Q_OBJECT public: diff --git a/lib/input/control/touch.h b/lib/input/control/touch.h index 4c1617c897..e0688bf7c4 100644 --- a/lib/input/control/touch.h +++ b/lib/input/control/touch.h @@ -10,7 +10,7 @@ namespace KWin::input::control { -class KWIN_EXPORT touch : public device +class COMO_EXPORT touch : public device { Q_OBJECT public: diff --git a/lib/input/cursor.h b/lib/input/cursor.h index 52ab305ecf..f127df6291 100644 --- a/lib/input/cursor.h +++ b/lib/input/cursor.h @@ -8,7 +8,7 @@ #include "win/cursor_shape.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -34,7 +34,7 @@ namespace KWin::input * fetch the position and warp pointer to set the position. It can provide X11 cursors through the * XCursor library. */ -class KWIN_EXPORT cursor : public QObject +class COMO_EXPORT cursor : public QObject { Q_OBJECT public: diff --git a/lib/input/dbus/device.h b/lib/input/dbus/device.h index f99c7dc40b..98dcec089f 100644 --- a/lib/input/dbus/device.h +++ b/lib/input/dbus/device.h @@ -11,7 +11,7 @@ #include "input/control/switch.h" #include "input/control/touch.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -19,7 +19,7 @@ namespace KWin::input::dbus { -class KWIN_EXPORT device : public QObject +class COMO_EXPORT device : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KWin.InputDevice") diff --git a/lib/input/dbus/device_manager.h b/lib/input/dbus/device_manager.h index e2a42a185e..97275deba1 100644 --- a/lib/input/dbus/device_manager.h +++ b/lib/input/dbus/device_manager.h @@ -7,8 +7,8 @@ #include "device_helpers.h" +#include "como_export.h" #include "input/platform_qobject.h" -#include "kwin_export.h" #include #include @@ -18,7 +18,7 @@ namespace KWin::input::dbus { class device; -class KWIN_EXPORT device_manager_qobject : public QObject +class COMO_EXPORT device_manager_qobject : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KWin.InputDeviceManager") diff --git a/lib/input/dbus/keyboard_layout.h b/lib/input/dbus/keyboard_layout.h index 0a5758a972..177ac8fc25 100644 --- a/lib/input/dbus/keyboard_layout.h +++ b/lib/input/dbus/keyboard_layout.h @@ -7,7 +7,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -29,7 +29,7 @@ class keyboard; namespace dbus { -class KWIN_EXPORT keyboard_layout : public QObject +class COMO_EXPORT keyboard_layout : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KeyboardLayouts") diff --git a/lib/input/dbus/keyboard_layouts_v2.h b/lib/input/dbus/keyboard_layouts_v2.h index 55266ee887..2cdca929b3 100644 --- a/lib/input/dbus/keyboard_layouts_v2.h +++ b/lib/input/dbus/keyboard_layouts_v2.h @@ -5,8 +5,8 @@ */ #pragma once +#include "como_export.h" #include "input/platform_qobject.h" -#include "kwin_export.h" #include #include @@ -46,7 +46,7 @@ struct layout_names_v2 { QString long_name; }; -class KWIN_EXPORT keyboard_layouts_v2 : public QObject +class COMO_EXPORT keyboard_layouts_v2 : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KeyboardLayoutsV2") @@ -99,10 +99,10 @@ public Q_SLOTS: uint keyboard_index{0}; }; -KWIN_EXPORT QDBusArgument& operator<<(QDBusArgument& argument, keyboard_v2 const& keyboard); -KWIN_EXPORT QDBusArgument const& operator>>(QDBusArgument const& argument, keyboard_v2& keyboard); -KWIN_EXPORT QDBusArgument& operator<<(QDBusArgument& argument, layout_names_v2 const& names); -KWIN_EXPORT QDBusArgument const& operator>>(QDBusArgument const& argument, layout_names_v2& names); +COMO_EXPORT QDBusArgument& operator<<(QDBusArgument& argument, keyboard_v2 const& keyboard); +COMO_EXPORT QDBusArgument const& operator>>(QDBusArgument const& argument, keyboard_v2& keyboard); +COMO_EXPORT QDBusArgument& operator<<(QDBusArgument& argument, layout_names_v2 const& names); +COMO_EXPORT QDBusArgument const& operator>>(QDBusArgument const& argument, layout_names_v2& names); } } diff --git a/lib/input/dbus/tablet_mode_manager.h b/lib/input/dbus/tablet_mode_manager.h index 70e6ea41e9..f053de2a48 100644 --- a/lib/input/dbus/tablet_mode_manager.h +++ b/lib/input/dbus/tablet_mode_manager.h @@ -7,7 +7,7 @@ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "input/platform_qobject.h" #include "input/redirect_qobject.h" @@ -60,7 +60,7 @@ class tablet_mode_touchpad_removed_spy : public QObject Manager& manager; }; -class KWIN_EXPORT tablet_mode_manager_qobject : public QObject +class COMO_EXPORT tablet_mode_manager_qobject : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.KWin.TabletModeManager") diff --git a/lib/input/device_redirect.h b/lib/input/device_redirect.h index 5b29794618..e5068a6bc1 100644 --- a/lib/input/device_redirect.h +++ b/lib/input/device_redirect.h @@ -8,8 +8,6 @@ */ #pragma once -#include "kwin_export.h" - #include #include #include diff --git a/lib/input/keyboard.h b/lib/input/keyboard.h index 50f371631a..8e4ffdffc2 100644 --- a/lib/input/keyboard.h +++ b/lib/input/keyboard.h @@ -9,14 +9,14 @@ #include "event.h" #include "xkb/keyboard.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::input { -class KWIN_EXPORT keyboard : public QObject +class COMO_EXPORT keyboard : public QObject { Q_OBJECT public: diff --git a/lib/input/keyboard_redirect.h b/lib/input/keyboard_redirect.h index 4c34af0e22..124d4dbde9 100644 --- a/lib/input/keyboard_redirect.h +++ b/lib/input/keyboard_redirect.h @@ -10,7 +10,7 @@ #include "event_spy.h" #include "keyboard.h" -#include "kwin_export.h" +#include #include @@ -25,7 +25,7 @@ void keyboard_redirect_prepare_key(Keyboard& keys, key_event const& event) std::bind(&event_spy::key, std::placeholders::_1, event)); } -class KWIN_EXPORT keyboard_redirect_qobject : public QObject +class COMO_EXPORT keyboard_redirect_qobject : public QObject { public: ~keyboard_redirect_qobject() override; diff --git a/lib/input/logging.h b/lib/input/logging.h index 96f37442d2..add69fb1ef 100644 --- a/lib/input/logging.h +++ b/lib/input/logging.h @@ -5,9 +5,9 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include -KWIN_EXPORT Q_DECLARE_LOGGING_CATEGORY(KWIN_INPUT) +COMO_EXPORT Q_DECLARE_LOGGING_CATEGORY(KWIN_INPUT) diff --git a/lib/input/platform_qobject.h b/lib/input/platform_qobject.h index 27010b24b1..9550a43c8d 100644 --- a/lib/input/platform_qobject.h +++ b/lib/input/platform_qobject.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -18,7 +18,7 @@ class pointer; class switch_device; class touch; -class KWIN_EXPORT platform_qobject : public QObject +class COMO_EXPORT platform_qobject : public QObject { Q_OBJECT public: diff --git a/lib/input/pointer.h b/lib/input/pointer.h index d330d200ec..6b4cccd9db 100644 --- a/lib/input/pointer.h +++ b/lib/input/pointer.h @@ -8,14 +8,14 @@ #include "control/pointer.h" #include "event.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::input { -class KWIN_EXPORT pointer : public QObject +class COMO_EXPORT pointer : public QObject { Q_OBJECT public: diff --git a/lib/input/qt_event.h b/lib/input/qt_event.h index e771e96afe..bf234b0980 100644 --- a/lib/input/qt_event.h +++ b/lib/input/qt_event.h @@ -10,8 +10,6 @@ #include "xkb/helpers.h" #include "xkb/keyboard.h" -#include "kwin_export.h" - #include #include #include diff --git a/lib/input/redirect_qobject.h b/lib/input/redirect_qobject.h index ac0955b7e5..a1e1703f96 100644 --- a/lib/input/redirect_qobject.h +++ b/lib/input/redirect_qobject.h @@ -7,7 +7,7 @@ #include "event.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -15,7 +15,7 @@ namespace KWin::input { -class KWIN_EXPORT redirect_qobject : public QObject +class COMO_EXPORT redirect_qobject : public QObject { Q_OBJECT public: diff --git a/lib/input/singleton_interface.h b/lib/input/singleton_interface.h index a80e2ccce2..f1b8a75b3e 100644 --- a/lib/input/singleton_interface.h +++ b/lib/input/singleton_interface.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include @@ -17,7 +17,7 @@ class idle_qobject; class platform_qobject; /// Only for exceptional use in environments without dependency injection support (e.g. Qt plugins). -struct KWIN_EXPORT singleton_interface { +struct COMO_EXPORT singleton_interface { static input::cursor* cursor; static input::idle_qobject* idle_qobject; static input::platform_qobject* platform_qobject; diff --git a/lib/input/spies/keyboard_repeat.h b/lib/input/spies/keyboard_repeat.h index 86fea7597a..9c85f4904b 100644 --- a/lib/input/spies/keyboard_repeat.h +++ b/lib/input/spies/keyboard_repeat.h @@ -11,6 +11,7 @@ #include "input/event_spy.h" #include "input/keyboard.h" #include "input/xkb/keyboard.h" +#include #include #include @@ -22,7 +23,7 @@ namespace KWin::input { -class KWIN_EXPORT keyboard_repeat_spy_qobject : public QObject +class COMO_EXPORT keyboard_repeat_spy_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/input/spies/modifier_only_shortcuts.h b/lib/input/spies/modifier_only_shortcuts.h index 1d3645fa12..ce856b07d3 100644 --- a/lib/input/spies/modifier_only_shortcuts.h +++ b/lib/input/spies/modifier_only_shortcuts.h @@ -6,13 +6,13 @@ SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include "base/options.h" +#include "como_export.h" #include "desktop/screen_locker_watcher.h" #include "input/event.h" #include "input/event_spy.h" #include "input/keyboard.h" #include "input/qt_event.h" #include "input/xkb/helpers.h" -#include "kwin_export.h" #include #include @@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-2.0-or-later namespace KWin::input { -class KWIN_EXPORT modifier_only_shortcuts_spy_qobject : public QObject +class COMO_EXPORT modifier_only_shortcuts_spy_qobject : public QObject { }; diff --git a/lib/input/switch.h b/lib/input/switch.h index e1ea8a1355..080215369a 100644 --- a/lib/input/switch.h +++ b/lib/input/switch.h @@ -8,14 +8,14 @@ #include "control/switch.h" #include "event.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::input { -class KWIN_EXPORT switch_device : public QObject +class COMO_EXPORT switch_device : public QObject { Q_OBJECT public: diff --git a/lib/input/touch.h b/lib/input/touch.h index 3d11e668cd..6ab0f96010 100644 --- a/lib/input/touch.h +++ b/lib/input/touch.h @@ -9,7 +9,7 @@ #include "event.h" #include "base/wayland/output_transform.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -19,7 +19,7 @@ namespace KWin::input { -class KWIN_EXPORT touch_qobject : public QObject +class COMO_EXPORT touch_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/input/wayland/cursor_image.h b/lib/input/wayland/cursor_image.h index 03bdde541d..728e655806 100644 --- a/lib/input/wayland/cursor_image.h +++ b/lib/input/wayland/cursor_image.h @@ -10,7 +10,7 @@ #include "base/wayland/screen_lock.h" #include "base/wayland/server.h" -#include "kwin_export.h" +#include "como_export.h" #include "win/space_qobject.h" #include "win/window_qobject.h" #include @@ -32,7 +32,7 @@ namespace KWin::input::wayland { -class KWIN_EXPORT cursor_image_qobject : public QObject +class COMO_EXPORT cursor_image_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/input/wayland/global_shortcuts_manager.h b/lib/input/wayland/global_shortcuts_manager.h index 3cb70f380a..0f67d4108b 100644 --- a/lib/input/wayland/global_shortcuts_manager.h +++ b/lib/input/wayland/global_shortcuts_manager.h @@ -6,8 +6,8 @@ */ #pragma once +#include "como_export.h" #include "input/types.h" -#include "kwin_export.h" #include "win/input/gestures.h" #include "win/input/global_shortcut.h" @@ -31,7 +31,7 @@ namespace wayland * For internal shortcut handling (those which are delivered inside KWin) QActions are used and * triggered if the shortcut matches. For external shortcut handling a DBus interface is used. */ -class KWIN_EXPORT global_shortcuts_manager : public QObject +class COMO_EXPORT global_shortcuts_manager : public QObject { Q_OBJECT public: diff --git a/lib/input/wayland/redirect.h b/lib/input/wayland/redirect.h index 8c19726a07..fff7616e02 100644 --- a/lib/input/wayland/redirect.h +++ b/lib/input/wayland/redirect.h @@ -13,7 +13,7 @@ #include "tablet_redirect.h" #include "touch_redirect.h" -// TODO(romangg): should only be included when KWIN_BUILD_TABBOX is defined. +// TODO(romangg): should only be included when COMO_BUILD_TABBOX is defined. #include "input/filters/tabbox.h" #include "base/wayland/output_helpers.h" @@ -371,7 +371,7 @@ class redirect m_filters.emplace_back(new screen_edge_filter(*this)); } -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX m_filters.emplace_back(new tabbox_filter(*this)); #endif diff --git a/lib/input/wayland/xcursor_theme.h b/lib/input/wayland/xcursor_theme.h index a6a9b66a78..8b47aa0a29 100644 --- a/lib/input/wayland/xcursor_theme.h +++ b/lib/input/wayland/xcursor_theme.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -20,7 +20,7 @@ class xcursor_sprite_private; class xcursor_theme_private; /// The xcursor_sprite class represents a single sprite in the Xcursor theme. -class KWIN_EXPORT xcursor_sprite +class COMO_EXPORT xcursor_sprite { public: xcursor_sprite(); @@ -43,7 +43,7 @@ class KWIN_EXPORT xcursor_sprite }; /// The xcursor_theme class represents an Xcursor theme. -class KWIN_EXPORT xcursor_theme +class COMO_EXPORT xcursor_theme { public: xcursor_theme(); diff --git a/lib/input/x11/cursor.h b/lib/input/x11/cursor.h index 79d0e9793d..8ed4a656ce 100644 --- a/lib/input/x11/cursor.h +++ b/lib/input/x11/cursor.h @@ -8,6 +8,7 @@ #include "input/cursor.h" #include +#include #include #include @@ -28,7 +29,7 @@ namespace input::x11 class xfixes_cursor_event_filter; -class KWIN_EXPORT cursor : public input::cursor +class COMO_EXPORT cursor : public input::cursor { Q_OBJECT public: diff --git a/lib/input/x11/global_shortcuts_manager.h b/lib/input/x11/global_shortcuts_manager.h index 0b1a233049..a0706b74f8 100644 --- a/lib/input/x11/global_shortcuts_manager.h +++ b/lib/input/x11/global_shortcuts_manager.h @@ -7,7 +7,7 @@ #include "input/types.h" #include "win/input/global_shortcut.h" -#include +#include #include #include @@ -20,7 +20,7 @@ namespace KWin::input namespace x11 { -class KWIN_EXPORT global_shortcuts_manager : public QObject +class COMO_EXPORT global_shortcuts_manager : public QObject { Q_OBJECT public: diff --git a/lib/input/x11/platform.h b/lib/input/x11/platform.h index 271b95c280..e22811820b 100644 --- a/lib/input/x11/platform.h +++ b/lib/input/x11/platform.h @@ -8,7 +8,7 @@ #include "global_shortcuts_manager.h" #include "redirect.h" -#include "config-kwin.h" +#include "config-como.h" #include "input/platform.h" #include diff --git a/lib/input/x11/xfixes_cursor_event_filter.h b/lib/input/x11/xfixes_cursor_event_filter.h index 8087ddd01b..73c4a06953 100644 --- a/lib/input/x11/xfixes_cursor_event_filter.h +++ b/lib/input/x11/xfixes_cursor_event_filter.h @@ -7,12 +7,13 @@ #pragma once #include "base/x11/event_filter.h" +#include namespace KWin::input::x11 { class cursor; -class KWIN_EXPORT xfixes_cursor_event_filter : public base::x11::event_filter +class COMO_EXPORT xfixes_cursor_event_filter : public base::x11::event_filter { public: explicit xfixes_cursor_event_filter(base::x11::event_filter_manager& manager, cursor* cursor); diff --git a/lib/input/xkb/keyboard.h b/lib/input/xkb/keyboard.h index 10209e5304..b22b2f39f2 100644 --- a/lib/input/xkb/keyboard.h +++ b/lib/input/xkb/keyboard.h @@ -9,6 +9,7 @@ #include "input/event.h" #include "input/types.h" +#include #include #include @@ -26,7 +27,7 @@ struct modifiers { xkb_mod_index_t locked{0}; }; -class KWIN_EXPORT keyboard_qobject : public QObject +class COMO_EXPORT keyboard_qobject : public QObject { Q_OBJECT public: @@ -38,7 +39,7 @@ class KWIN_EXPORT keyboard_qobject : public QObject void leds_changed(keyboard_leds leds); }; -class KWIN_EXPORT keyboard +class COMO_EXPORT keyboard { public: keyboard(xkb_context* context, xkb_compose_table* compose_table); diff --git a/lib/input/xkb/keymap.h b/lib/input/xkb/keymap.h index bdfd647827..69307510b0 100644 --- a/lib/input/xkb/keymap.h +++ b/lib/input/xkb/keymap.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include @@ -15,7 +15,7 @@ struct xkb_keymap; namespace KWin::input::xkb { -class KWIN_EXPORT keymap +class COMO_EXPORT keymap { public: keymap(xkb_keymap* keymap); diff --git a/lib/input/xkb/layout_manager.h b/lib/input/xkb/layout_manager.h index 732c5cdd30..2ed17f0744 100644 --- a/lib/input/xkb/layout_manager.h +++ b/lib/input/xkb/layout_manager.h @@ -10,10 +10,10 @@ #include "helpers.h" #include "layout_policies.h" +#include "como_export.h" #include "input/dbus/keyboard_layout.h" #include "input/dbus/keyboard_layouts_v2.h" #include "input/keyboard.h" -#include "kwin_export.h" #include #include @@ -37,7 +37,7 @@ inline QString translated_keyboard_layout(std::string const& layout) return i18nd("xkeyboard-config", layout.c_str()); } -class KWIN_EXPORT layout_manager_qobject : public QObject +class COMO_EXPORT layout_manager_qobject : public QObject { Q_OBJECT public: diff --git a/lib/input/xkb/layout_policies.h b/lib/input/xkb/layout_policies.h index a5ecec6350..e552177607 100644 --- a/lib/input/xkb/layout_policies.h +++ b/lib/input/xkb/layout_policies.h @@ -12,6 +12,7 @@ #include "win/space_qobject.h" #include "win/util.h" #include "win/window_qobject.h" +#include #include #include @@ -32,7 +33,7 @@ uint32_t get_layout(T const& layouts, U const& reference) return it->second; } -class KWIN_EXPORT layout_policy_qobject : public QObject +class COMO_EXPORT layout_policy_qobject : public QObject { public: ~layout_policy_qobject() override; diff --git a/lib/render/CMakeLists.txt b/lib/render/CMakeLists.txt index 60b53e3b73..cc663007f7 100644 --- a/lib/render/CMakeLists.txt +++ b/lib/render/CMakeLists.txt @@ -269,13 +269,13 @@ target_sources(render-wl set_target_properties(render render-x11 render-x11-backend render-wl PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) install( FILES post/kconfig/color_correct_settings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} - RENAME ${KWIN_NAME}_colorcorrect.kcfg + RENAME kwin_colorcorrect.kcfg ) install( FILES @@ -285,11 +285,11 @@ install( ${KDE_INSTALL_DBUSINTERFACEDIR} ) -install(DIRECTORY qml/outline/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/outline) -install(DIRECTORY qml/frames/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/frames) +install(DIRECTORY qml/outline/plasma DESTINATION ${KDE_INSTALL_DATADIR}/como/outline) +install(DIRECTORY qml/frames/plasma DESTINATION ${KDE_INSTALL_DATADIR}/como/frames) install(TARGETS render render-x11 render-x11-backend render-wl - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/render + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/render ) diff --git a/lib/render/backend/wlroots/egl_backend.h b/lib/render/backend/wlroots/egl_backend.h index 6bda43adfc..f747804784 100644 --- a/lib/render/backend/wlroots/egl_backend.h +++ b/lib/render/backend/wlroots/egl_backend.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include "egl_helpers.h" #include "egl_output.h" diff --git a/lib/render/backend/wlroots/qpainter_backend.h b/lib/render/backend/wlroots/qpainter_backend.h index 0c95022cfc..80ab23a660 100644 --- a/lib/render/backend/wlroots/qpainter_backend.h +++ b/lib/render/backend/wlroots/qpainter_backend.h @@ -10,7 +10,7 @@ #include "render/qpainter/backend.h" #include "render/qpainter/scene.h" -#include +#include namespace KWin::render::backend::wlroots { diff --git a/lib/render/backend/wlroots/wlr_helpers.h b/lib/render/backend/wlroots/wlr_helpers.h index 0be82a717d..e1506e8c2a 100644 --- a/lib/render/backend/wlroots/wlr_helpers.h +++ b/lib/render/backend/wlroots/wlr_helpers.h @@ -5,7 +5,7 @@ */ #pragma once -#include "config-kwin.h" +#include "config-como.h" #include "base/wayland/output_transform.h" #include "wlr_includes.h" diff --git a/lib/render/backend/wlroots/wlr_includes.h b/lib/render/backend/wlroots/wlr_includes.h index 92944e7609..f151ac8589 100644 --- a/lib/render/backend/wlroots/wlr_includes.h +++ b/lib/render/backend/wlroots/wlr_includes.h @@ -5,7 +5,7 @@ */ #pragma once -#include "config-kwin.h" +#include "config-como.h" // Must be included before wlr/render/gles2.h #include diff --git a/lib/render/backend/x11/glx_context_attribute_builder.h b/lib/render/backend/x11/glx_context_attribute_builder.h index 95349838c0..050d87d378 100644 --- a/lib/render/backend/x11/glx_context_attribute_builder.h +++ b/lib/render/backend/x11/glx_context_attribute_builder.h @@ -6,11 +6,12 @@ #pragma once #include "render/gl/context_attribute_builder.h" +#include namespace KWin::render::backend::x11 { -class KWIN_EXPORT glx_context_attribute_builder : public gl::context_attribute_builder +class COMO_EXPORT glx_context_attribute_builder : public gl::context_attribute_builder { public: std::vector build() const override; diff --git a/lib/render/backend/x11/non_composited_outline.h b/lib/render/backend/x11/non_composited_outline.h index 2915ece954..acb51651de 100644 --- a/lib/render/backend/x11/non_composited_outline.h +++ b/lib/render/backend/x11/non_composited_outline.h @@ -8,12 +8,12 @@ #include "base/x11/data.h" #include "base/x11/xcb/window.h" #include "render/outline.h" -#include +#include namespace KWin::render::backend::x11 { -class KWIN_EXPORT non_composited_outline : public outline_visual +class COMO_EXPORT non_composited_outline : public outline_visual { public: non_composited_outline(base::x11::data const& data, render::outline* outline); diff --git a/lib/render/compositor_qobject.h b/lib/render/compositor_qobject.h index 9b6ef9ebbf..b5dfc52137 100644 --- a/lib/render/compositor_qobject.h +++ b/lib/render/compositor_qobject.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -15,7 +15,7 @@ namespace KWin::render { -class KWIN_EXPORT compositor_qobject : public QObject +class COMO_EXPORT compositor_qobject : public QObject { Q_OBJECT public: diff --git a/lib/render/cursor.h b/lib/render/cursor.h index d7f744dcf7..de954719d0 100644 --- a/lib/render/cursor.h +++ b/lib/render/cursor.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -15,7 +15,7 @@ namespace KWin::render { -class KWIN_EXPORT cursor_qobject : public QObject +class COMO_EXPORT cursor_qobject : public QObject { Q_OBJECT Q_SIGNALS: diff --git a/lib/render/dbus/compositing.h b/lib/render/dbus/compositing.h index 8ad6792b95..be8360fde1 100644 --- a/lib/render/dbus/compositing.h +++ b/lib/render/dbus/compositing.h @@ -6,7 +6,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "render/compositor_qobject.h" #include "render/types.h" @@ -33,7 +33,7 @@ struct compositing_integration { std::function reinit; }; -class KWIN_EXPORT compositing_qobject : public QObject +class COMO_EXPORT compositing_qobject : public QObject { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Compositing") diff --git a/lib/render/effect/basic_effect_loader.h b/lib/render/effect/basic_effect_loader.h index 7d6ac97a16..cf65a30ca6 100644 --- a/lib/render/effect/basic_effect_loader.h +++ b/lib/render/effect/basic_effect_loader.h @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "render/types.h" #include "utils/flags.h" @@ -36,7 +36,7 @@ namespace render * to be queried at the same time. Thus the idea is to have one implementation per type and one * implementation which makes use of all of them and combines the loading. */ -class KWIN_EXPORT basic_effect_loader : public QObject +class COMO_EXPORT basic_effect_loader : public QObject { Q_OBJECT public: diff --git a/lib/render/effect/frame.cpp b/lib/render/effect/frame.cpp index 51e75dea06..e6fb17f8ad 100644 --- a/lib/render/effect/frame.cpp +++ b/lib/render/effect/frame.cpp @@ -5,7 +5,7 @@ */ #include "frame.h" -#include +#include #include #include @@ -38,7 +38,7 @@ effect_frame_quick_scene::effect_frame_quick_scene(EffectFrameStyle style, break; } - const QString defaultPath = QStringLiteral(KWIN_NAME "/frames/plasma/frame_%1.qml").arg(name); + const QString defaultPath = QStringLiteral("como/frames/plasma/frame_%1.qml").arg(name); // TODO read from kwinApp()->config() "QmlPath" like Outline/OnScreenNotification // *if* someone really needs this to be configurable. const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, defaultPath); diff --git a/lib/render/effect/frame.h b/lib/render/effect/frame.h index e1f4246b30..192279fa20 100644 --- a/lib/render/effect/frame.h +++ b/lib/render/effect/frame.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -98,7 +98,7 @@ class effect_frame_quick_scene : public OffscreenQuickScene qreal m_crossFadeProgress = 0.0; }; -class KWIN_EXPORT effect_frame_impl : public QObject, public EffectFrame +class COMO_EXPORT effect_frame_impl : public QObject, public EffectFrame { Q_OBJECT public: diff --git a/lib/render/effect/interface/anidata_p.h b/lib/render/effect/interface/anidata_p.h index 6b0ffaf4a3..8feb9357ad 100644 --- a/lib/render/effect/interface/anidata_p.h +++ b/lib/render/effect/interface/anidata_p.h @@ -14,6 +14,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "time_line.h" #include "render/gl/interface/utils.h" +#include #include #include @@ -50,7 +51,7 @@ class PreviousWindowPixmapLock }; typedef QSharedPointer PreviousWindowPixmapLockPtr; -class KWIN_EXPORT AniData +class COMO_EXPORT AniData { public: AniData(); diff --git a/lib/render/effect/interface/animation_effect.h b/lib/render/effect/interface/animation_effect.h index b5e67bb145..2bcf2e0463 100644 --- a/lib/render/effect/interface/animation_effect.h +++ b/lib/render/effect/interface/animation_effect.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include @@ -22,7 +22,7 @@ namespace KWin { -class KWIN_EXPORT FPx2 +class COMO_EXPORT FPx2 { public: FPx2() @@ -192,7 +192,7 @@ class AnimationEffectPrivate; * * @since 4.8 */ -class KWIN_EXPORT AnimationEffect : public OffscreenEffect +class COMO_EXPORT AnimationEffect : public OffscreenEffect { Q_OBJECT public: diff --git a/lib/render/effect/interface/effect.h b/lib/render/effect/interface/effect.h index d52436b261..b56cf4298d 100644 --- a/lib/render/effect/interface/effect.h +++ b/lib/render/effect/interface/effect.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -92,7 +92,7 @@ class WindowQuadList; * * There is in general no need to call the matching doneCurrent method. */ -class KWIN_EXPORT Effect : public QObject +class COMO_EXPORT Effect : public QObject { Q_OBJECT public: diff --git a/lib/render/effect/interface/effect_frame.h b/lib/render/effect/interface/effect_frame.h index 37fb1be5d7..49f5bffb07 100644 --- a/lib/render/effect/interface/effect_frame.h +++ b/lib/render/effect/interface/effect_frame.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -25,7 +25,7 @@ class GLShader; * another that doesn't. * It is recommended to use this class whenever displaying text. */ -class KWIN_EXPORT EffectFrame +class COMO_EXPORT EffectFrame { public: EffectFrame(); diff --git a/lib/render/effect/interface/effect_plugin_factory.h b/lib/render/effect/interface/effect_plugin_factory.h index c7ea1b16a3..3d57bfd0fa 100644 --- a/lib/render/effect/interface/effect_plugin_factory.h +++ b/lib/render/effect/interface/effect_plugin_factory.h @@ -5,8 +5,8 @@ */ #pragma once -#include -#include +#include +#include #include @@ -18,7 +18,7 @@ class Effect; /** * Prefer the KWIN_EFFECT_FACTORY macros. */ -class KWIN_EXPORT EffectPluginFactory : public KPluginFactory +class COMO_EXPORT EffectPluginFactory : public KPluginFactory { Q_OBJECT public: @@ -54,7 +54,7 @@ class KWIN_EXPORT EffectPluginFactory : public KPluginFactory virtual KWin::Effect* createEffect() const = 0; }; -#define EffectPluginFactory_iid "org.kde.kwin.EffectPluginFactory" KWIN_VERSION_STRING +#define EffectPluginFactory_iid "org.kde.kwin.EffectPluginFactory" COMO_VERSION_STRING #define KWIN_PLUGIN_FACTORY_NAME KPLUGINFACTORY_PLUGIN_CLASS_INTERNAL_NAME /** diff --git a/lib/render/effect/interface/effect_screen.h b/lib/render/effect/interface/effect_screen.h index f46fc910df..00d8c56869 100644 --- a/lib/render/effect/interface/effect_screen.h +++ b/lib/render/effect/interface/effect_screen.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include @@ -15,7 +15,7 @@ namespace KWin /** * The EffectScreen class represents a screen used by/for Effect classes. */ -class KWIN_EXPORT EffectScreen : public QObject +class COMO_EXPORT EffectScreen : public QObject { Q_OBJECT Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) diff --git a/lib/render/effect/interface/effect_togglable_state.h b/lib/render/effect/interface/effect_togglable_state.h index 60dfeb2ef1..023bcde9d7 100644 --- a/lib/render/effect/interface/effect_togglable_state.h +++ b/lib/render/effect/interface/effect_togglable_state.h @@ -6,7 +6,7 @@ #pragma once -#include +#include #include #include @@ -22,7 +22,7 @@ class Effect; * This class helps us simplify this process, especially in the cases where we want activation to * happen progressively, like through a touch our touchpad events. */ -class KWIN_EXPORT EffectTogglableState : public QObject +class COMO_EXPORT EffectTogglableState : public QObject { Q_OBJECT public: @@ -100,7 +100,7 @@ class KWIN_EXPORT EffectTogglableState : public QObject friend class EffectTogglableTouchBorder; }; -class KWIN_EXPORT EffectTogglableGesture : public QObject +class COMO_EXPORT EffectTogglableGesture : public QObject { public: /** @@ -121,7 +121,7 @@ class KWIN_EXPORT EffectTogglableGesture : public QObject EffectTogglableState* const m_state; }; -class KWIN_EXPORT EffectTogglableTouchBorder : public QObject +class COMO_EXPORT EffectTogglableTouchBorder : public QObject { public: /** diff --git a/lib/render/effect/interface/effect_window.h b/lib/render/effect/interface/effect_window.h index 996c0c51f5..f79febeddf 100644 --- a/lib/render/effect/interface/effect_window.h +++ b/lib/render/effect/interface/effect_window.h @@ -6,7 +6,7 @@ #pragma once #include "render/effect/interface/effect_screen.h" -#include +#include #include #include @@ -46,7 +46,7 @@ class EffectWindowGroup * The purpose is to hide internal data and also to serve as a single * representation for the case when Client/Unmanaged becomes Deleted. */ -class KWIN_EXPORT EffectWindow : public QObject +class COMO_EXPORT EffectWindow : public QObject { Q_OBJECT Q_PROPERTY(QRect geometry READ frameGeometry) diff --git a/lib/render/effect/interface/effects_handler.h b/lib/render/effect/interface/effects_handler.h index 49efd774f0..0ae36a7139 100644 --- a/lib/render/effect/interface/effects_handler.h +++ b/lib/render/effect/interface/effects_handler.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include #include @@ -43,7 +43,7 @@ class WindowQuadList; * desktop or create a special input window to receive mouse and keyboard * events. */ -class KWIN_EXPORT EffectsHandler : public QObject +class COMO_EXPORT EffectsHandler : public QObject { Q_OBJECT Q_PROPERTY(KWin::win::subspace* currentDesktop READ currentDesktop WRITE setCurrentDesktop @@ -975,6 +975,6 @@ class KWIN_EXPORT EffectsHandler : public QObject /** * Pointer to the global EffectsHandler object. */ -extern KWIN_EXPORT EffectsHandler* effects; +extern COMO_EXPORT EffectsHandler* effects; } diff --git a/lib/render/effect/interface/offscreen_effect.h b/lib/render/effect/interface/offscreen_effect.h index e72724e63d..477b73c66d 100644 --- a/lib/render/effect/interface/offscreen_effect.h +++ b/lib/render/effect/interface/offscreen_effect.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include namespace KWin @@ -28,7 +28,7 @@ class OffscreenEffectPrivate; * If a window is redirected into offscreen texture, the apply() function will be * called to transform the offscreen texture. */ -class KWIN_EXPORT OffscreenEffect : public Effect +class COMO_EXPORT OffscreenEffect : public Effect { Q_OBJECT public: diff --git a/lib/render/effect/interface/offscreen_quick_view.h b/lib/render/effect/interface/offscreen_quick_view.h index 76b6084a21..b307949e88 100644 --- a/lib/render/effect/interface/offscreen_quick_view.h +++ b/lib/render/effect/interface/offscreen_quick_view.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include #include @@ -31,7 +31,7 @@ class GLTexture; * blitting is performed when we update our FBO to keep kwin's render loop * as fast as possible. */ -class KWIN_EXPORT OffscreenQuickView : public QObject +class COMO_EXPORT OffscreenQuickView : public QObject { Q_OBJECT public: @@ -143,7 +143,7 @@ class KWIN_EXPORT OffscreenQuickView : public QObject * The OffscreenQuickScene class extends OffscreenQuickView adding QML support. This will represent * a context powered by an engine */ -class KWIN_EXPORT OffscreenQuickScene : public OffscreenQuickView +class COMO_EXPORT OffscreenQuickScene : public OffscreenQuickView { public: explicit OffscreenQuickScene(ExportMode exportMode = ExportMode::Texture, bool alpha = true); diff --git a/lib/render/effect/interface/paint_clipper.h b/lib/render/effect/interface/paint_clipper.h index fa39fe0c6c..c6afbc7b33 100644 --- a/lib/render/effect/interface/paint_clipper.h +++ b/lib/render/effect/interface/paint_clipper.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include @@ -21,7 +21,7 @@ namespace KWin * is destroyed, the restriction will be removed. * Note that all painting code must use paintArea() to actually perform the clipping. */ -class KWIN_EXPORT PaintClipper +class COMO_EXPORT PaintClipper { public: /** @@ -60,7 +60,7 @@ class KWIN_EXPORT PaintClipper * } * @endcode */ - class KWIN_EXPORT Iterator + class COMO_EXPORT Iterator { public: Iterator(); diff --git a/lib/render/effect/interface/quick_scene.h b/lib/render/effect/interface/quick_scene.h index 814f6a20d5..927cbc3a50 100644 --- a/lib/render/effect/interface/quick_scene.h +++ b/lib/render/effect/interface/quick_scene.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include #include @@ -26,7 +26,7 @@ class QuickSceneEffectPrivate; * * @see QuickSceneEffect, OffscreenQuickView */ -class KWIN_EXPORT QuickSceneView : public OffscreenQuickView +class COMO_EXPORT QuickSceneView : public OffscreenQuickView { Q_OBJECT Q_PROPERTY(QuickSceneEffect* effect READ effect CONSTANT) @@ -72,7 +72,7 @@ public Q_SLOTS: * * @see QuickSceneView */ -class KWIN_EXPORT QuickSceneEffect : public Effect +class COMO_EXPORT QuickSceneEffect : public Effect { Q_OBJECT Q_PROPERTY(QuickSceneView* activeView READ activeView NOTIFY activeViewChanged) diff --git a/lib/render/effect/interface/time_line.h b/lib/render/effect/interface/time_line.h index 95885fbcdd..9bbd20a546 100644 --- a/lib/render/effect/interface/time_line.h +++ b/lib/render/effect/interface/time_line.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include #include @@ -19,7 +19,7 @@ namespace KWin /** * The TimeLine class is a helper for controlling animations. */ -class KWIN_EXPORT TimeLine +class COMO_EXPORT TimeLine { public: /** diff --git a/lib/render/effect/interface/window_quad.h b/lib/render/effect/interface/window_quad.h index 121d259058..1e0a929503 100644 --- a/lib/render/effect/interface/window_quad.h +++ b/lib/render/effect/interface/window_quad.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include #include @@ -127,7 +127,7 @@ class WindowVertex */ // NOTE: This class expects the (original) vertices to be in the clockwise order starting from // topleft. -class KWIN_EXPORT WindowQuad +class COMO_EXPORT WindowQuad { public: explicit WindowQuad(WindowQuadType type, int id = -1); @@ -165,7 +165,7 @@ class KWIN_EXPORT WindowQuad int quadID; }; -class KWIN_EXPORT WindowQuadList : public QVector +class COMO_EXPORT WindowQuadList : public QVector { public: WindowQuadList splitAtX(double x) const; diff --git a/lib/render/effect/setup_handler.h b/lib/render/effect/setup_handler.h index efc74925cf..5b9915d68d 100644 --- a/lib/render/effect/setup_handler.h +++ b/lib/render/effect/setup_handler.h @@ -8,9 +8,9 @@ #include #include -#include +#include -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX #include #endif @@ -187,7 +187,7 @@ void setup_handler(Handler& handler) &handler, &EffectsHandler::stackingOrderChanged); -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX auto qt_tabbox = ws->tabbox->qobject.get(); QObject::connect(qt_tabbox, &win::tabbox_qobject::tabbox_added, diff --git a/lib/render/effect_loader.h b/lib/render/effect_loader.h index d021233a2c..e9a47aef60 100644 --- a/lib/render/effect_loader.h +++ b/lib/render/effect_loader.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "effect/basic_effect_loader.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -22,7 +22,7 @@ class EffectsHandler; namespace render { -class KWIN_EXPORT plugin_effect_loader : public basic_effect_loader +class COMO_EXPORT plugin_effect_loader : public basic_effect_loader { public: explicit plugin_effect_loader(KSharedConfig::Ptr config); @@ -47,7 +47,7 @@ class KWIN_EXPORT plugin_effect_loader : public basic_effect_loader QString m_pluginSubDirectory; }; -class KWIN_EXPORT effect_loader : public basic_effect_loader +class COMO_EXPORT effect_loader : public basic_effect_loader { public: template diff --git a/lib/render/effects.h b/lib/render/effects.h index 0fd1d1e3eb..dd56311580 100644 --- a/lib/render/effects.h +++ b/lib/render/effects.h @@ -44,7 +44,7 @@ namespace KWin::render { /// Implements all QObject-specific functioanlity of EffectsHandler. -class KWIN_EXPORT effects_handler_wrap : public EffectsHandler +class COMO_EXPORT effects_handler_wrap : public EffectsHandler { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Effects") @@ -286,7 +286,7 @@ class effects_handler_impl : public effects_handler_wrap bool animationsSupported() const override { - static const QByteArray forceEnvVar = qgetenv("KWIN_EFFECTS_FORCE_ANIMATIONS"); + static const QByteArray forceEnvVar = qgetenv("COMO_EFFECTS_FORCE_ANIMATIONS"); if (!forceEnvVar.isEmpty()) { static const int forceValue = forceEnvVar.toInt(); return forceValue == 1; @@ -746,7 +746,7 @@ class effects_handler_impl : public effects_handler_wrap void setTabBoxWindow([[maybe_unused]] EffectWindow* w) override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX std::visit(overload{[&, this](auto&& win) { if (win->control) { get_space().tabbox->set_current_client(win); @@ -758,7 +758,7 @@ class effects_handler_impl : public effects_handler_wrap QList currentTabBoxWindowList() const override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX const auto clients = get_space().tabbox->current_client_list(); QList ret; ret.reserve(clients.size()); @@ -775,28 +775,28 @@ class effects_handler_impl : public effects_handler_wrap void refTabBox() override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX get_space().tabbox->reference(); #endif } void unrefTabBox() override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX get_space().tabbox->unreference(); #endif } void closeTabBox() override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX get_space().tabbox->close(); #endif } EffectWindow* currentTabBoxWindow() const override { -#if KWIN_BUILD_TABBOX +#if COMO_BUILD_TABBOX if (auto win = get_space().tabbox->current_client()) { return std::visit(overload{[](auto&& win) { return win->render->effect.get(); }}, *win); } diff --git a/lib/render/gl/context_attribute_builder.h b/lib/render/gl/context_attribute_builder.h index 6d4d40275b..2d6f69280a 100644 --- a/lib/render/gl/context_attribute_builder.h +++ b/lib/render/gl/context_attribute_builder.h @@ -5,14 +5,14 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::render::gl { -class KWIN_EXPORT context_attribute_builder +class COMO_EXPORT context_attribute_builder { public: virtual ~context_attribute_builder() diff --git a/lib/render/gl/egl_context_attribute_builder.h b/lib/render/gl/egl_context_attribute_builder.h index fcf5f215ce..408562217f 100644 --- a/lib/render/gl/egl_context_attribute_builder.h +++ b/lib/render/gl/egl_context_attribute_builder.h @@ -7,18 +7,18 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "context_attribute_builder.h" -#include "kwin_export.h" +#include "como_export.h" namespace KWin::render::gl { -class KWIN_EXPORT egl_context_attribute_builder : public context_attribute_builder +class COMO_EXPORT egl_context_attribute_builder : public context_attribute_builder { public: std::vector build() const override; }; -class KWIN_EXPORT egl_gles_context_attribute_builder : public context_attribute_builder +class COMO_EXPORT egl_gles_context_attribute_builder : public context_attribute_builder { public: std::vector build() const override; diff --git a/lib/render/gl/interface/framebuffer.h b/lib/render/gl/interface/framebuffer.h index 76af4dc82e..ec9b9f2827 100644 --- a/lib/render/gl/interface/framebuffer.h +++ b/lib/render/gl/interface/framebuffer.h @@ -7,8 +7,8 @@ */ #pragma once +#include #include -#include #include #include @@ -30,7 +30,7 @@ void cleanupGL(); * Framebuffer object enables you to render onto a texture. This texture can later be used to e.g. * do post-processing of the scene. */ -class KWIN_EXPORT GLFramebuffer : public render::framebuffer +class COMO_EXPORT GLFramebuffer : public render::framebuffer { public: GLFramebuffer() = default; diff --git a/lib/render/gl/interface/platform.h b/lib/render/gl/interface/platform.h index 50ed218745..dc1f0a72db 100644 --- a/lib/render/gl/interface/platform.h +++ b/lib/render/gl/interface/platform.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include #include @@ -151,7 +151,7 @@ enum class gl_interface { glx, }; -class KWIN_EXPORT GLPlatform +class COMO_EXPORT GLPlatform { public: ~GLPlatform(); diff --git a/lib/render/gl/interface/shader.h b/lib/render/gl/interface/shader.h index 718f90763d..87b0760603 100644 --- a/lib/render/gl/interface/shader.h +++ b/lib/render/gl/interface/shader.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include #include #include @@ -22,7 +22,7 @@ class QMatrix4x4; namespace KWin { -class KWIN_EXPORT GLShader +class COMO_EXPORT GLShader { public: enum Flags { diff --git a/lib/render/gl/interface/shader_manager.h b/lib/render/gl/interface/shader_manager.h index 926237d5b2..ea6b94723d 100644 --- a/lib/render/gl/interface/shader_manager.h +++ b/lib/render/gl/interface/shader_manager.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include #include #include @@ -42,7 +42,7 @@ Q_DECLARE_FLAGS(ShaderTraits, ShaderTrait) * @author Martin Gräßlin * @since 4.7 */ -class KWIN_EXPORT ShaderManager +class COMO_EXPORT ShaderManager { public: /** @@ -183,7 +183,7 @@ class KWIN_EXPORT ShaderManager * * @since 4.10 */ -class KWIN_EXPORT ShaderBinder +class COMO_EXPORT ShaderBinder { public: /** diff --git a/lib/render/gl/interface/texture.h b/lib/render/gl/interface/texture.h index 1a54d3afdf..c974d149f4 100644 --- a/lib/render/gl/interface/texture.h +++ b/lib/render/gl/interface/texture.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include #include #include @@ -33,7 +33,7 @@ class GLTexturePrivate; enum TextureCoordinateType { NormalizedCoordinates = 0, UnnormalizedCoordinates }; -class KWIN_EXPORT GLTexture +class COMO_EXPORT GLTexture { public: GLTexture(); diff --git a/lib/render/gl/interface/texture_p.h b/lib/render/gl/interface/texture_p.h index 364b3da26d..5ca15fb0da 100644 --- a/lib/render/gl/interface/texture_p.h +++ b/lib/render/gl/interface/texture_p.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include +#include #include #include @@ -22,7 +22,7 @@ namespace KWin // forward declarations class GLVertexBuffer; -class KWIN_EXPORT GLTexturePrivate : public QSharedData +class COMO_EXPORT GLTexturePrivate : public QSharedData { public: GLTexturePrivate(); diff --git a/lib/render/gl/interface/utils.h b/lib/render/gl/interface/utils.h index 8062623c9d..3a73f82995 100644 --- a/lib/render/gl/interface/utils.h +++ b/lib/render/gl/interface/utils.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include #include #include @@ -20,19 +20,19 @@ namespace KWin // well as checking for GL version and extensions // Note that GL context has to be created by the time this function is called typedef void (*resolveFuncPtr)(); -void KWIN_EXPORT initGL(const std::function& resolveFunction); +void COMO_EXPORT initGL(const std::function& resolveFunction); // Cleans up all resources hold by the GL Context -void KWIN_EXPORT cleanupGL(); +void COMO_EXPORT cleanupGL(); -bool KWIN_EXPORT hasGLVersion(int major, int minor, int release = 0); +bool COMO_EXPORT hasGLVersion(int major, int minor, int release = 0); // use for both OpenGL and GLX extensions -bool KWIN_EXPORT hasGLExtension(const QByteArray& extension); +bool COMO_EXPORT hasGLExtension(const QByteArray& extension); -QString KWIN_EXPORT formatGLError(GLenum err); +QString COMO_EXPORT formatGLError(GLenum err); // detect OpenGL error (add to various places in code to pinpoint the place) -bool KWIN_EXPORT checkGLError(const char* txt); +bool COMO_EXPORT checkGLError(const char* txt); -QList KWIN_EXPORT openGLExtensions(); +QList COMO_EXPORT openGLExtensions(); } diff --git a/lib/render/gl/interface/utils_funcs.h b/lib/render/gl/interface/utils_funcs.h index 3b2828dda1..1977d458e2 100644 --- a/lib/render/gl/interface/utils_funcs.h +++ b/lib/render/gl/interface/utils_funcs.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include #include #include @@ -28,7 +28,7 @@ namespace KWin { typedef void (*resolveFuncPtr)(); -void KWIN_EXPORT +void COMO_EXPORT glResolveFunctions(const std::function& resolveFunction); // GL_ARB_robustness / GL_EXT_robustness @@ -44,8 +44,8 @@ using glReadnPixels_func = void (*)(GLint x, using glGetnUniformfv_func = void (*)(GLuint program, GLint location, GLsizei bufSize, GLfloat* params); -extern KWIN_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; -extern KWIN_EXPORT glReadnPixels_func glReadnPixels; -extern KWIN_EXPORT glGetnUniformfv_func glGetnUniformfv; +extern COMO_EXPORT glGetGraphicsResetStatus_func glGetGraphicsResetStatus; +extern COMO_EXPORT glReadnPixels_func glReadnPixels; +extern COMO_EXPORT glGetnUniformfv_func glGetnUniformfv; } diff --git a/lib/render/gl/interface/vertex_buffer.h b/lib/render/gl/interface/vertex_buffer.h index c73a5a56a2..0dea2e4450 100644 --- a/lib/render/gl/interface/vertex_buffer.h +++ b/lib/render/gl/interface/vertex_buffer.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include #include #include @@ -60,7 +60,7 @@ struct GLVertexAttrib { * @author Martin Gräßlin * @since 4.6 */ -class KWIN_EXPORT GLVertexBuffer +class COMO_EXPORT GLVertexBuffer { public: /** diff --git a/lib/render/options.h b/lib/render/options.h index 63c98fea5d..4cfe068936 100644 --- a/lib/render/options.h +++ b/lib/render/options.h @@ -9,7 +9,7 @@ #include "x11/types.h" #include "base/types.h" -#include "kwin_export.h" +#include "como_export.h" #include @@ -18,7 +18,7 @@ namespace KWin::render class settings; -class KWIN_EXPORT options_qobject : public QObject +class COMO_EXPORT options_qobject : public QObject { Q_OBJECT @@ -147,7 +147,7 @@ class KWIN_EXPORT options_qobject : public QObject friend class options; }; -class KWIN_EXPORT options +class COMO_EXPORT options { public: using hidden_preview_t = x11::hidden_preview; diff --git a/lib/render/outline.cpp b/lib/render/outline.cpp index 41262cf3fa..42b00d15b4 100644 --- a/lib/render/outline.cpp +++ b/lib/render/outline.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "outline.h" #include "base/logging.h" -#include "config-kwin.h" +#include "config-como.h" #include #include @@ -145,7 +145,7 @@ void composited_outline_visual::show() const QString fileName = QStandardPaths::locate( QStandardPaths::GenericDataLocation, config.main->group(QStringLiteral("Outline")) - .readEntry("QmlPath", QStringLiteral(KWIN_NAME "/outline/plasma/outline.qml"))); + .readEntry("QmlPath", QStringLiteral("como/outline/plasma/outline.qml"))); if (fileName.isEmpty()) { qCDebug(KWIN_CORE) << "Could not locate outline.qml"; return; diff --git a/lib/render/outline.h b/lib/render/outline.h index df31f8f537..4f97f6f547 100644 --- a/lib/render/outline.h +++ b/lib/render/outline.h @@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include "types.h" #include "base/config.h" -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -36,7 +36,7 @@ using outline_visual_factory = std::function()>; * @author Arthur Arlt * @since 4.7 */ -class KWIN_EXPORT outline : public QObject +class COMO_EXPORT outline : public QObject { Q_OBJECT Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged) @@ -145,7 +145,7 @@ private Q_SLOTS: outline_visual_factory visual_factory; }; -class KWIN_EXPORT outline_visual +class COMO_EXPORT outline_visual { public: outline_visual(render::outline* outline); @@ -161,7 +161,7 @@ class KWIN_EXPORT outline_visual render::outline* m_outline; }; -class KWIN_EXPORT composited_outline_visual : public outline_visual +class COMO_EXPORT composited_outline_visual : public outline_visual { public: composited_outline_visual(render::outline* outline, QQmlEngine& engine, base::config& config); diff --git a/lib/render/post/color_correct_dbus_interface.h b/lib/render/post/color_correct_dbus_interface.h index 7b80976dce..642015ee0f 100644 --- a/lib/render/post/color_correct_dbus_interface.h +++ b/lib/render/post/color_correct_dbus_interface.h @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "render/types.h" #include @@ -33,7 +33,7 @@ struct color_correct_dbus_integration { night_color_data const& data; }; -class KWIN_EXPORT color_correct_dbus_interface : public QObject, public QDBusContext +class COMO_EXPORT color_correct_dbus_interface : public QObject, public QDBusContext { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.ColorCorrect") diff --git a/lib/render/post/kconfig/color_correct_settings.kcfgc b/lib/render/post/kconfig/color_correct_settings.kcfgc index ea7c1bdc16..ec0c79c631 100644 --- a/lib/render/post/kconfig/color_correct_settings.kcfgc +++ b/lib/render/post/kconfig/color_correct_settings.kcfgc @@ -8,6 +8,6 @@ ClassName=Settings Singleton=true Mutators=true # needed for night_color_mode -IncludeFiles=render/types.h,kwin_export.h +IncludeFiles=render/types.h,como_export.h UseEnumTypes=true -Visibility=KWIN_EXPORT +Visibility=COMO_EXPORT diff --git a/lib/render/post/night_color_setup.h b/lib/render/post/night_color_setup.h index bfe6a6f238..0c7dde0d6b 100644 --- a/lib/render/post/night_color_setup.h +++ b/lib/render/post/night_color_setup.h @@ -5,7 +5,7 @@ */ #pragma once -#include "config-kwin.h" +#include "config-como.h" #include #include @@ -17,7 +17,7 @@ template void init_night_color_shortcuts(Input& input, NightColor& manager) { auto toggleAction = new QAction(manager.qobject.get()); - toggleAction->setProperty("componentName", QStringLiteral(KWIN_NAME)); + toggleAction->setProperty("componentName", "kwin"); toggleAction->setObjectName(QStringLiteral("Toggle Night Color")); toggleAction->setText(i18n("Toggle Night Light")); diff --git a/lib/render/post/suncalc.h b/lib/render/post/suncalc.h index 119c192f7f..8c7316de8d 100644 --- a/lib/render/post/suncalc.h +++ b/lib/render/post/suncalc.h @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -22,7 +22,7 @@ namespace KWin::render::post * @since 5.12 */ -KWIN_EXPORT QPair calculate_sun_timings(const QDateTime& dateTime, +COMO_EXPORT QPair calculate_sun_timings(const QDateTime& dateTime, double latitude, double longitude, bool at_morning); diff --git a/lib/render/singleton_interface.h b/lib/render/singleton_interface.h index 2bdb56c085..fbd6fc28bf 100644 --- a/lib/render/singleton_interface.h +++ b/lib/render/singleton_interface.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include @@ -27,7 +27,7 @@ class basic_thumbnail_item; class compositor_qobject; /// Only for exceptional use in environments without dependency injection support (e.g. Qt plugins). -struct KWIN_EXPORT singleton_interface { +struct COMO_EXPORT singleton_interface { static render::compositor_qobject* compositor; static EffectsHandler* effects; static std::function supports_surfaceless_context; diff --git a/lib/render/x11/compositor_selection_owner.h b/lib/render/x11/compositor_selection_owner.h index 4f94b72a98..edf76e8948 100644 --- a/lib/render/x11/compositor_selection_owner.h +++ b/lib/render/x11/compositor_selection_owner.h @@ -6,14 +6,14 @@ #pragma once #include "base/x11/selection_owner.h" -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::render::x11 { -class KWIN_EXPORT compositor_selection_owner : public base::x11::selection_owner +class COMO_EXPORT compositor_selection_owner : public base::x11::selection_owner { Q_OBJECT public: diff --git a/lib/render/xrender/utils.h b/lib/render/xrender/utils.h index 0a3da67db5..c53f2a0312 100644 --- a/lib/render/xrender/utils.h +++ b/lib/render/xrender/utils.h @@ -6,7 +6,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -23,10 +23,10 @@ namespace KWin /** * dumps a QColor into a xcb_render_color_t */ -KWIN_EXPORT xcb_render_color_t preMultiply(const QColor& c, float opacity = 1.0); +COMO_EXPORT xcb_render_color_t preMultiply(const QColor& c, float opacity = 1.0); /** @internal */ -class KWIN_EXPORT XRenderPictureData : public QSharedData +class COMO_EXPORT XRenderPictureData : public QSharedData { public: explicit XRenderPictureData(xcb_render_picture_t pic = XCB_RENDER_PICTURE_NONE); @@ -45,7 +45,7 @@ class KWIN_EXPORT XRenderPictureData : public QSharedData * convenience constructors and freeing of resources. * It should otherwise act exactly like the Picture type. */ -class KWIN_EXPORT XRenderPicture +class COMO_EXPORT XRenderPicture { public: explicit XRenderPicture(xcb_render_picture_t pic = XCB_RENDER_PICTURE_NONE); @@ -58,7 +58,7 @@ class KWIN_EXPORT XRenderPicture QExplicitlySharedDataPointer d; }; -class KWIN_EXPORT XFixesRegion +class COMO_EXPORT XFixesRegion { public: explicit XFixesRegion(const QRegion& region); @@ -100,12 +100,12 @@ inline XFixesRegion::operator xcb_xfixes_region_t() * Call and Use, the PixelPicture will stay, but may change it's opacity meanwhile. It's NOT * threadsafe either */ -KWIN_EXPORT XRenderPicture xRenderBlendPicture(double opacity); +COMO_EXPORT XRenderPicture xRenderBlendPicture(double opacity); /** * Creates a 1x1 Picture filled with c */ -KWIN_EXPORT XRenderPicture xRenderFill(const xcb_render_color_t& c); -KWIN_EXPORT XRenderPicture xRenderFill(const QColor& c); +COMO_EXPORT XRenderPicture xRenderFill(const xcb_render_color_t& c); +COMO_EXPORT XRenderPicture xRenderFill(const QColor& c); /** * Allows to render a window into a (transparent) pixmap @@ -113,7 +113,7 @@ KWIN_EXPORT XRenderPicture xRenderFill(const QColor& c); * NOTICE: it may be 0 * NOTICE: when done call setXRenderWindowOffscreen(false) to continue normal render process */ -KWIN_EXPORT void setXRenderOffscreen(bool b); +COMO_EXPORT void setXRenderOffscreen(bool b); /** * Allows to define a persistent effect member as render target @@ -121,51 +121,51 @@ KWIN_EXPORT void setXRenderOffscreen(bool b); * NOTICE: do NOT call setXRenderOffscreen(true) in addition! * NOTICE: do not forget to xRenderPopTarget once you're done to continue the normal render process */ -KWIN_EXPORT void xRenderPushTarget(XRenderPicture* pic); -KWIN_EXPORT void xRenderPopTarget(); +COMO_EXPORT void xRenderPushTarget(XRenderPicture* pic); +COMO_EXPORT void xRenderPopTarget(); /** * Whether windows are currently rendered into an offscreen target buffer */ -KWIN_EXPORT bool xRenderOffscreen(); +COMO_EXPORT bool xRenderOffscreen(); /** * The offscreen buffer as set by the renderer because of setXRenderWindowOffscreen(true) */ -KWIN_EXPORT xcb_render_picture_t xRenderOffscreenTarget(); +COMO_EXPORT xcb_render_picture_t xRenderOffscreenTarget(); -KWIN_EXPORT QImage xrender_picture_to_image(xcb_render_picture_t source, QRect const& geometry); +COMO_EXPORT QImage xrender_picture_to_image(xcb_render_picture_t source, QRect const& geometry); /** * NOTICE: HANDS OFF!!! * scene_setXRenderWindowOffscreenTarget() is ONLY to be used by the renderer - DO NOT TOUCH! */ -KWIN_EXPORT void scene_setXRenderOffscreenTarget(xcb_render_picture_t pix); +COMO_EXPORT void scene_setXRenderOffscreenTarget(xcb_render_picture_t pix); /** * scene_xRenderWindowOffscreenTarget() is used by the scene to figure the target set by an effect */ -KWIN_EXPORT XRenderPicture* scene_xRenderOffscreenTarget(); +COMO_EXPORT XRenderPicture* scene_xRenderOffscreenTarget(); namespace XRenderUtils { /** * @internal */ -KWIN_EXPORT void init(xcb_connection_t* connection, xcb_window_t rootWindow); +COMO_EXPORT void init(xcb_connection_t* connection, xcb_window_t rootWindow); /** * Returns the Xrender format that corresponds to the given visual ID. */ -KWIN_EXPORT xcb_render_pictformat_t findPictFormat(xcb_visualid_t visual); +COMO_EXPORT xcb_render_pictformat_t findPictFormat(xcb_visualid_t visual); /** * Returns the xcb_render_directformat_t for the given Xrender format. */ -KWIN_EXPORT const xcb_render_directformat_t* findPictFormatInfo(xcb_render_pictformat_t format); +COMO_EXPORT const xcb_render_directformat_t* findPictFormatInfo(xcb_render_pictformat_t format); /** * @internal */ -KWIN_EXPORT void cleanup(); +COMO_EXPORT void cleanup(); } } diff --git a/lib/script/CMakeLists.txt b/lib/script/CMakeLists.txt index 2d3c809d2a..02e8dec38a 100644 --- a/lib/script/CMakeLists.txt +++ b/lib/script/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later add_library(script SHARED) -add_library(kwinft::script ALIAS script) +add_library(como::script ALIAS script) target_link_libraries(script PUBLIC @@ -72,11 +72,11 @@ target_sources(script set_target_properties(script PROPERTIES VERSION ${CMAKE_PROJECT_VERSION} SOVERSION ${CMAKE_PROJECT_VERSION_MAJOR} - PREFIX libkwinft- + PREFIX libcomo- ) install(TARGETS script - EXPORT kwinft-export + EXPORT como-export LIBRARY NAMELINK_SKIP - FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kwinft/script + FILE_SET HEADERS DESTINATION ${KDE_INSTALL_INCLUDEDIR}/como/script ) diff --git a/lib/script/dbus_call.h b/lib/script/dbus_call.h index 793e548d3c..bf66e12a0e 100644 --- a/lib/script/dbus_call.h +++ b/lib/script/dbus_call.h @@ -5,7 +5,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include #include @@ -60,7 +60,7 @@ namespace KWin::scripting * } * @endcode */ -class KWIN_EXPORT dbus_call : public QObject +class COMO_EXPORT dbus_call : public QObject { Q_OBJECT Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged) diff --git a/lib/script/desktop_background_item.h b/lib/script/desktop_background_item.h index cc23ed9206..f8dd882e0e 100644 --- a/lib/script/desktop_background_item.h +++ b/lib/script/desktop_background_item.h @@ -18,7 +18,7 @@ namespace KWin * The desktop_background_item type is a convenience helper that represents the desktop * background on the specified screen, virtual desktop, and activity. */ -class KWIN_EXPORT desktop_background_item : public scripting::window_thumbnail_item +class COMO_EXPORT desktop_background_item : public scripting::window_thumbnail_item { Q_OBJECT Q_PROPERTY(QString outputName READ outputName WRITE setOutputName NOTIFY outputChanged) diff --git a/lib/script/effect.cpp b/lib/script/effect.cpp index e5a65c4441..5032bf6b40 100644 --- a/lib/script/effect.cpp +++ b/lib/script/effect.cpp @@ -203,10 +203,9 @@ bool effect::init(QString const& effectName, QString const& pathToScript, KShare m_scriptFile = pathToScript; // does the effect contain an KConfigXT file? - const QString kconfigXTFile - = QStandardPaths::locate(QStandardPaths::GenericDataLocation, - QLatin1String(KWIN_NAME "/effects/") + m_effectName - + QLatin1String("/contents/config/main.xml")); + const QString kconfigXTFile = QStandardPaths::locate( + QStandardPaths::GenericDataLocation, + QLatin1String("kwin/effects/") + m_effectName + QLatin1String("/contents/config/main.xml")); if (!kconfigXTFile.isNull()) { auto cg = config->group(QStringLiteral("Effect-%1").arg(m_effectName)); QFile xmlFile(kconfigXTFile); @@ -837,7 +836,7 @@ uint effect::addFragmentShader(ShaderTrait traits, const QString& fragmentShader m_engine->throwError(QStringLiteral("Failed to make OpenGL context current")); return 0; } - const QString shaderDir{QLatin1String(KWIN_NAME "/effects/") + m_effectName + const QString shaderDir{QLatin1String("kwin/effects/") + m_effectName + QLatin1String("/contents/shaders/")}; const QString fragment = fragmentShaderFile.isEmpty() ? QString{} diff --git a/lib/script/effect.h b/lib/script/effect.h index da11b6822f..27adab3905 100644 --- a/lib/script/effect.h +++ b/lib/script/effect.h @@ -9,7 +9,7 @@ #include "render/options.h" #include "scripting_logging.h" -#include +#include #include #include @@ -21,14 +21,14 @@ class KConfigLoader; namespace KWin { -KWIN_EXPORT Q_NAMESPACE +COMO_EXPORT Q_NAMESPACE class EffectsHandler; namespace scripting { -class KWIN_EXPORT effect : public KWin::AnimationEffect +class COMO_EXPORT effect : public KWin::AnimationEffect { Q_OBJECT Q_ENUMS(DataRole) diff --git a/lib/script/gesture_handler.h b/lib/script/gesture_handler.h index 81aaf5e360..6708badb7c 100644 --- a/lib/script/gesture_handler.h +++ b/lib/script/gesture_handler.h @@ -5,7 +5,7 @@ */ #pragma once -#include +#include #include @@ -26,7 +26,7 @@ namespace KWin::scripting * } * @endcode */ -class KWIN_EXPORT SwipeGestureHandler : public QObject, public QQmlParserStatus +class COMO_EXPORT SwipeGestureHandler : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) @@ -97,7 +97,7 @@ class KWIN_EXPORT SwipeGestureHandler : public QObject, public QQmlParserStatus * } * @endcode */ -class KWIN_EXPORT PinchGestureHandler : public QObject, public QQmlParserStatus +class COMO_EXPORT PinchGestureHandler : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/lib/script/options.h b/lib/script/options.h index 6de787db3f..556de13c8b 100644 --- a/lib/script/options.h +++ b/lib/script/options.h @@ -5,7 +5,7 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include "win/types.h" #include @@ -31,7 +31,7 @@ class options; namespace scripting { -class KWIN_EXPORT options : public QObject +class COMO_EXPORT options : public QObject { Q_OBJECT diff --git a/lib/script/output.h b/lib/script/output.h index a9571f548b..5fdc66e73c 100644 --- a/lib/script/output.h +++ b/lib/script/output.h @@ -5,14 +5,14 @@ */ #pragma once -#include "kwin_export.h" +#include "como_export.h" #include namespace KWin::scripting { -class KWIN_EXPORT output : public QObject +class COMO_EXPORT output : public QObject { Q_OBJECT public: diff --git a/lib/script/platform.cpp b/lib/script/platform.cpp index 974e12764f..aab3134c30 100644 --- a/lib/script/platform.cpp +++ b/lib/script/platform.cpp @@ -78,7 +78,7 @@ LoadScriptList platform_wrap::queryScriptsToLoad() } QMap pluginStates = KConfigGroup(config.main, "Plugins").entryMap(); - const QString scriptFolder = QStringLiteral(KWIN_NAME "/scripts/"); + const QString scriptFolder = QStringLiteral("kwin/scripts/"); const auto offers = KPackage::PackageLoader::self()->listPackages(QStringLiteral("KWin/Script"), scriptFolder); LoadScriptList scriptsToLoad; diff --git a/lib/script/platform.h b/lib/script/platform.h index d184b9622c..547c0809bc 100644 --- a/lib/script/platform.h +++ b/lib/script/platform.h @@ -22,7 +22,7 @@ #include "window_model.h" #include "window_thumbnail_item.h" -#include +#include #include #include