implement is_modal_dialog() for xdg shell

diff --git a/src/server.c b/src/server.c
index c39649b82f1aafda6e817296de6872b6010fda80..abaaaf0be9948dc3d04b3f4e080e197b7e8e1499 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -276,6 +276,7 @@ allow_for_sandbox(const struct wlr_security_context_v1_state *security_state,
                "zxdg_importer_v1",
                "zxdg_importer_v2",
                "xdg_toplevel_icon_manager_v1",
+               "xdg_dialog_v1",
                /* plus */
                "wp_alpha_modifier_v1",
                "wp_linux_drm_syncobj_manager_v1",

diff --git a/src/xdg.c b/src/xdg.c
index f877e7ba0ece158c91fb8214c22f694a6f78c2a0..83ab9bb9220e2d804d424b9055bbd46f7a733cc2 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -5,6 +5,7 @@
 #include <wlr/types/wlr_fractional_scale_v1.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
+#include <wlr/types/wlr_xdg_dialog_v1.h>
 #include <wlr/types/wlr_xdg_shell.h>
 #include <wlr/types/wlr_xdg_toplevel_icon_v1.h>
 #include "buffer.h"
@@ -617,6 +618,18 @@ xdg_toplevel_view_append_children(struct view *self, struct wl_array *children)
        }
 }
 
+static bool
+xdg_toplevel_view_is_modal_dialog(struct view *view)
+{
+       struct wlr_xdg_toplevel *toplevel = xdg_toplevel_from_view(view);
+       struct wlr_xdg_dialog_v1 *dialog =
+               wlr_xdg_dialog_v1_try_from_wlr_xdg_toplevel(toplevel);
+       if (!dialog) {
+               return false;
+       }
+       return dialog->modal;
+}
+
 static void
 xdg_toplevel_view_set_activated(struct view *view, bool activated)
 {
@@ -871,6 +884,7 @@ static const struct view_impl xdg_toplevel_view_impl = {
        .minimize = xdg_toplevel_view_minimize,
        .get_root = xdg_toplevel_view_get_root,
        .append_children = xdg_toplevel_view_append_children,
+       .is_modal_dialog = xdg_toplevel_view_is_modal_dialog,
        .get_size_hints = xdg_toplevel_view_get_size_hints,
        .contains_window_type = xdg_toplevel_view_contains_window_type,
        .get_pid = xdg_view_get_pid,
@@ -1116,6 +1130,8 @@ xdg_shell_init(struct server *server)
        server->xdg_toplevel_icon_set_icon.notify = handle_xdg_toplevel_icon_set_icon;
        wl_signal_add(&server->xdg_toplevel_icon_manager->events.set_icon,
                &server->xdg_toplevel_icon_set_icon);
+
+       wlr_xdg_wm_dialog_v1_create(server->wl_display, 1);
 }
 
 void