refactor: PortalInputCapture, fix a missed non compliant variable names
refactor: PortalInputCapture, more const args
This commit is contained in:
@ -24,9 +24,9 @@ PortalInputCapture::PortalInputCapture(EiScreen *screen, IEventQueue *events)
|
||||
m_glibMainLoop = g_main_loop_new(nullptr, true);
|
||||
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()
|
||||
@ -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);
|
||||
|
||||
@ -271,7 +273,9 @@ void PortalInputCapture::handleActivated(const XdpInputCaptureSession *, std::ui
|
||||
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);
|
||||
m_isActive = false;
|
||||
|
||||
@ -40,30 +40,34 @@ private:
|
||||
void handleSetPointerBarriers(const GObject *object, GAsyncResult *res);
|
||||
void handleSessionClosed(XdpSession *session);
|
||||
void handleDisabled(const XdpInputCaptureSession *session, const GVariant *option);
|
||||
void handleActivated(const XdpInputCaptureSession *session, std::uint32_t activationId, GVariant *options);
|
||||
void handleDeactivated(const XdpInputCaptureSession *session, std::uint32_t activationId, const GVariant *options);
|
||||
void handleActivated(const XdpInputCaptureSession *session, const std::uint32_t activationId, GVariant *options);
|
||||
void
|
||||
handleDeactivated(const XdpInputCaptureSession *session, const std::uint32_t activationId, const GVariant *options);
|
||||
void handleZonesChanged(XdpInputCaptureSession *session, const GVariant *options);
|
||||
|
||||
/// 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 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 void
|
||||
activated(const XdpInputCaptureSession *session, std::uint32_t activationId, GVariant *options, gpointer data)
|
||||
static void activated(
|
||||
const XdpInputCaptureSession *session, const std::uint32_t activationId, GVariant *options, const gpointer data
|
||||
)
|
||||
{
|
||||
static_cast<PortalInputCapture *>(data)->handleActivated(session, activationId, options);
|
||||
}
|
||||
static void
|
||||
deactivated(const XdpInputCaptureSession *session, std::uint32_t activationId, const GVariant *options, gpointer data)
|
||||
static void deactivated(
|
||||
const XdpInputCaptureSession *session, const std::uint32_t activationId, const GVariant *options,
|
||||
const gpointer data
|
||||
)
|
||||
{
|
||||
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);
|
||||
}
|
||||
@ -89,7 +93,7 @@ private:
|
||||
XdpPortal *m_portal = nullptr;
|
||||
XdpInputCaptureSession *m_session = nullptr;
|
||||
|
||||
std::map<Signal, guint> m_signals = {
|
||||
std::map<Signal, gulong> m_signals = {
|
||||
{Signal::SessionClosed, 0},
|
||||
{Signal::Disabled, 0},
|
||||
{Signal::Activated, 0},
|
||||
|
||||
Reference in New Issue
Block a user