From 82db2a57a9ab171e77a0765df5dd0b2d92cb4f70 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 18 Nov 2015 22:01:22 -0500 Subject: Basic support for extensions in server and clients --- swaybg/CMakeLists.txt | 2 ++ swaybg/main.c | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'swaybg') diff --git a/swaybg/CMakeLists.txt b/swaybg/CMakeLists.txt index 7f0556df..d4de69de 100644 --- a/swaybg/CMakeLists.txt +++ b/swaybg/CMakeLists.txt @@ -7,6 +7,7 @@ find_package(Pango REQUIRED) include(Wayland) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../bin/) WAYLAND_ADD_PROTOCOL_CLIENT(proto-xdg-shell "${PROJECT_SOURCE_DIR}/../protocols/xdg-shell.xml" xdg-shell) +WAYLAND_ADD_PROTOCOL_CLIENT(proto-desktop-shell "${PROJECT_SOURCE_DIR}/../protocols/desktop-shell.xml" desktop-shell) include_directories( ${WAYLAND_CLIENT_INCLUDE_DIR} @@ -24,6 +25,7 @@ add_executable(swaybg ${wl_sources} ${common} ${proto-xdg-shell} + ${proto-desktop-shell} ) TARGET_LINK_LIBRARIES(swaybg ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_CURSOR_LIBRARIES} ${CAIRO_LIBRARIES} ${PANGO_LIBRARIES} m) diff --git a/swaybg/main.c b/swaybg/main.c index b4614ac0..8d95f60a 100644 --- a/swaybg/main.c +++ b/swaybg/main.c @@ -1,3 +1,4 @@ +#include "wayland-desktop-shell-client-protocol.h" #include #include #include @@ -14,12 +15,16 @@ void sway_terminate(void) { int main(int argc, char **argv) { init_log(L_INFO); - if (!(state = client_setup(100, 100))) { + if (!(state = client_setup(100, 100, false))) { return -1; } + if (!state->desktop_shell) { + sway_abort("swaybg requires the compositor to support the desktop-shell extension."); + } struct output_state *output = state->outputs->items[0]; state->width = output->width; state->height = output->height; + desktop_shell_set_background(state->desktop_shell, output->output, state->surface); uint8_t r = 0, g = 0, b = 0; -- cgit v1.2.3