diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2026-02-15 10:21:51 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2026-02-15 10:21:51 +0800 |
| commit | 1bbee573343063f4df284088dcd6577bfce0b95f (patch) | |
| tree | e17396ab800cb9aacba745c7856e183a49e2cd18 /src | |
| parent | e5b27d37e8f0d9caf10a8188aedf8028de887804 (diff) | |
fix: use correct log levels for clipboard permission messages
Use Log::INFO instead of Log::LOG (which doesn't exist) in DataDeviceWlr.cpp
and DataDevice.cpp. Also use the new Log::logger->log() style in XWM.cpp
instead of the deprecated Debug::log().
Diffstat (limited to 'src')
| -rw-r--r-- | src/protocols/DataDeviceWlr.cpp | 12 | ||||
| -rw-r--r-- | src/protocols/core/DataDevice.cpp | 16 | ||||
| -rw-r--r-- | src/xwayland/XWM.cpp | 8 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/protocols/DataDeviceWlr.cpp b/src/protocols/DataDeviceWlr.cpp index 262bc109..6cf343bd 100644 --- a/src/protocols/DataDeviceWlr.cpp +++ b/src/protocols/DataDeviceWlr.cpp @@ -28,10 +28,10 @@ CWLRDataOffer::CWLRDataOffer(SP<CZwlrDataControlOfferV1> resource_, SP<IDataSour const auto CLIENT = r->client(); const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_READ); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - LOGM(Log::LOG, "Clipboard read denied by permission manager for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard read denied by permission manager for client {:x}", (uintptr_t)CLIENT); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - LOGM(Log::LOG, "Clipboard read permission pending for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard read permission pending for client {:x}", (uintptr_t)CLIENT); return; } @@ -133,10 +133,10 @@ CWLRDataDevice::CWLRDataDevice(SP<CZwlrDataControlDeviceV1> resource_) : m_resou const auto CLIENT = r->client(); const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_WRITE); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - LOGM(Log::LOG, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - LOGM(Log::LOG, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); return; } @@ -160,10 +160,10 @@ CWLRDataDevice::CWLRDataDevice(SP<CZwlrDataControlDeviceV1> resource_) : m_resou const auto CLIENT = r->client(); const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_WRITE); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - LOGM(Log::LOG, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - LOGM(Log::LOG, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); return; } diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp index 5c170abf..d0ccd123 100644 --- a/src/protocols/core/DataDevice.cpp +++ b/src/protocols/core/DataDevice.cpp @@ -58,10 +58,10 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS const auto CLIENT = r->client(); const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_READ); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - LOGM(Log::LOG, "Clipboard read denied by permission manager for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard read denied by permission manager for client {:x}", (uintptr_t)CLIENT); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - LOGM(Log::LOG, "Clipboard read permission pending for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard read permission pending for client {:x}", (uintptr_t)CLIENT); const auto PROMISE = g_pDynamicPermissionManager->promiseFor(CLIENT, PERMISSION_TYPE_CLIPBOARD_READ); if (!PROMISE) { LOGM(Log::ERR, "BUG THIS: No promise for client permission for clipboard read"); @@ -75,7 +75,7 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS } if (r->result() != PERMISSION_RULE_ALLOW_MODE_ALLOW) { - LOGM(Log::LOG, "Clipboard read denied by user"); + LOGM(Log::INFO, "Clipboard read denied by user"); return; } @@ -84,7 +84,7 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS return; } - LOGM(Log::LOG, "Offer {:x} asks to send data from source {:x} (permission granted)", (uintptr_t)this, (uintptr_t)m_source.get()); + LOGM(Log::INFO, "Offer {:x} asks to send data from source {:x} (permission granted)", (uintptr_t)this, (uintptr_t)m_source.get()); if (!m_accepted) { LOGM(Log::WARN, "Offer was never accepted, sending accept first"); @@ -97,7 +97,7 @@ CWLDataOfferResource::CWLDataOfferResource(SP<CWlDataOffer> resource_, SP<IDataS return; } - LOGM(Log::LOG, "Offer {:x} asks to send data from source {:x}", (uintptr_t)this, (uintptr_t)m_source.get()); + LOGM(Log::INFO, "Offer {:x} asks to send data from source {:x}", (uintptr_t)this, (uintptr_t)m_source.get()); if (!m_accepted) { LOGM(Log::WARN, "Offer was never accepted, sending accept first"); @@ -300,10 +300,10 @@ CWLDataDeviceResource::CWLDataDeviceResource(SP<CWlDataDevice> resource_) : m_re const auto CLIENT = r->client(); const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_WRITE); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - LOGM(Log::LOG, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write denied by permission manager for client {:x}", (uintptr_t)CLIENT); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - LOGM(Log::LOG, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); + LOGM(Log::INFO, "Clipboard write permission pending for client {:x}", (uintptr_t)CLIENT); const auto PROMISE = g_pDynamicPermissionManager->promiseFor(CLIENT, PERMISSION_TYPE_CLIPBOARD_WRITE); if (!PROMISE) { LOGM(Log::ERR, "BUG THIS: No promise for client permission for clipboard write"); @@ -316,7 +316,7 @@ CWLDataDeviceResource::CWLDataDeviceResource(SP<CWlDataDevice> resource_) : m_re } if (r->result() != PERMISSION_RULE_ALLOW_MODE_ALLOW) { - LOGM(Log::LOG, "Clipboard write denied by user"); + LOGM(Log::INFO, "Clipboard write denied by user"); return; } diff --git a/src/xwayland/XWM.cpp b/src/xwayland/XWM.cpp index a896e222..66020e08 100644 --- a/src/xwayland/XWM.cpp +++ b/src/xwayland/XWM.cpp @@ -1284,10 +1284,10 @@ void CXWM::setClipboardToWayland(SXSelection& sel) { if (CLIENT && &sel == &m_clipboard) { const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_WRITE); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - Debug::log(LOG, "[xwm] Clipboard write denied by permission manager for XWayland"); + Log::logger->log(Log::INFO, "[xwm] Clipboard write denied by permission manager for XWayland"); return; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - Debug::log(LOG, "[xwm] Clipboard write permission pending for XWayland"); + Log::logger->log(Log::INFO, "[xwm] Clipboard write permission pending for XWayland"); // For now, deny clipboard access when permission is pending as XWayland doesn't support async operations // TODO: In the future, this could be enhanced to store the request and retry after permission is granted return; @@ -1539,10 +1539,10 @@ bool SXSelection::sendData(xcb_selection_request_event_t* e, std::string mime) { if (CLIENT) { const auto PERM = g_pDynamicPermissionManager->clientPermissionMode(CLIENT, PERMISSION_TYPE_CLIPBOARD_READ); if (PERM == PERMISSION_RULE_ALLOW_MODE_DENY) { - Debug::log(LOG, "[xwm] Clipboard read denied by permission manager for XWayland"); + Log::logger->log(Log::INFO, "[xwm] Clipboard read denied by permission manager for XWayland"); return false; } else if (PERM == PERMISSION_RULE_ALLOW_MODE_PENDING) { - Debug::log(LOG, "[xwm] Clipboard read permission pending for XWayland"); + Log::logger->log(Log::INFO, "[xwm] Clipboard read permission pending for XWayland"); // For now, deny clipboard access when permission is pending as XWayland doesn't support async operations // TODO: In the future, this could be enhanced to store the request and retry after permission is granted return false; |
