summaryrefslogtreecommitdiff
path: root/src/protocols/SecurityContext.hpp
diff options
context:
space:
mode:
authorTom Englund <tomenglund26@gmail.com>2025-01-30 12:30:12 +0100
committerGitHub <noreply@github.com>2025-01-30 11:30:12 +0000
commit32c0fa2f2fe02254d5887b38cf2cffa72ddfd769 (patch)
tree60a59e586526384f4bd8ac94dd083ca4fe0e4122 /src/protocols/SecurityContext.hpp
parent7d1c78f4a3720b693fedeb5d4f2d3f4da37f7fd3 (diff)
core: begin using CFileDescriptor from hyprutils (#9122)
* config: make fd use CFileDescriptor make use of the new hyprutils CFileDescriptor instead of manual FD handling. * hyprctl: make fd use CFileDescriptor make use of the new hyprutils CFileDescriptor instead of manual FD handling. * ikeyboard: make fd use CFileDescriptor make use of the new CFileDescriptor instead of manual FD handling, also in sendKeymap remove dead code, it already early returns if keyboard isnt valid, and dont try to close the FD that ikeyboard owns. * core: make SHMFile functions use CFileDescriptor make SHMFile misc functions use CFileDescriptor and its associated usage in dmabuf and keyboard. * core: make explicit sync use CFileDescriptor begin using CFileDescriptor in explicit sync and its timelines and eglsync usage in opengl, there is still a bit left with manual handling that requires future aquamarine change aswell. * eventmgr: make fd and sockets use CFileDescriptor make use of the hyprutils CFileDescriptor instead of manual FD and socket handling and closing. * eventloopmgr: make timerfd use CFileDescriptor make the timerfd use CFileDescriptor instead of manual fd handling * opengl: make gbm fd use CFileDescriptor make the gbm rendernode fd use CFileDescriptor instead of manual fd handling * core: make selection source/offer use CFileDescriptor make data selection source and offers use CFileDescriptor and its associated use in xwm and protocols * protocols: convert protocols fd to CFileDescriptor make most fd handling use CFileDescriptor in protocols * shm: make SHMPool use CfileDescriptor make SHMPool use CFileDescriptor instead of manual fd handling. * opengl: duplicate fd with CFileDescriptor duplicate fenceFD with CFileDescriptor duplicate instead. * xwayland: make sockets and fds use CFileDescriptor instead of manual opening/closing make sockets and fds use CFileDescriptor * keybindmgr: make sockets and fds use CFileDescriptor make sockets and fds use CFileDescriptor instead of manual handling.
Diffstat (limited to 'src/protocols/SecurityContext.hpp')
-rw-r--r--src/protocols/SecurityContext.hpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/protocols/SecurityContext.hpp b/src/protocols/SecurityContext.hpp
index 2bec08d4..56d4f7b4 100644
--- a/src/protocols/SecurityContext.hpp
+++ b/src/protocols/SecurityContext.hpp
@@ -4,19 +4,20 @@
#include <cstdint>
#include "WaylandProtocol.hpp"
#include "security-context-v1.hpp"
+#include <hyprutils/os/FileDescriptor.hpp>
class CSecurityContext {
public:
CSecurityContext(SP<CWpSecurityContextV1> resource_, int listenFD_, int closeFD_);
~CSecurityContext();
- bool good();
+ bool good();
- std::string sandboxEngine, appID, instanceID;
- int listenFD = -1, closeFD = -1;
+ std::string sandboxEngine, appID, instanceID;
+ Hyprutils::OS::CFileDescriptor listenFD, closeFD;
- void onListen(uint32_t mask);
- void onClose(uint32_t mask);
+ void onListen(uint32_t mask);
+ void onClose(uint32_t mask);
private:
SP<CWpSecurityContextV1> resource;
@@ -44,7 +45,7 @@ struct SCSecurityContextSandboxedClientDestroyWrapper {
class CSecurityContextSandboxedClient {
public:
- static SP<CSecurityContextSandboxedClient> create(int clientFD);
+ static SP<CSecurityContextSandboxedClient> create(Hyprutils::OS::CFileDescriptor clientFD);
~CSecurityContextSandboxedClient();
void onDestroy();
@@ -52,10 +53,10 @@ class CSecurityContextSandboxedClient {
SCSecurityContextSandboxedClientDestroyWrapper destroyListener;
private:
- CSecurityContextSandboxedClient(int clientFD_);
+ CSecurityContextSandboxedClient(Hyprutils::OS::CFileDescriptor clientFD_);
- wl_client* client = nullptr;
- int clientFD = -1;
+ wl_client* client = nullptr;
+ Hyprutils::OS::CFileDescriptor clientFD;
friend class CSecurityContextProtocol;
friend class CSecurityContext;