From cb67c247185e8ab075e4c219e25d27bb32547a4b Mon Sep 17 00:00:00 2001 From: Keith Bowes Date: Mon, 17 Feb 2020 23:43:14 -0500 Subject: [PATCH] Got basic xdg-shell code --- README.md | 5 +++++ include/waybox/server.h | 1 + waybox/server.c | 7 +++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39b8e8b..243ea16 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ # waybox An openbox clone on Wayland (WIP) +This is the basic-apps branch, in which I'm working to get simple apps to work. +Currently, I'm targeting wlroots 0.6.0, but after I get the basic functionality +worked out, I want to get it to compile with wlroots 0.10.0. Right now, a +weston-terminal window will show, but it won't receive keyboard input. + ### Goals The main goal of this project is to provide a similar feel to openbox but on wayland diff --git a/include/waybox/server.h b/include/waybox/server.h index bc09448..3a9b63a 100644 --- a/include/waybox/server.h +++ b/include/waybox/server.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "waybox/output.h" #include "waybox/cursor.h" diff --git a/waybox/server.c b/waybox/server.c index 70c9792..53772f5 100644 --- a/waybox/server.c +++ b/waybox/server.c @@ -58,6 +58,9 @@ bool start_wb(struct wb_server* server) { return false; } + //printf("Running Wayland compositor on Wayland display '%s'\n", socket); + //setenv("WAYLAND_DISPLAY", socket, true); + wlr_gamma_control_manager_v1_create(server->wl_display); wlr_screencopy_manager_v1_create(server->wl_display); wlr_gtk_primary_selection_device_manager_create(server->wl_display); @@ -66,8 +69,8 @@ bool start_wb(struct wb_server* server) { server->compositor = wlr_compositor_create(server->wl_display, wlr_backend_get_renderer(server->backend)); -// wlr_xdg_shell_v6_create(server.wl_display); - wlr_idle_create(server->wl_display); + wlr_xdg_shell_create(server->wl_display); + //wlr_idle_create(server->wl_display); return true; }