aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/commands/fullscreen.c1
-rw-r--r--sway/desktop/output.c1
-rw-r--r--sway/desktop/wl_shell.c165
-rw-r--r--sway/meson.build1
-rw-r--r--sway/server.c10
-rw-r--r--sway/tree/container.c6
-rw-r--r--sway/tree/view.c2
7 files changed, 2 insertions, 184 deletions
diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c
index 8692e92d..ec9ec276 100644
--- a/sway/commands/fullscreen.c
+++ b/sway/commands/fullscreen.c
@@ -1,4 +1,3 @@
-#include <wlr/types/wlr_wl_shell.h>
#include "log.h"
#include "sway/commands.h"
#include "sway/config.h"
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 974cd56c..3f89f5cc 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -11,7 +11,6 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h>
-#include <wlr/types/wlr_wl_shell.h>
#include <wlr/util/region.h>
#include "log.h"
#include "sway/config.h"
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
deleted file mode 100644
index cb3774f7..00000000
--- a/sway/desktop/wl_shell.c
+++ /dev/null
@@ -1,165 +0,0 @@
-#define _POSIX_C_SOURCE 199309L
-#include <stdbool.h>
-#include <stdlib.h>
-#include <wayland-server.h>
-#include <wlr/types/wlr_wl_shell.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
-#include "sway/server.h"
-#include "sway/tree/view.h"
-#include "sway/input/seat.h"
-#include "sway/input/input-manager.h"
-#include "log.h"
-
-static struct sway_wl_shell_view *wl_shell_view_from_view(
- struct sway_view *view) {
- if (!sway_assert(view->type == SWAY_VIEW_WL_SHELL,
- "Expected wl_shell view")) {
- return NULL;
- }
- return (struct sway_wl_shell_view *)view;
-}
-
-static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
- if (wl_shell_view_from_view(view) == NULL) {
- return NULL;
- }
- switch (prop) {
- case VIEW_PROP_TITLE:
- return view->wlr_wl_shell_surface->title;
- case VIEW_PROP_CLASS:
- return view->wlr_wl_shell_surface->class;
- default:
- return NULL;
- }
-}
-
-static void configure(struct sway_view *view, double ox, double oy, int width,
- int height) {
- struct sway_wl_shell_view *wl_shell_view = wl_shell_view_from_view(view);
- if (wl_shell_view == NULL) {
- return;
- }
- wl_shell_view->pending_width = width;
- wl_shell_view->pending_height = height;
- wlr_wl_shell_surface_configure(view->wlr_wl_shell_surface, 0, width, height);
-}
-
-static void _close(struct sway_view *view) {
- if (wl_shell_view_from_view(view) == NULL) {
- return;
- }
-
- wl_client_destroy(view->wlr_wl_shell_surface->client);
-}
-
-static void destroy(struct sway_view *view) {
- struct sway_wl_shell_view *wl_shell_view = wl_shell_view_from_view(view);
- if (wl_shell_view == NULL) {
- return;
- }
- wl_list_remove(&wl_shell_view->commit.link);
- wl_list_remove(&wl_shell_view->destroy.link);
- wl_list_remove(&wl_shell_view->request_fullscreen.link);
- wl_list_remove(&wl_shell_view->set_state.link);
- free(wl_shell_view);
-}
-
-static void set_fullscreen(struct sway_view *view, bool fullscreen) {
- // TODO
-}
-
-static const struct sway_view_impl view_impl = {
- .get_string_prop = get_string_prop,
- .configure = configure,
- .close = _close,
- .destroy = destroy,
- .set_fullscreen = set_fullscreen,
-};
-
-static void handle_commit(struct wl_listener *listener, void *data) {
- struct sway_wl_shell_view *wl_shell_view =
- wl_container_of(listener, wl_shell_view, commit);
- struct sway_view *view = &wl_shell_view->view;
- // NOTE: We intentionally discard the view's desired width here
- // TODO: Let floating views do whatever
- view_update_size(view, wl_shell_view->pending_width,
- wl_shell_view->pending_height);
- view_damage_from(view);
-}
-
-static void handle_destroy(struct wl_listener *listener, void *data) {
- struct sway_wl_shell_view *wl_shell_view =
- wl_container_of(listener, wl_shell_view, destroy);
- view_destroy(&wl_shell_view->view);
-}
-
-static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
- struct sway_wl_shell_view *wl_shell_view =
- wl_container_of(listener, wl_shell_view, request_fullscreen);
- view_set_fullscreen(&wl_shell_view->view, true);
-}
-
-static void handle_set_state(struct wl_listener *listener, void *data) {
- struct sway_wl_shell_view *wl_shell_view =
- wl_container_of(listener, wl_shell_view, set_state);
- struct sway_view *view = &wl_shell_view->view;
- struct wlr_wl_shell_surface *surface = view->wlr_wl_shell_surface;
- if (view->is_fullscreen &&
- surface->state != WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
- view_set_fullscreen(view, false);
- }
-}
-
-void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
- struct sway_server *server = wl_container_of(listener, server,
- wl_shell_surface);
- struct wlr_wl_shell_surface *shell_surface = data;
-
- if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
- // popups don't get views
- wlr_log(L_DEBUG, "New wl_shell popup");
- return;
- }
-
- // TODO: make transient windows floating
-
- wlr_log(L_DEBUG, "New wl_shell toplevel title='%s' app_id='%s'",
- shell_surface->title, shell_surface->class);
- wlr_wl_shell_surface_ping(shell_surface);
-
- struct sway_wl_shell_view *wl_shell_view =
- calloc(1, sizeof(struct sway_wl_shell_view));
- if (!sway_assert(wl_shell_view, "Failed to allocate view")) {
- return;
- }
-
- view_init(&wl_shell_view->view, SWAY_VIEW_WL_SHELL, &view_impl);
- wl_shell_view->view.wlr_wl_shell_surface = shell_surface;
-
- // TODO:
- // - Wire up listeners
- // - Look up pid and open on appropriate workspace
- // - Set new view to maximized so it behaves nicely
- // - Criteria
-
- wl_shell_view->commit.notify = handle_commit;
- wl_signal_add(&shell_surface->surface->events.commit,
- &wl_shell_view->commit);
-
- wl_shell_view->destroy.notify = handle_destroy;
- wl_signal_add(&shell_surface->events.destroy, &wl_shell_view->destroy);
-
- wl_shell_view->request_fullscreen.notify = handle_request_fullscreen;
- wl_signal_add(&shell_surface->events.request_fullscreen,
- &wl_shell_view->request_fullscreen);
-
- wl_shell_view->set_state.notify = handle_set_state;
- wl_signal_add(&shell_surface->events.set_state, &wl_shell_view->set_state);
-
- view_map(&wl_shell_view->view, shell_surface->surface);
-
- if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
- view_set_fullscreen(&wl_shell_view->view, true);
- }
-}
diff --git a/sway/meson.build b/sway/meson.build
index 570d4783..67c2a422 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -12,7 +12,6 @@ sway_sources = files(
'desktop/desktop.c',
'desktop/layer_shell.c',
'desktop/output.c',
- 'desktop/wl_shell.c',
'desktop/xdg_shell_v6.c',
'desktop/xdg_shell.c',
'desktop/xwayland.c',
diff --git a/sway/server.c b/sway/server.c
index 6147a39d..050ddf56 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -8,15 +8,14 @@
#include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_gamma_control.h>
-#include <wlr/types/wlr_linux_dmabuf.h>
+#include <wlr/types/wlr_idle.h>
#include <wlr/types/wlr_layer_shell.h>
+#include <wlr/types/wlr_linux_dmabuf.h>
#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_screenshooter.h>
#include <wlr/types/wlr_server_decoration.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_xdg_output.h>
-#include <wlr/types/wlr_wl_shell.h>
-#include <wlr/types/wlr_idle.h>
#include <wlr/util/log.h>
// TODO WLR: make Xwayland optional
#include <wlr/xwayland.h>
@@ -88,11 +87,6 @@ bool server_init(struct sway_server *server) {
&server->xdg_shell_surface);
server->xdg_shell_surface.notify = handle_xdg_shell_surface;
- server->wl_shell = wlr_wl_shell_create(server->wl_display);
- wl_signal_add(&server->wl_shell->events.new_surface,
- &server->wl_shell_surface);
- server->wl_shell_surface.notify = handle_wl_shell_surface;
-
// TODO make xwayland optional
server->xwayland =
wlr_xwayland_create(server->wl_display, server->compositor, true);
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 9f7294db..a17b20f7 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -6,7 +6,6 @@
#include <strings.h>
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
-#include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include <wlr/types/wlr_xdg_shell.h>
#include "cairo.h"
@@ -446,11 +445,6 @@ struct sway_container *container_at(struct sway_container *parent,
_surface = wlr_surface_surface_at(sview->surface,
view_sx, view_sy, &_sx, &_sy);
break;
- case SWAY_VIEW_WL_SHELL:
- _surface = wlr_wl_shell_surface_surface_at(
- sview->wlr_wl_shell_surface,
- view_sx, view_sy, &_sx, &_sy);
- break;
case SWAY_VIEW_XDG_SHELL_V6:
// the top left corner of the sway container is the
// coordinate of the top left corner of the window geometry
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 41dee1c4..e0e3c110 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -97,8 +97,6 @@ uint32_t view_get_window_type(struct sway_view *view) {
const char *view_get_type(struct sway_view *view) {
switch(view->type) {
- case SWAY_VIEW_WL_SHELL:
- return "wl_shell";
case SWAY_VIEW_XDG_SHELL_V6:
return "xdg_shell_v6";
case SWAY_VIEW_XDG_SHELL:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 11:40:32 +0000