smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Wrong cb_activated signature in input-capture

Browse source 
The options argument was missing so the argument data wasn't the right
one and the method cb_disabled was actually called on a GVariant*
instead on a PortalInputCapture*
This commit is contained in:
Gwilherm Folliot 2025-01-27 08:33:18 +01:00 committed by Chris Rizzitello
parent e2c3af4e5e
commit 9dcfb6cc9b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/platform/PortalInputCapture.cpp
View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
* SPDX-FileCopyrightText: (C) 2024 Symless Ltd. * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
* SPDX-FileCopyrightText: (C) 2022 Red Hat, Inc. * SPDX-FileCopyrightText: (C) 2022 Red Hat, Inc.
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@ -241,7 +242,7 @@ void PortalInputCapture::release(double x, double y)
is_active_ = false; is_active_ = false;
} }
void PortalInputCapture::cb_disabled(XdpInputCaptureSession *session) void PortalInputCapture::cb_disabled(XdpInputCaptureSession *session, GVariant *option)
{ {
LOG_DEBUG("portal cb disabled"); LOG_DEBUG("portal cb disabled");

7
src/lib/platform/PortalInputCapture.h
View file

@ -1,5 +1,6 @@
/* /*
* Deskflow -- mouse and keyboard sharing utility * Deskflow -- mouse and keyboard sharing utility
* SPDX-FileCopyrightText: (C) 2025 Deskflow Developers
* SPDX-FileCopyrightText: (C) 2024 Symless Ltd. * SPDX-FileCopyrightText: (C) 2024 Symless Ltd.
* SPDX-FileCopyrightText: (C) 2022 Red Hat, Inc. * SPDX-FileCopyrightText: (C) 2022 Red Hat, Inc.
* SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
@ -38,7 +39,7 @@ private:
void cb_init_input_capture_session(GObject *object, GAsyncResult *res); void cb_init_input_capture_session(GObject *object, GAsyncResult *res);
void cb_set_pointer_barriers(GObject *object, GAsyncResult *res); void cb_set_pointer_barriers(GObject *object, GAsyncResult *res);
void cb_session_closed(XdpSession *session); void cb_session_closed(XdpSession *session);
void cb_disabled(XdpInputCaptureSession *session); void cb_disabled(XdpInputCaptureSession *session, GVariant *option);
void cb_activated(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options); void cb_activated(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options);
void cb_deactivated(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options); void cb_deactivated(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options);
void cb_zones_changed(XdpInputCaptureSession *session, GVariant *options); void cb_zones_changed(XdpInputCaptureSession *session, GVariant *options);
@ -48,9 +49,9 @@ private:
{ {
reinterpret_cast<PortalInputCapture *>(data)->cb_session_closed(session); reinterpret_cast<PortalInputCapture *>(data)->cb_session_closed(session);
} }
static void cb_disabled_cb(XdpInputCaptureSession *session, gpointer data) static void cb_disabled_cb(XdpInputCaptureSession *session, GVariant *options, gpointer data)
{ {
reinterpret_cast<PortalInputCapture *>(data)->cb_disabled(session); reinterpret_cast<PortalInputCapture *>(data)->cb_disabled(session, options);
} }
static void static void
cb_activated_cb(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options, gpointer data) cb_activated_cb(XdpInputCaptureSession *session, std::uint32_t activation_id, GVariant *options, gpointer data)