-#include "util.h"
+#include "util.hpp"
#include "wayland.hpp"
#include <unistd.h>
-#include <sys/poll.h>
+#include <signal.h>
+#include <sys/signalfd.h>
+
+#include <algorithm>
struct connection {
std::vector<std::unique_ptr<wl::output>> outputs;
std::unique_ptr<genivi::controller> c;
};
-// _ _ ____ _ _
-// ___| |_ _ __ _ _ ___| |_ | _ \ ___ | | | ___ _ __
-// / __| __| '__| | | |/ __| __| | |_) / _ \| | |/ _ \ '__|
-// \__ \ |_| | | |_| | (__| |_ | __/ (_) | | | __/ |
-// |___/\__|_| \__,_|\___|\__| |_| \___/|_|_|\___|_|
-//
-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();
-};
-
-void Poller::add_fd(int fd, std::function<int(int)> handler) {
- pfds.emplace_back(pollfd{ .fd = fd, .events = POLLIN, .revents = 0 });
- handlers.emplace_back(std::move(handler));
-}
-
-int Poller::check_events() {
- int ret = 0;
- if ((ret = poll(this->pfds.data(), this->pfds.size(), -1)) != -1 && errno != EINTR) {
- for (unsigned i = 0; i < pfds.size(); i++) {
- if (pfds[i].revents & POLLIN) {
- if (handlers[i](pfds[i].fd) == -1) {
- return -1;
- }
- pfds[i].revents = 0;
- pfds[i].events = POLLIN;
- }
- }
- }
- return ret;
-}
-
namespace {
// _ _ _ _ _ ____
// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \
struct connection c {};
d.r.add_global_handler(
- "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) {
- c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
- });
+ "wl_output", [&c](wl_registry *r, uint32_t name, uint32_t v) {
+ c.outputs.emplace_back(std::make_unique<wl::output>(r, name, v));
+ });
d.r.add_global_handler(
"ivi_controller", [&c](wl_registry *r, uint32_t name, uint32_t v) {
c.c = std::make_unique<genivi::controller>(r, name, v);
- // XXX: This protocol needs the output, so lets just add our mapping here...
- c.c->add_proxy_to_id_mapping(c.outputs.back()->proxy.get(),
- wl_proxy_get_id(
- reinterpret_cast<struct wl_proxy *>(
- c.outputs.back()->proxy.get())));
+ // XXX: This protocol needs the output, so lets just add our mapping
+ // here...
+ c.c->add_proxy_to_id_mapping(
+ c.outputs.back()->proxy.get(),
+ wl_proxy_get_id(reinterpret_cast<struct wl_proxy *>(
+ c.outputs.back()->proxy.get())));
});
// First level objects
fatal("Could not init layout: %s", e);
}
- struct Poller p{};
+ struct Poller p {};
p.add_fd(STDIN_FILENO, [&c](int fd) {
- int buf, ret;
- while ((ret = read(fd, &buf, sizeof(buf))) == sizeof(buf)) {
- ;
- }
- c.c->debug_dump_current_status();
- return ret == 0 ? -1 : 0;
+ int buf;
+ ssize_t ret;
+ ret = read(fd, &buf, sizeof(buf));
+ c.c->debug_dump_current_status();
+ return ret == 0 ? -1 : 0;
});
- p.add_fd(d.get_fd(), [&d](int fd) {
- return d.dispatch();
+ p.add_fd(d.get_fd(), [&d](int fd) { return d.dispatch(); });
+
+ sigset_t sset{};
+ sigemptyset(&sset);
+ sigaddset(&sset, SIGINT);
+ sigaddset(&sset, SIGTERM);
+
+ auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC));
+ sigprocmask(SIG_BLOCK, &sset, nullptr);
+ p.add_fd(sfd.fd, [](int fd) {
+ struct signalfd_siginfo si;
+ while (read(fd, &si, sizeof(si)) == sizeof(si)) {
+ lognotice("Received signal %u", si.ssi_signo);
+ }
+ return -1;
});
while ((d.flush(), p.check_events()) != -1) {
c.c->execute_pending();
}
+ c.c->commit_changes();
+ d.roundtrip();
+
return 0;
}