Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt to COMO screen locker change #8

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Adapt to COMO screen locker change #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ kcoreaddons_target_static_plugins(kwin_x11 NAMESPACE "kwin/effects/plugins")

add_executable(kwin_wayland main_wayland.cpp)
target_link_libraries(kwin_wayland
como::desktop-kde
como::desktop-kde-wl
como::script
como::wayland
como::xwayland
Expand Down
5 changes: 4 additions & 1 deletion main_wayland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
#include <como/base/wayland/app_singleton.h>
#include <como/base/wayland/xwl_platform.h>
#include <como/desktop/kde/platform.h>
#include <como/desktop/kde/screen_locker.h>
#include <como/render/shortcuts_init.h>
#include <como/script/platform.h>
#include <como/win/shortcuts_init.h>
Expand Down Expand Up @@ -247,7 +248,9 @@ int main(int argc, char* argv[])
base.process_environment.insert(QStringLiteral("WAYLAND_DISPLAY"), name.c_str());
}

base.server->init_screen_locker();
base.mod.space->mod.desktop->screen_locker
= std::make_unique<como::desktop::kde::screen_locker>(
*base.server, base.process_environment, parser.isSet(options.lockscreen));

if (base.operation_mode == como::base::operation_mode::xwayland) {
try {
Expand Down