mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-22 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scene_graph: Port seat drag icons

Browse source
This commit is contained in:
Alexander Orzechowski 2022-04-30 00:00:25 -04:00 • committed by Kirill Primak
parent 4927531b37
commit a6d4f4d3b5
10 changed files with 90 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

22
include/sway/input/seat.h
View file

@ -5,6 +5,7 @@
#include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include <wlr/util/edges.h> #include <wlr/util/edges.h>
#include <wlr/types/wlr_scene.h>
#include "sway/config.h" #include "sway/config.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/tablet.h" #include "sway/input/tablet.h"
@ -67,16 +68,12 @@ struct sway_seat_node {
}; };
struct sway_drag_icon { struct sway_drag_icon {
struct sway_seat *seat;
struct wlr_drag_icon *wlr_drag_icon; struct wlr_drag_icon *wlr_drag_icon;
struct wl_list link; // sway_root::drag_icons struct wlr_scene_tree *tree;
struct wlr_scene_tree *surface_tree;
double x, y; // in layout-local coordinates
struct wl_listener surface_commit;
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener commit;
}; };
struct sway_drag { struct sway_drag {
@ -89,6 +86,15 @@ struct sway_seat {
struct wlr_seat *wlr_seat; struct wlr_seat *wlr_seat;
struct sway_cursor *cursor; struct sway_cursor *cursor;
// Seat scene tree structure
// - scene_tree
// - drag icons
// - drag icon 1
// - drag icon 2
// - seatop specific stuff
struct wlr_scene_tree *scene_tree;
struct wlr_scene_tree *drag_icons;
bool has_focus; bool has_focus;
struct wl_list focus_stack; // list of containers in focus order struct wl_list focus_stack; // list of containers in focus order
struct sway_workspace *workspace; struct sway_workspace *workspace;
@ -247,7 +253,7 @@ void seat_idle_notify_activity(struct sway_seat *seat,
bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface); bool seat_is_input_allowed(struct sway_seat *seat, struct wlr_surface *surface);
void drag_icon_update_position(struct sway_drag_icon *icon); void drag_icon_update_position(struct sway_seat *seat, struct sway_drag_icon *icon);
enum wlr_edges find_resize_edge(struct sway_container *cont, enum wlr_edges find_resize_edge(struct sway_container *cont,
struct wlr_surface *surface, struct sway_cursor *cursor); struct wlr_surface *surface, struct sway_cursor *cursor);

4
include/sway/output.h
View file

@ -159,10 +159,6 @@ void output_unmanaged_for_each_surface(struct sway_output *output,
void *user_data); void *user_data);
#endif #endif
void output_drag_icons_for_each_surface(struct sway_output *output,
struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
void *user_data);
void output_for_each_workspace(struct sway_output *output, void output_for_each_workspace(struct sway_output *output,
void (*f)(struct sway_workspace *ws, void *data), void *data); void (*f)(struct sway_workspace *ws, void *data), void *data);

1
include/sway/scene_descriptor.h
View file

@ -4,6 +4,7 @@
enum sway_scene_descriptor_type { enum sway_scene_descriptor_type {
SWAY_SCENE_DESC_BUFFER_TIMER, SWAY_SCENE_DESC_BUFFER_TIMER,
SWAY_SCENE_DESC_DRAG_ICON,
}; };
struct sway_scene_descriptor { struct sway_scene_descriptor {

2
include/sway/tree/root.h
View file

@ -40,12 +40,12 @@ struct sway_root {
struct wlr_scene_tree *floating; struct wlr_scene_tree *floating;
struct wlr_scene_tree *fullscreen; struct wlr_scene_tree *fullscreen;
struct wlr_scene_tree *fullscreen_global; struct wlr_scene_tree *fullscreen_global;
struct wlr_scene_tree *seat;
} layers; } layers;
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
#endif #endif
struct wl_list drag_icons; // sway_drag_icon::link
// Includes disabled outputs // Includes disabled outputs
struct wl_list all_outputs; // sway_output::link struct wl_list all_outputs; // sway_output::link

16
sway/desktop/output.c
View file

@ -246,22 +246,6 @@ void output_unmanaged_for_each_surface(struct sway_output *output,
} }
#endif #endif
void output_drag_icons_for_each_surface(struct sway_output *output,
struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
void *user_data) {
struct sway_drag_icon *drag_icon;
wl_list_for_each(drag_icon, drag_icons, link) {
double ox = drag_icon->x - output->lx;
double oy = drag_icon->y - output->ly;
if (drag_icon->wlr_drag_icon->mapped) {
output_surface_for_each_surface(output,
drag_icon->wlr_drag_icon->surface, ox, oy,
iterator, user_data);
}
}
}
static int scale_length(int length, int offset, float scale) { static int scale_length(int length, int offset, float scale) {
return round((offset + length) * scale) - round(offset * scale); return round((offset + length) * scale) - round(offset * scale);
} }

11
sway/desktop/render.c
View file

@ -201,16 +201,6 @@ static void render_unmanaged(struct sway_output *output,
} }
#endif #endif
static void render_drag_icons(struct sway_output *output,
pixman_region32_t *damage, struct wl_list *drag_icons) {
struct render_data data = {
.damage = damage,
.alpha = 1.0f,
};
output_drag_icons_for_each_surface(output, drag_icons,
render_surface_iterator, &data);
}
// _box.x and .y are expected to be layout-local // _box.x and .y are expected to be layout-local
// _box.width and .height are expected to be output-buffer-local // _box.width and .height are expected to be output-buffer-local
void render_rect(struct sway_output *output, void render_rect(struct sway_output *output,
@ -1171,7 +1161,6 @@ render_overlay:
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
render_layer_popups(output, damage, render_layer_popups(output, damage,
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); &output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
render_drag_icons(output, damage, &root->drag_icons);
renderer_end: renderer_end:
wlr_renderer_scissor(renderer, NULL); wlr_renderer_scissor(renderer, NULL);

14
sway/input/cursor.c
View file

@ -19,12 +19,12 @@
#include "log.h" #include "log.h"
#include "util.h" #include "util.h"
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/desktop.h"
#include "sway/input/cursor.h" #include "sway/input/cursor.h"
#include "sway/input/keyboard.h" #include "sway/input/keyboard.h"
#include "sway/input/tablet.h" #include "sway/input/tablet.h"
#include "sway/layers.h" #include "sway/layers.h"
#include "sway/output.h" #include "sway/output.h"
#include "sway/scene_descriptor.h"
#include "sway/tree/container.h" #include "sway/tree/container.h"
#include "sway/tree/root.h" #include "sway/tree/root.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
@ -541,11 +541,13 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
seat->touch_x = lx; seat->touch_x = lx;
seat->touch_y = ly; seat->touch_y = ly;
struct sway_drag_icon *drag_icon; struct wlr_scene_node *node;
wl_list_for_each(drag_icon, &root->drag_icons, link) { wl_list_for_each(node, &seat->drag_icons->children, link) {
if (drag_icon->seat == seat) { struct sway_scene_descriptor *desc = node->data;
drag_icon_update_position(drag_icon);
} sway_assert(desc && desc->type == SWAY_SCENE_DESC_DRAG_ICON,
"Corrupted scene tree: expected a drag icon");
drag_icon_update_position(seat, desc->data);
} }
} }

101
sway/input/seat.c
View file

@ -18,7 +18,7 @@
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/desktop.h" #include "sway/scene_descriptor.h"
#include "sway/input/cursor.h" #include "sway/input/cursor.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/keyboard.h" #include "sway/input/keyboard.h"
@ -92,6 +92,7 @@ void seat_destroy(struct sway_seat *seat) {
for (int i = 0; i < seat->deferred_bindings->length; i++) { for (int i = 0; i < seat->deferred_bindings->length; i++) {
free_sway_binding(seat->deferred_bindings->items[i]); free_sway_binding(seat->deferred_bindings->items[i]);
} }
wlr_scene_node_destroy(&seat->scene_tree->node);
list_free(seat->deferred_bindings); list_free(seat->deferred_bindings);
free(seat->prev_workspace_name); free(seat->prev_workspace_name);
free(seat); free(seat);
@ -365,25 +366,15 @@ static void handle_new_node(struct wl_listener *listener, void *data) {
seat_node_from_node(seat, node); seat_node_from_node(seat, node);
} }
static void drag_icon_damage_whole(struct sway_drag_icon *icon) { void drag_icon_update_position(struct sway_seat *seat, struct sway_drag_icon *icon) {
if (!icon->wlr_drag_icon->mapped) {
return;
}
desktop_damage_surface(icon->wlr_drag_icon->surface, icon->x, icon->y, true);
}
void drag_icon_update_position(struct sway_drag_icon *icon) {
drag_icon_damage_whole(icon);
struct wlr_drag_icon *wlr_icon = icon->wlr_drag_icon; struct wlr_drag_icon *wlr_icon = icon->wlr_drag_icon;
struct sway_seat *seat = icon->seat;
struct wlr_cursor *cursor = seat->cursor->cursor; struct wlr_cursor *cursor = seat->cursor->cursor;
switch (wlr_icon->drag->grab_type) { switch (wlr_icon->drag->grab_type) {
case WLR_DRAG_GRAB_KEYBOARD: case WLR_DRAG_GRAB_KEYBOARD:
return; return;
case WLR_DRAG_GRAB_KEYBOARD_POINTER: case WLR_DRAG_GRAB_KEYBOARD_POINTER:
icon->x = cursor->x + wlr_icon->surface->sx; wlr_scene_node_set_position(&icon->tree->node, cursor->x, cursor->y);
icon->y = cursor->y + wlr_icon->surface->sy;
break; break;
case WLR_DRAG_GRAB_KEYBOARD_TOUCH:; case WLR_DRAG_GRAB_KEYBOARD_TOUCH:;
struct wlr_touch_point *point = struct wlr_touch_point *point =
@ -391,38 +382,23 @@ void drag_icon_update_position(struct sway_drag_icon *icon) {
if (point == NULL) { if (point == NULL) {
return; return;
} }
icon->x = seat->touch_x + wlr_icon->surface->sx; wlr_scene_node_set_position(&icon->tree->node, seat->touch_x, seat->touch_y);
icon->y = seat->touch_y + wlr_icon->surface->sy; }
} }
drag_icon_damage_whole(icon); static void drag_icon_handle_commit(struct wl_listener *listener, void *data) {
} struct sway_drag_icon *icon = wl_container_of(listener, icon, commit);
struct wlr_surface *surface = icon->wlr_drag_icon->surface;
static void drag_icon_handle_surface_commit(struct wl_listener *listener, wlr_scene_node_set_position(&icon->surface_tree->node,
void *data) { surface->sx, surface->sy);
struct sway_drag_icon *icon =
wl_container_of(listener, icon, surface_commit);
drag_icon_update_position(icon);
}
static void drag_icon_handle_map(struct wl_listener *listener, void *data) {
struct sway_drag_icon *icon = wl_container_of(listener, icon, map);
drag_icon_damage_whole(icon);
}
static void drag_icon_handle_unmap(struct wl_listener *listener, void *data) {
struct sway_drag_icon *icon = wl_container_of(listener, icon, unmap);
drag_icon_damage_whole(icon);
} }
static void drag_icon_handle_destroy(struct wl_listener *listener, void *data) { static void drag_icon_handle_destroy(struct wl_listener *listener, void *data) {
struct sway_drag_icon *icon = wl_container_of(listener, icon, destroy); struct sway_drag_icon *icon = wl_container_of(listener, icon, destroy);
icon->wlr_drag_icon->data = NULL; icon->wlr_drag_icon->data = NULL;
wl_list_remove(&icon->link); wl_list_remove(&icon->commit.link);
wl_list_remove(&icon->surface_commit.link);
wl_list_remove(&icon->unmap.link);
wl_list_remove(&icon->map.link);
wl_list_remove(&icon->destroy.link); wl_list_remove(&icon->destroy.link);
wlr_scene_node_destroy(&icon->tree->node);
free(icon); free(icon);
} }
@ -500,22 +476,40 @@ static void handle_start_drag(struct wl_listener *listener, void *data) {
sway_log(SWAY_ERROR, "Allocation failed"); sway_log(SWAY_ERROR, "Allocation failed");
return; return;
} }
icon->seat = seat;
icon->tree = wlr_scene_tree_create(seat->drag_icons);
if (!icon->tree) {
sway_log(SWAY_ERROR, "Failed to allocate a drag icon scene tree");
free(icon);
return;
}
icon->surface_tree = wlr_scene_subsurface_tree_create(icon->tree,
wlr_drag_icon->surface);
if (!icon->surface_tree) {
sway_log(SWAY_ERROR, "Failed to allocate a drag icon surface");
wlr_scene_node_destroy(&icon->tree->node);
free(icon);
return;
}
scene_descriptor_assign(&icon->tree->node, SWAY_SCENE_DESC_DRAG_ICON, icon);
if (!icon->tree->node.data) {
wlr_scene_node_destroy(&icon->tree->node);
free(icon);
return;
}
icon->wlr_drag_icon = wlr_drag_icon; icon->wlr_drag_icon = wlr_drag_icon;
wlr_drag_icon->data = icon; wlr_drag_icon->data = icon;
icon->surface_commit.notify = drag_icon_handle_surface_commit; icon->commit.notify = drag_icon_handle_commit;
wl_signal_add(&wlr_drag_icon->surface->events.commit, &icon->surface_commit); wl_signal_add(&wlr_drag_icon->surface->events.commit, &icon->commit);
icon->unmap.notify = drag_icon_handle_unmap;
wl_signal_add(&wlr_drag_icon->events.unmap, &icon->unmap);
icon->map.notify = drag_icon_handle_map;
wl_signal_add(&wlr_drag_icon->events.map, &icon->map);
icon->destroy.notify = drag_icon_handle_destroy; icon->destroy.notify = drag_icon_handle_destroy;
wl_signal_add(&wlr_drag_icon->events.destroy, &icon->destroy); wl_signal_add(&wlr_drag_icon->events.destroy, &icon->destroy);
wl_list_insert(&root->drag_icons, &icon->link); drag_icon_update_position(seat, icon);
drag_icon_update_position(icon);
} }
seatop_begin_default(seat); seatop_begin_default(seat);
} }
@ -562,8 +556,18 @@ struct sway_seat *seat_create(const char *seat_name) {
return NULL; return NULL;
} }
bool alloc_failure = false;
seat->scene_tree = alloc_scene_tree(root->layers.seat, &alloc_failure);
seat->drag_icons = alloc_scene_tree(seat->scene_tree, &alloc_failure);
if (alloc_failure) {
wlr_scene_node_destroy(&seat->scene_tree->node);
free(seat);
return NULL;
}
seat->wlr_seat = wlr_seat_create(server.wl_display, seat_name); seat->wlr_seat = wlr_seat_create(server.wl_display, seat_name);
if (!sway_assert(seat->wlr_seat, "could not allocate seat")) { if (!sway_assert(seat->wlr_seat, "could not allocate seat")) {
wlr_scene_node_destroy(&seat->scene_tree->node);
free(seat); free(seat);
return NULL; return NULL;
} }
@ -571,6 +575,7 @@ struct sway_seat *seat_create(const char *seat_name) {
seat->cursor = sway_cursor_create(seat); seat->cursor = sway_cursor_create(seat);
if (!seat->cursor) { if (!seat->cursor) {
wlr_scene_node_destroy(&seat->scene_tree->node);
wlr_seat_destroy(seat->wlr_seat); wlr_seat_destroy(seat->wlr_seat);
free(seat); free(seat);
return NULL; return NULL;

26
sway/input/seatop_default.c
View file

@ -10,6 +10,7 @@
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/input/tablet.h" #include "sway/input/tablet.h"
#include "sway/output.h" #include "sway/output.h"
#include "sway/scene_descriptor.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "log.h" #include "log.h"
@ -585,6 +586,17 @@ static void check_focus_follows_mouse(struct sway_seat *seat,
} }
} }
static void drag_icons_update_position(struct sway_seat *seat) {
struct wlr_scene_node *node;
wl_list_for_each(node, &seat->drag_icons->children, link) {
struct sway_scene_descriptor *desc = node->data;
sway_assert(desc && desc->type == SWAY_SCENE_DESC_DRAG_ICON,
"Corrupted scene tree: expected drag icon");
drag_icon_update_position(seat, desc->data);
}
}
static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) { static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
struct seatop_default_event *e = seat->seatop_data; struct seatop_default_event *e = seat->seatop_data;
struct sway_cursor *cursor = seat->cursor; struct sway_cursor *cursor = seat->cursor;
@ -608,12 +620,7 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) {
wlr_seat_pointer_notify_clear_focus(seat->wlr_seat); wlr_seat_pointer_notify_clear_focus(seat->wlr_seat);
} }
struct sway_drag_icon *drag_icon; drag_icons_update_position(seat);
wl_list_for_each(drag_icon, &root->drag_icons, link) {
if (drag_icon->seat == seat) {
drag_icon_update_position(drag_icon);
}
}
e->previous_node = node; e->previous_node = node;
} }
@ -643,12 +650,7 @@ static void handle_tablet_tool_motion(struct sway_seat *seat,
wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool); wlr_tablet_v2_tablet_tool_notify_proximity_out(tool->tablet_v2_tool);
} }
struct sway_drag_icon *drag_icon; drag_icons_update_position(seat);
wl_list_for_each(drag_icon, &root->drag_icons, link) {
if (drag_icon->seat == seat) {
drag_icon_update_position(drag_icon);
}
}
e->previous_node = node; e->previous_node = node;
} }

1
sway/tree/root.c
View file

@ -63,7 +63,6 @@ struct sway_root *root_create(void) {
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
wl_list_init(&root->xwayland_unmanaged); wl_list_init(&root->xwayland_unmanaged);
#endif #endif
wl_list_init(&root->drag_icons);
wl_signal_init(&root->events.new_node); wl_signal_init(&root->events.new_node);
root->outputs = create_list(); root->outputs = create_list();
root->non_desktop_outputs = create_list(); root->non_desktop_outputs = create_list();