diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-07-03 11:04:24 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-08-08 17:24:00 +0200 |
| commit | e86177d7a54d8c2c0e096fd856e64bb9671267a4 (patch) | |
| tree | e31bab77a7b767a9dc635887c67d61bcf113f31a /src/util.hpp | |
| parent | cb5568e11bbe2d499d4d43dc30a779a5869b12ea (diff) | |
moved Poller and unique_fd from main to util, fixed c++ issues in util
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/util.hpp')
| -rw-r--r-- | src/util.hpp | 50 |
1 files changed, 41 insertions, 9 deletions
diff --git a/src/util.hpp b/src/util.hpp index 2fe6e84..bc45dfd 100644 --- a/src/util.hpp +++ b/src/util.hpp @@ -1,9 +1,9 @@ -#ifndef WM_UTIL_H -#define WM_UTIL_H +#ifndef WM_UTIL_HPP +#define WM_UTIL_HPP -#ifdef __cplusplus -extern "C" { -#endif +#include <functional> +#include <sys/poll.h> +#include <vector> #ifdef __GNUC__ #define ATTR_FORMAT(stringindex, firsttocheck) __attribute__((format(printf, stringindex, firsttocheck))) @@ -22,8 +22,40 @@ static inline void logdebug(char const * fmt, ...) ATTR_FORMAT(1,2); static inline void logdebug(char const * fmt, ...) {} #endif -#ifdef __cplusplus -} -#endif +// _ _ _ __ _ +// ___| |_ _ __ _ _ ___| |_ _ _ _ __ (_) __ _ _ _ ___ / _| __| | +// / __| __| '__| | | |/ __| __| | | | | '_ \| |/ _` | | | |/ _ \ | |_ / _` | +// \__ \ |_| | | |_| | (__| |_ | |_| | | | | | (_| | |_| | __/ | _| (_| | +// |___/\__|_| \__,_|\___|\__| \__,_|_| |_|_|\__, |\__,_|\___|___|_| \__,_| +// |_| |_____| +struct unique_fd { + int fd{-1}; + unique_fd() = default; + explicit unique_fd(int f) : fd{f} {} + operator int() const { return fd; } + ~unique_fd(); + unique_fd(unique_fd const &) = delete; + unique_fd &operator=(unique_fd const &) = delete; + unique_fd(unique_fd &&o) : fd(o.fd) { o.fd = -1; } + unique_fd &operator=(unique_fd &&o) { + std::swap(this->fd, o.fd); + return *this; + } +}; + +// _ _ ____ _ _ +// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __ +// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__| +// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ | +// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_| +// +struct Poller { + std::vector<std::function<int(int)>> handlers; + std::vector<struct pollfd> pfds; + + Poller() = default; + void add_fd(int fd, std::function<int(int)> handler); + int check_events(); +}; -#endif // !WM_UTIL_H +#endif // !WM_UTIL_HPP |