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

Set withdrawn state for xwayland views

Browse source 
References: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4057
This commit is contained in:
novenary 2023-03-16 00:16:16 +02:00
parent 51c9376c07
commit faa6dc5687
4 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/tree/view.h
View file

@ -44,6 +44,7 @@ struct sway_view_impl {
void (*set_tiled)(struct sway_view *view, bool tiled);
void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
void (*set_resizing)(struct sway_view *view, bool resizing);
void (*set_withdrawn)(struct sway_view *view, bool withdrawn);
bool (*wants_floating)(struct sway_view *view);
void (*for_each_surface)(struct sway_view *view,
wlr_surface_iterator_func_t iterator, void *user_data);
@ -366,6 +367,8 @@ bool view_is_visible(struct sway_view *view);
void view_set_urgent(struct sway_view *view, bool enable);
void view_set_withdrawn(struct sway_view *view, bool withdrawn);
bool view_is_urgent(struct sway_view *view);
void view_remove_saved_buffer(struct sway_view *view);

13
sway/desktop/transaction.c
View file

@ -212,12 +212,25 @@ static void transaction_add_node(struct sway_transaction *transaction,
}
}
void container_iterator(struct sway_container *con, void *data) {
bool *is_current = data;
if (con->view) {
view_set_withdrawn(con->view, !*is_current);
}
}
void workspace_iterator(struct sway_workspace *ws, void *data) {
bool is_current = workspace_is_visible(ws);
workspace_for_each_container(ws, container_iterator, &is_current);
}
static void apply_output_state(struct sway_output *output,
struct sway_output_state *state) {
output_damage_whole(output);
list_free(output->current.workspaces);
memcpy(&output->current, state, sizeof(struct sway_output_state));
output_damage_whole(output);
output_for_each_workspace(output, workspace_iterator, NULL);
}
static void apply_workspace_state(struct sway_workspace *ws,

11
sway/desktop/xwayland.c
View file

@ -293,6 +293,16 @@ static void set_fullscreen(struct sway_view *view, bool fullscreen) {
wlr_xwayland_surface_set_fullscreen(surface, fullscreen);
}
static void set_withdrawn(struct sway_view *view, bool withdrawn) {
if (xwayland_view_from_view(view) == NULL) {
return;
}
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
if (surface->withdrawn != withdrawn) {
wlr_xwayland_surface_set_withdrawn(surface, withdrawn);
}
}
static bool wants_floating(struct sway_view *view) {
if (xwayland_view_from_view(view) == NULL) {
return false;
@ -392,6 +402,7 @@ static const struct sway_view_impl view_impl = {
.set_activated = set_activated,
.set_tiled = set_tiled,
.set_fullscreen = set_fullscreen,
.set_withdrawn = set_withdrawn,
.wants_floating = wants_floating,
.is_transient_for = is_transient_for,
.close = _close,

6
sway/tree/view.c
View file

@ -431,6 +431,12 @@ void view_set_tiled(struct sway_view *view, bool tiled) {
}
}
void view_set_withdrawn(struct sway_view *view, bool withdrawn) {
if (view->impl->set_withdrawn) {
view->impl->set_withdrawn(view, withdrawn);
}
}
void view_close(struct sway_view *view) {
if (view->impl->close) {
view->impl->close(view);