#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
#include <sys/poll.h>
-struct conn {
+struct connection {
std::vector<std::unique_ptr<wl::output>> outputs;
std::unique_ptr<genivi::controller> c;
};
namespace {
-int check_events(struct wl::display *d, struct conn *c, int fd) {
- struct pollfd pfd[2] = {{.fd = d->get_fd(), .events = POLLIN, .revents = 0},
+// _ _ _ ____
+// ___| |__ ___ ___| | __ _____ _____ _ __ | |_ ___ / /\ \
+// / __| '_ \ / _ \/ __| |/ / / _ \ \ / / _ \ '_ \| __/ __| | | |
+// | (__| | | | __/ (__| < | __/\ V / __/ | | | |_\__ \ | | |
+// \___|_| |_|\___|\___|_|\_\___\___| \_/ \___|_| |_|\__|___/ | | |
+// |_____| \_\/_/
+int check_events(struct wl::display &d, struct connection &c, int fd) {
+ struct pollfd pfd[2] = {{.fd = d.get_fd(), .events = POLLIN, .revents = 0},
{.fd = fd, .events = POLLIN, .revents = 0}};
- d->flush();
+ d.flush();
if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) {
int ret = 0;
- if (pfd[0].revents & POLLIN) {
- ret = d->dispatch();
+ if ((pfd[0].revents & POLLIN) != 0) {
+ ret = d.dispatch();
}
- if (ret == -1)
+ if (ret == -1) {
return ret;
+ }
- if (fd != -1 && (pfd[1].revents & POLLIN)) {
+ if (fd != -1 && ((pfd[1].revents & POLLIN) != 0)) {
char buf[256];
// read all there is ...
- while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf))
+ while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) {
;
+ }
// Display current status
- if (!c->c->surfaces.empty()) {
+ if (!c.c->surfaces.empty()) {
puts("Surfaces:");
- for (auto const &i : c->c->surfaces) {
- struct genivi::rect const &r = i.second->dst_rect;
- struct genivi::size const &s = i.second->size;
+ for (auto const &i : c.c->surfaces) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
r.x, r.y);
}
puts("\b\b ");
}
- if (!c->c->layers.empty()) {
+ if (!c.c->layers.empty()) {
puts("Layers:");
- for (auto const &i : c->c->layers) {
- struct genivi::rect const &r = i.second->dst_rect;
- struct genivi::size const &s = i.second->size;
+ for (auto const &i : c.c->layers) {
+ auto const &r = i.second->dst_rect;
+ auto const &s = i.second->size;
printf("%d [%ux%u] (%ux%u@%dx%d), ", i.first, s.w, s.h, r.w, r.h,
r.x, r.y);
}
return 0;
}
-void init_layout(struct conn &c) {
+// _ _ _ _ _ ____
+// (_)_ __ (_) |_ | | __ _ _ _ ___ _ _| |_ / /\ \
+// | | '_ \| | __| | |/ _` | | | |/ _ \| | | | __| | | |
+// | | | | | | |_ | | (_| | |_| | (_) | |_| | |_| | | |
+// |_|_| |_|_|\__|___|_|\__,_|\__, |\___/ \__,_|\__| | | |
+// |_____| |___/ \_\/_/
+char const *init_layout(struct connection &c) {
+ if (!c.c) {
+ return "ivi_controller global not available";
+ }
+
+ if (c.outputs.empty()) {
+ return "no output was set up!";
+ }
+
auto &o = c.outputs.front();
auto &s = c.c->screens.begin()->second;
auto &layers = c.c->layers;
s->clear();
// Setup our dummy scene...
- c.c->layer_create(100, 0, 0); // bottom layer, anything else
- c.c->layer_create(1000, 0, 0); // top layer, mandelbrot
+ c.c->layer_create(100, 0, 0); // bottom layer, anything else
+ c.c->layer_create(1000, 0, 0); // top layer, mandelbrot
auto &l100 = c.c->layers[100];
auto &l1k = c.c->layers[1000];
// Set layers fullscreen
l100->set_destination_rectangle(0, 0, o->width, o->height);
l1k->set_destination_rectangle(0, 0, o->width, o->height);
+ l100->set_visibility(1);
+ l1k->set_visibility(1);
// Add layers to screen
- s->add_layer(l100.get());
- s->add_layer(l1k.get());
+ s->set_render_order({100, 1000});
c.c->commit_changes();
// Note: this does not flush the display!
-}
-}
-int main(int argc, char **argv) {
+ return nullptr;
+}
+} // namespace
+
+// _ ____
+// _ __ ___ __ _(_)_ __ / /\ \
+// | '_ ` _ \ / _` | | '_ \| | | |
+// | | | | | | (_| | | | | | | | |
+// |_| |_| |_|\__,_|_|_| |_| | | |
+// \_\/_/
+int main(int /*argc*/, char ** /*argv*/) {
lognotice("WinMan ver. %s", WINMAN_VERSION_STRING);
- if (!getenv("XDG_RUNTIME_DIR"))
+ if (getenv("XDG_RUNTIME_DIR") == nullptr) {
fatal("Environment variable XDG_RUNTIME_DIR not set");
+ }
- auto d = std::make_unique<wl::display>();
- if (!d->ok())
+ struct wl::display d {};
+ if (!d.ok()) {
fatal("Could not connect to compositor");
+ }
- struct conn c = {};
+ struct connection c {};
- d->r->add_global_handler(
- "ivi_controller", [&](wl_registry *r, uint32_t name, uint32_t 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);
});
- d->r->add_global_handler(
- "wl_output", [&](wl_registry *r, uint32_t name, uint32_t v) {
+ 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));
});
// First level objects
- d->roundtrip();
+ d.roundtrip();
// Second level objects
- d->roundtrip();
+ d.roundtrip();
// Third level objects
- d->roundtrip();
+ d.roundtrip();
- if (!c.c)
- fatal("ivi_controller global not available");
-
- if (c.outputs.empty())
- fatal("no output was set up!");
-
- init_layout(c);
+ if (char const *e = init_layout(c)) {
+ fatal("Could not init layout: %s", e);
+ }
- while (check_events(d.get(), &c, STDIN_FILENO) != -1) {
+ while (check_events(d, c, STDIN_FILENO) != -1) {
c.c->execute_pending();
+ d.flush();
}
- d->roundtrip();
-
return 0;
}
Code Review / staging / windowmanager.git / blobdiff