Mir shell unstable

examples/client/CMakeLists.txt

@@ -1,18 +1,44 @@
-set(OUTPUT_PATH_HEADER "${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.h")
-set(OUTPUT_PATH_SRC "${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c")
-set(PROTOCOL_PATH "${PROJECT_SOURCE_DIR}/wayland-protocols/xdg-shell.xml")
+set(XDG_SHELL_H "${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.h")
+set(XDG_SHELL_C "${CMAKE_CURRENT_BINARY_DIR}/xdg-shell.c")
+set(XDG_SHELL_X "${PROJECT_SOURCE_DIR}/wayland-protocols/xdg-shell.xml")
 
 add_custom_command(
-      OUTPUT "${OUTPUT_PATH_HEADER}" "${OUTPUT_PATH_SRC}"
+      OUTPUT "${XDG_SHELL_H}" "${XDG_SHELL_C}"
       VERBATIM
-      COMMAND "sh" "-c" "wayland-scanner client-header ${PROTOCOL_PATH} ${OUTPUT_PATH_HEADER}"
-      COMMAND "sh" "-c" "wayland-scanner private-code  ${PROTOCOL_PATH} ${OUTPUT_PATH_SRC}"
+      COMMAND "sh" "-c" "wayland-scanner client-header ${XDG_SHELL_X} ${XDG_SHELL_H}"
+      COMMAND "sh" "-c" "wayland-scanner private-code  ${XDG_SHELL_X} ${XDG_SHELL_C}"
 )
 
-mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c ${OUTPUT_PATH_HEADER} ${OUTPUT_PATH_SRC})
-target_link_libraries     (mir_demo_client_wayland PkgConfig::WAYLAND_CLIENT)
+set(MIR_SHELL_H "${CMAKE_CURRENT_BINARY_DIR}/mir-shell.h")
+set(MIR_SHELL_C "${CMAKE_CURRENT_BINARY_DIR}/mir-shell.c")
+set(MIR_SHELL_X "${PROJECT_SOURCE_DIR}/wayland-protocols/mir-shell-unstable-v1.xml")
+
+add_custom_command(
+        OUTPUT "${MIR_SHELL_H}" "${MIR_SHELL_C}"
+        VERBATIM
+        COMMAND "sh" "-c" "wayland-scanner client-header ${MIR_SHELL_X} ${MIR_SHELL_H}"
+        COMMAND "sh" "-c" "wayland-scanner private-code  ${MIR_SHELL_X} ${MIR_SHELL_C}"
+)
+
+add_library(mir_demo_wayland_extensions STATIC
+        ${XDG_SHELL_C} ${XDG_SHELL_H}
+        ${MIR_SHELL_C} ${MIR_SHELL_H}
+        make_shm_pool.c make_shm_pool.h
+)
+set_target_properties     (mir_demo_wayland_extensions PROPERTIES COMPILE_FLAGS "${CMAKE_CFLAGS}  -fvisibility=hidden")
+target_include_directories(mir_demo_wayland_extensions PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries     (mir_demo_wayland_extensions PUBLIC PkgConfig::WAYLAND_CLIENT)
+
+
+mir_add_wrapped_executable(mir_demo_client_wayland wayland_client.c)
+target_link_libraries     (mir_demo_client_wayland mir_demo_wayland_extensions)
 target_include_directories(mir_demo_client_wayland PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
 
 mir_add_wrapped_executable(mir_demo_client_wayland_egl_spinner spinner.cpp)
 target_link_libraries     (mir_demo_client_wayland_egl_spinner miral-spinner)
+
+
+mir_add_wrapped_executable(mir_demo_client_mir_shell mir_shell_demo.cpp wayland_runner.cpp wayland_runner.h)
+target_link_libraries     (mir_demo_client_mir_shell mir_demo_wayland_extensions)
+target_include_directories(mir_demo_client_mir_shell PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

examples/client/make_shm_pool.c

@@ -0,0 +1,45 @@
+/*
+ * Copyright © Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 or 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "make_shm_pool.h"
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+
+struct wl_shm_pool*
+make_shm_pool(struct wl_shm* shm, int size, void **data)
+{
+    int fd = memfd_create("make_shm_pool", MFD_CLOEXEC);
+
+    if (fd < 0) {
+        return NULL;
+    }
+
+    posix_fallocate(fd, 0, size);
+
+    *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+    if (*data == MAP_FAILED) {
+        close(fd);
+        return NULL;
+    }
+
+    struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size);
+
+    close(fd);
+
+    return pool;
+}

examples/client/make_shm_pool.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright © Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 or 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MIR_MAKE_SHM_POOL_H
+#define MIR_MAKE_SHM_POOL_H
+
+#include <wayland-client.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct wl_shm_pool*
+make_shm_pool(struct wl_shm* shm, int size, void** data);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //MIR_MAKE_SHM_POOL_H