Add background handling

This does not work as expected. I think the problem is on the wlc side.
Please review, @Cloudef. To reproduce the issues:

1. Run sway
2. Open terminal in sway
3. Run swaybg

swaybg will create a surface and ask to have it set as the background,
but wlc_handle_from_wl_surface_resource will return 0. If the swaybg
surface is a shell surface, then it works - but wlc complains about the
pointer type and segfaults as soon as the pre-render hook tries to draw
the background.
This commit is contained in:
Drew DeVault 2015-11-18 22:14:57 -05:00
parent 82db2a57a9
commit 65b8a5c3ce
3 changed files with 47 additions and 4 deletions

View file

@ -2,14 +2,26 @@
#include <wlc/wlc-wayland.h>
#include "wayland-desktop-shell-server-protocol.h"
#include "log.h"
#include "extensions.h"
struct desktop_shell_state desktop_shell;
static void set_background(struct wl_client *client, struct wl_resource *resource,
struct wl_resource *output, struct wl_resource *surface) {
sway_log(L_DEBUG, "Surface requesting background for output");
struct wl_resource *_output, struct wl_resource *_surface) {
wlc_handle output = wlc_handle_from_wl_output_resource(_output);
wlc_handle surface = wlc_handle_from_wl_surface_resource(_surface);
sway_log(L_DEBUG, "Setting surface %d as background for output %d", (int)surface, (int)output);
if (!output || !surface) {
return;
}
struct background_config *config = malloc(sizeof(struct background_config));
config->output = output;
config->surface = surface;
list_add(desktop_shell.backgrounds, config);
}
static struct desktop_shell_interface desktop_shell_implementation = {
.set_background = set_background,
.set_background = set_background
};
static void desktop_shell_bind(struct wl_client *client, void *data,
@ -29,4 +41,5 @@ static void desktop_shell_bind(struct wl_client *client, void *data,
void register_extensions(void) {
wl_global_create(wlc_get_wl_display(), &desktop_shell_interface, 1, NULL, desktop_shell_bind);
desktop_shell.backgrounds = create_list();
}