|
|
|
|
#define _POSIX_C_SOURCE 199309L
|
|
|
|
|
#include <float.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <wayland-server-core.h>
|
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
|
#include <wlr/types/wlr_output.h>
|
|
|
|
|
#include <wlr/xwayland.h>
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "sway/desktop.h"
|
|
|
|
|
#include "sway/desktop/transaction.h"
|
|
|
|
|
#include "sway/input/cursor.h"
|
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
|
#include "sway/output.h"
|
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
|
#include "sway/tree/view.h"
|
|
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
|
|
|
|
|
static const char *atom_map[ATOM_LAST] = {
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_NORMAL",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_DIALOG",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_UTILITY",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_TOOLBAR",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_SPLASH",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_MENU",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_POPUP_MENU",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_TOOLTIP",
|
|
|
|
|
"_NET_WM_WINDOW_TYPE_NOTIFICATION",
|
|
|
|
|
"_NET_WM_STATE_MODAL",
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void unmanaged_handle_request_configure(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
wl_container_of(listener, surface, request_configure);
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
|
|
|
|
|
struct wlr_xwayland_surface_configure_event *ev = data;
|
|
|
|
|
wlr_xwayland_surface_configure(xsurface, ev->x, ev->y,
|
|
|
|
|
ev->width, ev->height);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void unmanaged_handle_commit(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
wl_container_of(listener, surface, commit);
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
|
|
|
|
|
|
|
|
|
|
if (xsurface->x != surface->lx || xsurface->y != surface->ly) {
|
|
|
|
|
// Surface has moved
|
|
|
|
|
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
|
|
|
|
|
true);
|
|
|
|
|
surface->lx = xsurface->x;
|
|
|
|
|
surface->ly = xsurface->y;
|
|
|
|
|
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly,
|
|
|
|
|
true);
|
|
|
|
|
} else {
|
|
|
|
|
desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y,
|
|
|
|
|
false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void unmanaged_handle_map(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
wl_container_of(listener, surface, map);
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
|
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
wl_list_insert(root->xwayland_unmanaged.prev, &surface->link);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->surface->events.commit, &surface->commit);
|
|
|
|
|
surface->commit.notify = unmanaged_handle_commit;
|
|
|
|
|
|
|
|
|
|
surface->lx = xsurface->x;
|
|
|
|
|
surface->ly = xsurface->y;
|
|
|
|
|
desktop_damage_surface(xsurface->surface, surface->lx, surface->ly, true);
|
|
|
|
|
|
|
|
|
|
if (wlr_xwayland_or_surface_wants_focus(xsurface)) {
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
struct wlr_xwayland *xwayland = server.xwayland.wlr_xwayland;
|
|
|
|
|
wlr_xwayland_set_seat(xwayland, seat->wlr_seat);
|
|
|
|
|
seat_set_focus_surface(seat, xsurface->surface, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void unmanaged_handle_unmap(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
wl_container_of(listener, surface, unmap);
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = surface->wlr_xwayland_surface;
|
|
|
|
|
desktop_damage_surface(xsurface->surface, xsurface->x, xsurface->y, true);
|
|
|
|
|
wl_list_remove(&surface->link);
|
|
|
|
|
wl_list_remove(&surface->commit.link);
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
if (seat->wlr_seat->keyboard_state.focused_surface == xsurface->surface) {
|
|
|
|
|
// This simply returns focus to the parent surface if there's one available.
|
|
|
|
|
// This seems to handle JetBrains issues.
|
|
|
|
|
if (xsurface->parent &&
|
|
|
|
|
wlr_surface_is_xwayland_surface(xsurface->parent->surface)) {
|
|
|
|
|
struct wlr_xwayland_surface *next_surface =
|
|
|
|
|
wlr_xwayland_surface_from_wlr_surface(xsurface->parent->surface);
|
|
|
|
|
if (wlr_xwayland_or_surface_wants_focus(next_surface)) {
|
|
|
|
|
seat_set_focus_surface(seat, xsurface->parent->surface, false);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Restore focus
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
struct sway_node *previous = seat_get_focus_inactive(seat, &root->node);
|
|
|
|
|
if (previous) {
|
|
|
|
|
// Hack to get seat to re-focus the return value of get_focus
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
seat_set_focus(seat, NULL);
|
|
|
|
|
seat_set_focus(seat, previous);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void unmanaged_handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
wl_container_of(listener, surface, destroy);
|
|
|
|
|
wl_list_remove(&surface->map.link);
|
|
|
|
|
wl_list_remove(&surface->unmap.link);
|
|
|
|
|
wl_list_remove(&surface->destroy.link);
|
|
|
|
|
free(surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct sway_xwayland_unmanaged *create_unmanaged(
|
|
|
|
|
struct wlr_xwayland_surface *xsurface) {
|
|
|
|
|
struct sway_xwayland_unmanaged *surface =
|
|
|
|
|
calloc(1, sizeof(struct sway_xwayland_unmanaged));
|
|
|
|
|
if (surface == NULL) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Allocation failed");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
surface->wlr_xwayland_surface = xsurface;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_configure,
|
|
|
|
|
&surface->request_configure);
|
|
|
|
|
surface->request_configure.notify = unmanaged_handle_request_configure;
|
|
|
|
|
wl_signal_add(&xsurface->events.map, &surface->map);
|
|
|
|
|
surface->map.notify = unmanaged_handle_map;
|
|
|
|
|
wl_signal_add(&xsurface->events.unmap, &surface->unmap);
|
|
|
|
|
surface->unmap.notify = unmanaged_handle_unmap;
|
|
|
|
|
wl_signal_add(&xsurface->events.destroy, &surface->destroy);
|
|
|
|
|
surface->destroy.notify = unmanaged_handle_destroy;
|
|
|
|
|
|
|
|
|
|
return surface;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct sway_xwayland_view *xwayland_view_from_view(
|
|
|
|
|
struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(view->type == SWAY_VIEW_XWAYLAND,
|
|
|
|
|
"Expected xwayland view")) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return (struct sway_xwayland_view *)view;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *get_string_prop(struct sway_view *view, enum sway_view_prop prop) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
switch (prop) {
|
|
|
|
|
case VIEW_PROP_TITLE:
|
|
|
|
|
return view->wlr_xwayland_surface->title;
|
|
|
|
|
case VIEW_PROP_CLASS:
|
|
|
|
|
return view->wlr_xwayland_surface->class;
|
|
|
|
|
case VIEW_PROP_INSTANCE:
|
|
|
|
|
return view->wlr_xwayland_surface->instance;
|
|
|
|
|
case VIEW_PROP_WINDOW_ROLE:
|
|
|
|
|
return view->wlr_xwayland_surface->role;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint32_t get_int_prop(struct sway_view *view, enum sway_view_prop prop) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
switch (prop) {
|
|
|
|
|
case VIEW_PROP_X11_WINDOW_ID:
|
|
|
|
|
return view->wlr_xwayland_surface->window_id;
|
|
|
|
|
case VIEW_PROP_X11_PARENT_ID:
|
|
|
|
|
if (view->wlr_xwayland_surface->parent) {
|
|
|
|
|
return view->wlr_xwayland_surface->parent->window_id;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
case VIEW_PROP_WINDOW_TYPE:
|
|
|
|
|
if (view->wlr_xwayland_surface->window_type_len == 0) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return view->wlr_xwayland_surface->window_type[0];
|
|
|
|
|
default:
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint32_t configure(struct sway_view *view, double lx, double ly, int width,
|
|
|
|
|
int height) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view = xwayland_view_from_view(view);
|
|
|
|
|
if (xwayland_view == NULL) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
|
|
|
|
|
wlr_xwayland_surface_configure(xsurface, lx, ly, width, height);
|
|
|
|
|
|
|
|
|
|
// xwayland doesn't give us a serial for the configure
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_activated(struct sway_view *view, bool activated) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
|
|
|
|
|
|
|
|
|
|
if (activated && surface->minimized) {
|
|
|
|
|
wlr_xwayland_surface_set_minimized(surface, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wlr_xwayland_surface_activate(surface, activated);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_tiled(struct sway_view *view, bool tiled) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
|
|
|
|
|
wlr_xwayland_surface_set_maximized(surface, tiled);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_fullscreen(struct sway_view *view, bool fullscreen) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
|
|
|
|
|
wlr_xwayland_surface_set_fullscreen(surface, fullscreen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool wants_floating(struct sway_view *view) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
|
|
|
|
|
struct sway_xwayland *xwayland = &server.xwayland;
|
|
|
|
|
|
|
|
|
|
if (surface->modal) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (size_t i = 0; i < surface->window_type_len; ++i) {
|
|
|
|
|
xcb_atom_t type = surface->window_type[i];
|
|
|
|
|
if (type == xwayland->atoms[NET_WM_WINDOW_TYPE_DIALOG] ||
|
|
|
|
|
type == xwayland->atoms[NET_WM_WINDOW_TYPE_UTILITY] ||
|
|
|
|
|
type == xwayland->atoms[NET_WM_WINDOW_TYPE_TOOLBAR] ||
|
|
|
|
|
type == xwayland->atoms[NET_WM_WINDOW_TYPE_SPLASH]) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
|
|
|
|
|
if (size_hints != NULL &&
|
|
|
|
|
size_hints->min_width > 0 && size_hints->min_height > 0 &&
|
|
|
|
|
(size_hints->max_width == size_hints->min_width ||
|
|
|
|
|
size_hints->max_height == size_hints->min_height)) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_decorations(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_decorations);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
|
|
|
|
|
bool csd = xsurface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
|
|
|
|
|
view_update_csd_from_client(view, csd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool is_transient_for(struct sway_view *child,
|
|
|
|
|
struct sway_view *ancestor) {
|
|
|
|
|
if (xwayland_view_from_view(child) == NULL) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_surface *surface = child->wlr_xwayland_surface;
|
|
|
|
|
while (surface) {
|
|
|
|
|
if (surface->parent == ancestor->wlr_xwayland_surface) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
surface = surface->parent;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void _close(struct sway_view *view) {
|
|
|
|
|
if (xwayland_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
wlr_xwayland_surface_close(view->wlr_xwayland_surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void destroy(struct sway_view *view) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view = xwayland_view_from_view(view);
|
|
|
|
|
if (xwayland_view == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
free(xwayland_view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void get_constraints(struct sway_view *view, double *min_width,
|
|
|
|
|
double *max_width, double *min_height, double *max_height) {
|
|
|
|
|
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
|
|
|
|
|
struct wlr_xwayland_surface_size_hints *size_hints = surface->size_hints;
|
|
|
|
|
|
|
|
|
|
if (size_hints == NULL) {
|
|
|
|
|
*min_width = DBL_MIN;
|
|
|
|
|
*max_width = DBL_MAX;
|
|
|
|
|
*min_height = DBL_MIN;
|
|
|
|
|
*max_height = DBL_MAX;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*min_width = size_hints->min_width > 0 ? size_hints->min_width : DBL_MIN;
|
|
|
|
|
*max_width = size_hints->max_width > 0 ? size_hints->max_width : DBL_MAX;
|
|
|
|
|
*min_height = size_hints->min_height > 0 ? size_hints->min_height : DBL_MIN;
|
|
|
|
|
*max_height = size_hints->max_height > 0 ? size_hints->max_height : DBL_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_view_impl view_impl = {
|
|
|
|
|
.get_constraints = get_constraints,
|
|
|
|
|
.get_string_prop = get_string_prop,
|
|
|
|
|
.get_int_prop = get_int_prop,
|
|
|
|
|
.configure = configure,
|
|
|
|
|
.set_activated = set_activated,
|
|
|
|
|
.set_tiled = set_tiled,
|
|
|
|
|
.set_fullscreen = set_fullscreen,
|
|
|
|
|
.wants_floating = wants_floating,
|
|
|
|
|
.is_transient_for = is_transient_for,
|
|
|
|
|
.close = _close,
|
|
|
|
|
.destroy = destroy,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void get_geometry(struct sway_view *view, struct wlr_box *box) {
|
|
|
|
|
box->x = box->y = 0;
|
|
|
|
|
if (view->surface) {
|
|
|
|
|
box->width = view->surface->current.width;
|
|
|
|
|
box->height = view->surface->current.height;
|
|
|
|
|
} else {
|
|
|
|
|
box->width = 0;
|
|
|
|
|
box->height = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_commit(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, commit);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
struct wlr_surface_state *state = &xsurface->surface->current;
|
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (view->container->node.instruction) {
|
|
|
|
|
get_geometry(view, &view->geometry);
|
|
|
|
|
transaction_notify_view_ready_by_size(view,
|
|
|
|
|
state->width, state->height);
|
|
|
|
|
} else {
|
|
|
|
|
struct wlr_box new_geo;
|
|
|
|
|
get_geometry(view, &new_geo);
|
|
|
|
|
|
|
|
|
|
if ((new_geo.width != view->geometry.width ||
|
|
|
|
|
new_geo.height != view->geometry.height ||
|
|
|
|
|
new_geo.x != view->geometry.x ||
|
|
|
|
|
new_geo.y != view->geometry.y)) {
|
|
|
|
|
// The view has unexpectedly sent a new size
|
|
|
|
|
// eg. The Firefox "Save As" dialog when downloading a file
|
|
|
|
|
desktop_damage_view(view);
|
|
|
|
|
view_update_size(view, new_geo.width, new_geo.height);
|
|
|
|
|
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
|
|
|
|
|
desktop_damage_view(view);
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
transaction_notify_view_ready_by_size(view,
|
|
|
|
|
new_geo.width, new_geo.height);
|
|
|
|
|
} else {
|
|
|
|
|
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_damage_from(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, destroy);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
|
|
|
|
|
if (view->surface) {
|
|
|
|
|
view_unmap(view);
|
|
|
|
|
wl_list_remove(&xwayland_view->commit.link);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&xwayland_view->destroy.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_configure.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_fullscreen.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_minimize.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_move.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_resize.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->request_activate.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_title.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_class.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_role.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_window_type.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_hints.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->set_decorations.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->map.link);
|
|
|
|
|
wl_list_remove(&xwayland_view->unmap.link);
|
|
|
|
|
view_begin_destroy(&xwayland_view->view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_unmap(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, unmap);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
|
|
|
|
|
if (!sway_assert(view->surface, "Cannot unmap unmapped view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_unmap(view);
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&xwayland_view->commit.link);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_map(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, map);
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = data;
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
|
|
|
|
|
if (xsurface->override_redirect) {
|
|
|
|
|
// This window used not to have the override redirect flag and has it
|
|
|
|
|
// now. Switch to unmanaged.
|
|
|
|
|
handle_destroy(&xwayland_view->destroy, view);
|
|
|
|
|
xsurface->data = NULL;
|
|
|
|
|
struct sway_xwayland_unmanaged *unmanaged = create_unmanaged(xsurface);
|
|
|
|
|
unmanaged_handle_map(&unmanaged->map, xsurface);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view->natural_width = xsurface->width;
|
|
|
|
|
view->natural_height = xsurface->height;
|
|
|
|
|
|
|
|
|
|
// Wire up the commit listener here, because xwayland map/unmap can change
|
|
|
|
|
// the underlying wlr_surface
|
|
|
|
|
wl_signal_add(&xsurface->surface->events.commit, &xwayland_view->commit);
|
|
|
|
|
xwayland_view->commit.notify = handle_commit;
|
|
|
|
|
|
|
|
|
|
// Put it back into the tree
|
|
|
|
|
view_map(view, xsurface->surface, xsurface->fullscreen, NULL, false);
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_configure(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_configure);
|
|
|
|
|
struct wlr_xwayland_surface_configure_event *ev = data;
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
wlr_xwayland_surface_configure(xsurface, ev->x, ev->y,
|
|
|
|
|
ev->width, ev->height);
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (container_is_floating(view->container)) {
|
|
|
|
|
// Respect minimum and maximum sizes
|
|
|
|
|
view->natural_width = ev->width;
|
|
|
|
|
view->natural_height = ev->height;
|
|
|
|
|
container_floating_resize_and_center(view->container);
|
|
|
|
|
|
|
|
|
|
configure(view, view->container->content_x,
|
|
|
|
|
view->container->content_y,
|
|
|
|
|
view->container->content_width,
|
|
|
|
|
view->container->content_height);
|
|
|
|
|
node_set_dirty(&view->container->node);
|
|
|
|
|
} else {
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
6 years ago
|
|
|
configure(view, view->container->current.content_x,
|
|
|
|
|
view->container->current.content_y,
|
|
|
|
|
view->container->current.content_width,
|
|
|
|
|
view->container->current.content_height);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_fullscreen);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
container_set_fullscreen(view->container, xsurface->fullscreen);
|
|
|
|
|
|
|
|
|
|
arrange_root();
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_minimize(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_minimize);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct wlr_xwayland_minimize_event *e = data;
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
bool focused = seat_get_focus(seat) == &view->container->node;
|
|
|
|
|
wlr_xwayland_surface_set_minimized(xsurface, !focused && e->minimize);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_move(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_move);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (!container_is_floating(view->container)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
Introduce default seatop
This introduces a `default` seat operation which is used when no mouse
buttons are being held. This means there is now always a seat operation
in progress. It allows us to separate `default` code from the standard
cursor management code.
The sway_seatop_impl struct has gained callbacks `axis`, `rebase` and
`end`, and lost callbacks `finish` and `abort`. `axis` and `rebase` are
only used by the default seatop. `end` is called when a seatop is being
replaced by another one and allows the seatop to free any resources,
though no seatop currently needs to do this. `finish` is no longer
required, as each seatop can gracefully finish in their `button`
callback. And `abort` is not needed, as calling `end` would achieve the
same thing. The struct has also gained a bool named allow_set_cursor
which allows the client to set a new cursor during `default` and `down`
seatops.
Seatops would previously store which button they were started with and
stop when that button was released. This behaviour is changed so that it
only ends once all buttons are released. So you can start a drag with
$mod+left, then click and hold right, release left and it'll continue
dragging while the right button is held.
The motion callback now accepts dx and dy. Most seatops don't use this
as they store the cursor position when the seatop is started and compare
it with the current cursor position. This approach doesn't make sense
for the default seatop though, hence why dx and dy are needed.
The pressed_buttons array has been moved from the sway_cursor struct to
the default seatop's data. This is only used for the default seatop to
check bindings. The total pressed button count remains in the
sway_cursor struct though, because all the other seatops check it to
know if they should end.
The `down` seatop no longer has a `moved` property. This was used to
track if the cursor moved and to recheck focus_follows_mouse, but seems
to work without it.
The logic for focus_follows_mouse has been refactored. As part of this
I've removed the call to wlr_seat_keyboard_has_grab as we don't appear
to use keyboard grabs.
The functions for handling relative motion, absolute motion and tool
axis have been changed. Previously the handler functions were
handle_cursor_motion, handle_cursor_motion_absolute and
handle_tool_axis. The latter two both called cursor_motion_absolute.
Both handle_cursor_motion and cursor_motion_absolute did very similar
things. These are now simplified into three handlers and a single common
function called cursor_motion. All three handlers call cursor_motion. As
cursor_motion works with relative distances, the absolute and tool axis
handlers convert them to relative first.
6 years ago
|
|
|
seatop_begin_move_floating(seat, view->container);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_resize(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_resize);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (!container_is_floating(view->container)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xwayland_resize_event *e = data;
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
Introduce default seatop
This introduces a `default` seat operation which is used when no mouse
buttons are being held. This means there is now always a seat operation
in progress. It allows us to separate `default` code from the standard
cursor management code.
The sway_seatop_impl struct has gained callbacks `axis`, `rebase` and
`end`, and lost callbacks `finish` and `abort`. `axis` and `rebase` are
only used by the default seatop. `end` is called when a seatop is being
replaced by another one and allows the seatop to free any resources,
though no seatop currently needs to do this. `finish` is no longer
required, as each seatop can gracefully finish in their `button`
callback. And `abort` is not needed, as calling `end` would achieve the
same thing. The struct has also gained a bool named allow_set_cursor
which allows the client to set a new cursor during `default` and `down`
seatops.
Seatops would previously store which button they were started with and
stop when that button was released. This behaviour is changed so that it
only ends once all buttons are released. So you can start a drag with
$mod+left, then click and hold right, release left and it'll continue
dragging while the right button is held.
The motion callback now accepts dx and dy. Most seatops don't use this
as they store the cursor position when the seatop is started and compare
it with the current cursor position. This approach doesn't make sense
for the default seatop though, hence why dx and dy are needed.
The pressed_buttons array has been moved from the sway_cursor struct to
the default seatop's data. This is only used for the default seatop to
check bindings. The total pressed button count remains in the
sway_cursor struct though, because all the other seatops check it to
know if they should end.
The `down` seatop no longer has a `moved` property. This was used to
track if the cursor moved and to recheck focus_follows_mouse, but seems
to work without it.
The logic for focus_follows_mouse has been refactored. As part of this
I've removed the call to wlr_seat_keyboard_has_grab as we don't appear
to use keyboard grabs.
The functions for handling relative motion, absolute motion and tool
axis have been changed. Previously the handler functions were
handle_cursor_motion, handle_cursor_motion_absolute and
handle_tool_axis. The latter two both called cursor_motion_absolute.
Both handle_cursor_motion and cursor_motion_absolute did very similar
things. These are now simplified into three handlers and a single common
function called cursor_motion. All three handlers call cursor_motion. As
cursor_motion works with relative distances, the absolute and tool axis
handlers convert them to relative first.
6 years ago
|
|
|
seatop_begin_resize_floating(seat, view->container, e->edges);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_activate(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, request_activate);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_request_activate(view);
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_title(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_title);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_update_title(view, false);
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_class(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_class);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_role(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_role);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_window_type(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_window_type);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_hints(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
wl_container_of(listener, xwayland_view, set_hints);
|
|
|
|
|
struct sway_view *view = &xwayland_view->view;
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
|
|
|
|
|
if (!xsurface->mapped) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!xsurface->hints_urgency && view->urgent_timer) {
|
|
|
|
|
// The view is in the timeout period. We'll ignore the request to
|
|
|
|
|
// unset urgency so that the view remains urgent until the timer clears
|
|
|
|
|
// it.
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (view->allow_request_urgent) {
|
|
|
|
|
view_set_urgent(view, (bool)xsurface->hints_urgency);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_view *view_from_wlr_xwayland_surface(
|
|
|
|
|
struct wlr_xwayland_surface *xsurface) {
|
|
|
|
|
return xsurface->data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handle_xwayland_surface(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct wlr_xwayland_surface *xsurface = data;
|
|
|
|
|
|
|
|
|
|
if (xsurface->override_redirect) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "New xwayland unmanaged surface");
|
|
|
|
|
create_unmanaged(xsurface);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "New xwayland surface title='%s' class='%s'",
|
|
|
|
|
xsurface->title, xsurface->class);
|
|
|
|
|
|
|
|
|
|
struct sway_xwayland_view *xwayland_view =
|
|
|
|
|
calloc(1, sizeof(struct sway_xwayland_view));
|
|
|
|
|
if (!sway_assert(xwayland_view, "Failed to allocate view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_init(&xwayland_view->view, SWAY_VIEW_XWAYLAND, &view_impl);
|
|
|
|
|
xwayland_view->view.wlr_xwayland_surface = xsurface;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.destroy, &xwayland_view->destroy);
|
|
|
|
|
xwayland_view->destroy.notify = handle_destroy;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_configure,
|
|
|
|
|
&xwayland_view->request_configure);
|
|
|
|
|
xwayland_view->request_configure.notify = handle_request_configure;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_fullscreen,
|
|
|
|
|
&xwayland_view->request_fullscreen);
|
|
|
|
|
xwayland_view->request_fullscreen.notify = handle_request_fullscreen;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_minimize,
|
|
|
|
|
&xwayland_view->request_minimize);
|
|
|
|
|
xwayland_view->request_minimize.notify = handle_request_minimize;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_activate,
|
|
|
|
|
&xwayland_view->request_activate);
|
|
|
|
|
xwayland_view->request_activate.notify = handle_request_activate;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_move,
|
|
|
|
|
&xwayland_view->request_move);
|
|
|
|
|
xwayland_view->request_move.notify = handle_request_move;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.request_resize,
|
|
|
|
|
&xwayland_view->request_resize);
|
|
|
|
|
xwayland_view->request_resize.notify = handle_request_resize;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_title, &xwayland_view->set_title);
|
|
|
|
|
xwayland_view->set_title.notify = handle_set_title;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_class, &xwayland_view->set_class);
|
|
|
|
|
xwayland_view->set_class.notify = handle_set_class;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_role, &xwayland_view->set_role);
|
|
|
|
|
xwayland_view->set_role.notify = handle_set_role;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_window_type,
|
|
|
|
|
&xwayland_view->set_window_type);
|
|
|
|
|
xwayland_view->set_window_type.notify = handle_set_window_type;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_hints, &xwayland_view->set_hints);
|
|
|
|
|
xwayland_view->set_hints.notify = handle_set_hints;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.set_decorations,
|
|
|
|
|
&xwayland_view->set_decorations);
|
|
|
|
|
xwayland_view->set_decorations.notify = handle_set_decorations;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.unmap, &xwayland_view->unmap);
|
|
|
|
|
xwayland_view->unmap.notify = handle_unmap;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xsurface->events.map, &xwayland_view->map);
|
|
|
|
|
xwayland_view->map.notify = handle_map;
|
|
|
|
|
|
|
|
|
|
xsurface->data = xwayland_view;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handle_xwayland_ready(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_server *server =
|
|
|
|
|
wl_container_of(listener, server, xwayland_ready);
|
|
|
|
|
struct sway_xwayland *xwayland = &server->xwayland;
|
|
|
|
|
|
|
|
|
|
xcb_connection_t *xcb_conn = xcb_connect(NULL, NULL);
|
|
|
|
|
int err = xcb_connection_has_error(xcb_conn);
|
|
|
|
|
if (err) {
|
|
|
|
|
sway_log(SWAY_ERROR, "XCB connect failed: %d", err);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xcb_intern_atom_cookie_t cookies[ATOM_LAST];
|
|
|
|
|
for (size_t i = 0; i < ATOM_LAST; i++) {
|
|
|
|
|
cookies[i] =
|
|
|
|
|
xcb_intern_atom(xcb_conn, 0, strlen(atom_map[i]), atom_map[i]);
|
|
|
|
|
}
|
|
|
|
|
for (size_t i = 0; i < ATOM_LAST; i++) {
|
|
|
|
|
xcb_generic_error_t *error = NULL;
|
|
|
|
|
xcb_intern_atom_reply_t *reply =
|
|
|
|
|
xcb_intern_atom_reply(xcb_conn, cookies[i], &error);
|
|
|
|
|
if (reply != NULL && error == NULL) {
|
|
|
|
|
xwayland->atoms[i] = reply->atom;
|
|
|
|
|
}
|
|
|
|
|
free(reply);
|
|
|
|
|
|
|
|
|
|
if (error != NULL) {
|
|
|
|
|
sway_log(SWAY_ERROR, "could not resolve atom %s, X11 error code %d",
|
|
|
|
|
atom_map[i], error->error_code);
|
|
|
|
|
free(error);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xcb_disconnect(xcb_conn);
|
|
|
|
|
}
|
