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

refactor: PortalInputCapture, fix a missed non compliant variable names

Browse source 
refactor: PortalInputCapture, more const args
This commit is contained in:
sithlord48 2025-06-20 11:20:37 -04:00 committed by Nick Bolton
parent a7a54ad8a7
commit 42cd01efd7
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,9 +24,9 @@ PortalInputCapture::PortalInputCapture(EiScreen *screen, IEventQueue *events)
m_glibMainLoop = g_main_loop_new(nullptr, true); m_glibMainLoop = g_main_loop_new(nullptr, true);
m_glibThread = new Thread(new TMethodJob<PortalInputCapture>(this, &PortalInputCapture::glibThread)); m_glibThread = new Thread(new TMethodJob<PortalInputCapture>(this, &PortalInputCapture::glibThread));
auto init_capture_cb = [](gpointer data) { return static_cast<PortalInputCapture *>(data)->initSession(); }; auto captureCallback = [](gpointer data) { return static_cast<PortalInputCapture *>(data)->initSession(); };
g_idle_add(init_capture_cb, this); g_idle_add(captureCallback, this);
} }
PortalInputCapture::~PortalInputCapture() PortalInputCapture::~PortalInputCapture()
@ -252,7 +252,9 @@ void PortalInputCapture::handleDisabled(const XdpInputCaptureSession *, const GV
); );
} }
void PortalInputCapture::handleActivated(const XdpInputCaptureSession *, std::uint32_t activationId, GVariant *options) void PortalInputCapture::handleActivated(
const XdpInputCaptureSession *, const std::uint32_t activationId, GVariant *options
)
{ {
LOG_DEBUG("portal cb activated, id=%d", activationId); LOG_DEBUG("portal cb activated, id=%d", activationId);
@ -271,7 +273,9 @@ void PortalInputCapture::handleActivated(const XdpInputCaptureSession *, std::ui
m_isActive = true; m_isActive = true;
} }
void PortalInputCapture::handleDeactivated(const XdpInputCaptureSession *, std::uint32_t activationId, const GVariant *) void PortalInputCapture::handleDeactivated(
const XdpInputCaptureSession *, const std::uint32_t activationId, const GVariant *
)
{ {
LOG_DEBUG("cb deactivated, id=%i", activationId); LOG_DEBUG("cb deactivated, id=%i", activationId);
m_isActive = false; m_isActive = false;

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

@ -40,30 +40,34 @@ private:
void handleSetPointerBarriers(const GObject *object, GAsyncResult *res); void handleSetPointerBarriers(const GObject *object, GAsyncResult *res);
void handleSessionClosed(XdpSession *session); void handleSessionClosed(XdpSession *session);
void handleDisabled(const XdpInputCaptureSession *session, const GVariant *option); void handleDisabled(const XdpInputCaptureSession *session, const GVariant *option);
void handleActivated(const XdpInputCaptureSession *session, std::uint32_t activationId, GVariant *options); void handleActivated(const XdpInputCaptureSession *session, const std::uint32_t activationId, GVariant *options);
void handleDeactivated(const XdpInputCaptureSession *session, std::uint32_t activationId, const GVariant *options); void
handleDeactivated(const XdpInputCaptureSession *session, const std::uint32_t activationId, const GVariant *options);
void handleZonesChanged(XdpInputCaptureSession *session, const GVariant *options); void handleZonesChanged(XdpInputCaptureSession *session, const GVariant *options);
/// g_signal_connect callback wrapper /// g_signal_connect callback wrapper
static void sessionClosed(XdpSession *session, gpointer data) static void sessionClosed(XdpSession *session, const gpointer data)
{ {
static_cast<PortalInputCapture *>(data)->handleSessionClosed(session); static_cast<PortalInputCapture *>(data)->handleSessionClosed(session);
} }
static void disabled(XdpInputCaptureSession *session, GVariant *options, gpointer data) static void disabled(const XdpInputCaptureSession *session, const GVariant *options, const gpointer data)
{ {
static_cast<PortalInputCapture *>(data)->handleDisabled(session, options); static_cast<PortalInputCapture *>(data)->handleDisabled(session, options);
} }
static void static void activated(
activated(const XdpInputCaptureSession *session, std::uint32_t activationId, GVariant *options, gpointer data) const XdpInputCaptureSession *session, const std::uint32_t activationId, GVariant *options, const gpointer data
)
{ {
static_cast<PortalInputCapture *>(data)->handleActivated(session, activationId, options); static_cast<PortalInputCapture *>(data)->handleActivated(session, activationId, options);
} }
static void static void deactivated(
deactivated(const XdpInputCaptureSession *session, std::uint32_t activationId, const GVariant *options, gpointer data) const XdpInputCaptureSession *session, const std::uint32_t activationId, const GVariant *options,
const gpointer data
)
{ {
static_cast<PortalInputCapture *>(data)->handleDeactivated(session, activationId, options); static_cast<PortalInputCapture *>(data)->handleDeactivated(session, activationId, options);
} }
static void zonesChanged(XdpInputCaptureSession *session, GVariant *options, gpointer data) static void zonesChanged(XdpInputCaptureSession *session, const GVariant *options, const gpointer data)
{ {
static_cast<PortalInputCapture *>(data)->handleZonesChanged(session, options); static_cast<PortalInputCapture *>(data)->handleZonesChanged(session, options);
} }
@ -89,7 +93,7 @@ private:
XdpPortal *m_portal = nullptr; XdpPortal *m_portal = nullptr;
XdpInputCaptureSession *m_session = nullptr; XdpInputCaptureSession *m_session = nullptr;
std::map<Signal, guint> m_signals = { std::map<Signal, gulong> m_signals = {
{Signal::SessionClosed, 0}, {Signal::SessionClosed, 0},
{Signal::Disabled, 0}, {Signal::Disabled, 0},
{Signal::Activated, 0}, {Signal::Activated, 0},