mirror/dwl
1
0
Fork 1
mirror of https://codeberg.org/dwl/dwl.git synced 2024-12-27 03:36:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wlroots-next'

Browse source 
wlroots 0.15.0 was released
This commit is contained in:
Devin J. Pohly 2021-12-22 12:14:36 -06:00
commit f85d8e79d0
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dwl.c
View file

@ -13,6 +13,7 @@
#include <libinput.h> #include <libinput.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/render/allocator.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>
@ -307,6 +308,7 @@ static const char broken[] = "broken";
static struct wl_display *dpy; static struct wl_display *dpy;
static struct wlr_backend *backend; static struct wlr_backend *backend;
static struct wlr_renderer *drw; static struct wlr_renderer *drw;
static struct wlr_allocator *alloc;
static struct wlr_compositor *compositor; static struct wlr_compositor *compositor;
static struct wlr_xdg_shell *xdg_shell; static struct wlr_xdg_shell *xdg_shell;
@ -551,7 +553,7 @@ arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int
box.y -= state->margin.bottom; box.y -= state->margin.bottom;
} }
if (box.width < 0 || box.height < 0) { if (box.width < 0 || box.height < 0) {
wlr_layer_surface_v1_close(wlr_layer_surface); wlr_layer_surface_v1_destroy(wlr_layer_surface);
continue; continue;
} }
layersurface->geo = box; layersurface->geo = box;
@ -775,7 +777,7 @@ commitnotify(struct wl_listener *listener, void *data)
Client *c = wl_container_of(listener, c, commit); Client *c = wl_container_of(listener, c, commit);
/* mark a pending resize as completed */ /* mark a pending resize as completed */
if (c->resize && c->resize <= c->surface.xdg->configure_serial) if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
c->resize = 0; c->resize = 0;
} }
@ -818,6 +820,8 @@ createmon(struct wl_listener *listener, void *data)
Monitor *m = wlr_output->data = calloc(1, sizeof(*m)); Monitor *m = wlr_output->data = calloc(1, sizeof(*m));
m->wlr_output = wlr_output; m->wlr_output = wlr_output;
wlr_output_init_render(wlr_output, alloc, drw);
/* Initialize monitor state using configured rules */ /* Initialize monitor state using configured rules */
for (size_t i = 0; i < LENGTH(m->layers); i++) for (size_t i = 0; i < LENGTH(m->layers); i++)
wl_list_init(&m->layers[i]); wl_list_init(&m->layers[i]);
@ -926,13 +930,13 @@ createlayersurface(struct wl_listener *listener, void *data)
wlr_layer_surface->data = layersurface; wlr_layer_surface->data = layersurface;
m = wlr_layer_surface->output->data; m = wlr_layer_surface->output->data;
wl_list_insert(&m->layers[wlr_layer_surface->client_pending.layer], wl_list_insert(&m->layers[wlr_layer_surface->pending.layer],
&layersurface->link); &layersurface->link);
// Temporarily set the layer's current state to client_pending // Temporarily set the layer's current state to pending
// so that we can easily arrange it // so that we can easily arrange it
old_state = wlr_layer_surface->current; old_state = wlr_layer_surface->current;
wlr_layer_surface->current = wlr_layer_surface->client_pending; wlr_layer_surface->current = wlr_layer_surface->pending;
arrangelayers(m); arrangelayers(m);
wlr_layer_surface->current = old_state; wlr_layer_surface->current = old_state;
} }
@ -2002,12 +2006,15 @@ setup(void)
if (!(backend = wlr_backend_autocreate(dpy))) if (!(backend = wlr_backend_autocreate(dpy)))
BARF("couldn't create backend"); BARF("couldn't create backend");
/* If we don't provide a renderer, autocreate makes a GLES2 renderer for us. /* Create a renderer with the default implementation */
* The renderer is responsible for defining the various pixel formats it if (!(drw = wlr_renderer_autocreate(backend)))
* supports for shared memory, this configures that for clients. */ BARF("couldn't create renderer");
drw = wlr_backend_get_renderer(backend);
wlr_renderer_init_wl_display(drw, dpy); wlr_renderer_init_wl_display(drw, dpy);
/* Create a default allocator */
if (!(alloc = wlr_allocator_autocreate(backend, drw)))
BARF("couldn't create allocator");
/* This creates some hands-off wlroots interfaces. The compositor is /* This creates some hands-off wlroots interfaces. The compositor is
* necessary for clients to allocate surfaces and the data device manager * necessary for clients to allocate surfaces and the data device manager
* handles the clipboard. Each of these wlroots interfaces has room for you * handles the clipboard. Each of these wlroots interfaces has room for you