mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-23 14:11:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Kill wl_shell

Browse Source
This commit is contained in:
emersion 2018-04-29 09:40:58 +01:00
parent 4e6cb2b4b2
commit 95a10dd4f3
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
9 changed files with 2 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sway/server.h
View File

@ -58,6 +58,5 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data);
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data);
void handle_xdg_shell_surface(struct wl_listener *listener, void *data);
void handle_xwayland_surface(struct wl_listener *listener, void *data);
void handle_wl_shell_surface(struct wl_listener *listener, void *data);
#endif

15
include/sway/tree/view.h
View File

@ -10,7 +10,6 @@
struct sway_container;
enum sway_view_type {
SWAY_VIEW_WL_SHELL,
SWAY_VIEW_XDG_SHELL_V6,
SWAY_VIEW_XDG_SHELL,
SWAY_VIEW_XWAYLAND,
@ -139,20 +138,6 @@ struct sway_xwayland_unmanaged {
struct wl_listener destroy;
};
struct sway_wl_shell_view {
struct sway_view view;
struct wl_listener commit;
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;
struct wl_listener set_state;
struct wl_listener destroy;
int pending_width, pending_height;
};
struct sway_view_child;
struct sway_view_child_impl {

1
sway/commands/fullscreen.c
View File

@ -1,4 +1,3 @@
#include <wlr/types/wlr_wl_shell.h>
#include "log.h"
#include "sway/commands.h"
#include "sway/config.h"

1
sway/desktop/output.c
View File

@ -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"

165
sway/desktop/wl_shell.c
View File

@ -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);
}
}

1
sway/meson.build
View File

@ -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',

10
sway/server.c
View File

@ -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);

6
sway/tree/container.c
View File

@ -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

2
sway/tree/view.c
View File

@ -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: