mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-toplevel: change object type in event structs

Browse source 
This commit replaces wlr_xdg_toplevel_*_event::surface with a toplevel
field.
This commit is contained in:
Kirill Primak 2022-01-08 22:52:54 +03:00
parent 1e4c1a3b58
commit e59aa3e0e7
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/wlr/types/wlr_xdg_shell.h
View file

@ -231,26 +231,26 @@ struct wlr_xdg_surface {
}; };
struct wlr_xdg_toplevel_move_event { struct wlr_xdg_toplevel_move_event {
struct wlr_xdg_surface *surface; struct wlr_xdg_toplevel *toplevel;
struct wlr_seat_client *seat; struct wlr_seat_client *seat;
uint32_t serial; uint32_t serial;
}; };
struct wlr_xdg_toplevel_resize_event { struct wlr_xdg_toplevel_resize_event {
struct wlr_xdg_surface *surface; struct wlr_xdg_toplevel *toplevel;
struct wlr_seat_client *seat; struct wlr_seat_client *seat;
uint32_t serial; uint32_t serial;
uint32_t edges; uint32_t edges;
}; };
struct wlr_xdg_toplevel_set_fullscreen_event { struct wlr_xdg_toplevel_set_fullscreen_event {
struct wlr_xdg_surface *surface; struct wlr_xdg_toplevel *toplevel;
bool fullscreen; bool fullscreen;
struct wlr_output *output; struct wlr_output *output;
}; };
struct wlr_xdg_toplevel_show_window_menu_event { struct wlr_xdg_toplevel_show_window_menu_event {
struct wlr_xdg_surface *surface; struct wlr_xdg_toplevel *toplevel;
struct wlr_seat_client *seat; struct wlr_seat_client *seat;
uint32_t serial; uint32_t serial;
uint32_t x, y; uint32_t x, y;

10
types/xdg_shell/wlr_xdg_toplevel.c
View file

@ -227,7 +227,7 @@ static void xdg_toplevel_handle_show_window_menu(struct wl_client *client,
} }
struct wlr_xdg_toplevel_show_window_menu_event event = { struct wlr_xdg_toplevel_show_window_menu_event event = {
.surface = toplevel->base, .toplevel = toplevel,
.seat = seat, .seat = seat,
.serial = serial, .serial = serial,
.x = x, .x = x,
@ -258,7 +258,7 @@ static void xdg_toplevel_handle_move(struct wl_client *client,
} }
struct wlr_xdg_toplevel_move_event event = { struct wlr_xdg_toplevel_move_event event = {
.surface = toplevel->base, .toplevel = toplevel,
.seat = seat, .seat = seat,
.serial = serial, .serial = serial,
}; };
@ -287,7 +287,7 @@ static void xdg_toplevel_handle_resize(struct wl_client *client,
} }
struct wlr_xdg_toplevel_resize_event event = { struct wlr_xdg_toplevel_resize_event event = {
.surface = toplevel->base, .toplevel = toplevel,
.seat = seat, .seat = seat,
.serial = serial, .serial = serial,
.edges = edges, .edges = edges,
@ -367,7 +367,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client,
store_fullscreen_requested(toplevel, true, output); store_fullscreen_requested(toplevel, true, output);
struct wlr_xdg_toplevel_set_fullscreen_event event = { struct wlr_xdg_toplevel_set_fullscreen_event event = {
.surface = toplevel->base, .toplevel = toplevel,
.fullscreen = true, .fullscreen = true,
.output = output, .output = output,
}; };
@ -384,7 +384,7 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client,
store_fullscreen_requested(toplevel, false, NULL); store_fullscreen_requested(toplevel, false, NULL);
struct wlr_xdg_toplevel_set_fullscreen_event event = { struct wlr_xdg_toplevel_set_fullscreen_event event = {
.surface = toplevel->base, .toplevel = toplevel,
.fullscreen = false, .fullscreen = false,
.output = NULL, .output = NULL,
}; };