diff options
| author | Kirill Primak <vyivel@eclair.cafe> | 2022-01-08 22:52:54 +0300 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-02-02 21:06:12 +0300 |
| commit | e59aa3e0e7e142825fbd16887475285fafceb7ba (patch) | |
| tree | 6b1ed08eb74de991619121ca5f0beeb066483397 | |
| parent | 1e4c1a3b58d77f91223571160cdb2db12ad9386b (diff) | |
xdg-toplevel: change object type in event structs
This commit replaces wlr_xdg_toplevel_*_event::surface with a toplevel
field.
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 8 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_toplevel.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 2fee1453..a54d2723 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -231,26 +231,26 @@ struct wlr_xdg_surface { }; struct wlr_xdg_toplevel_move_event { - struct wlr_xdg_surface *surface; + struct wlr_xdg_toplevel *toplevel; struct wlr_seat_client *seat; uint32_t serial; }; struct wlr_xdg_toplevel_resize_event { - struct wlr_xdg_surface *surface; + struct wlr_xdg_toplevel *toplevel; struct wlr_seat_client *seat; uint32_t serial; uint32_t edges; }; struct wlr_xdg_toplevel_set_fullscreen_event { - struct wlr_xdg_surface *surface; + struct wlr_xdg_toplevel *toplevel; bool fullscreen; struct wlr_output *output; }; struct wlr_xdg_toplevel_show_window_menu_event { - struct wlr_xdg_surface *surface; + struct wlr_xdg_toplevel *toplevel; struct wlr_seat_client *seat; uint32_t serial; uint32_t x, y; diff --git a/types/xdg_shell/wlr_xdg_toplevel.c b/types/xdg_shell/wlr_xdg_toplevel.c index 842e37c2..e1f9a91d 100644 --- a/types/xdg_shell/wlr_xdg_toplevel.c +++ b/types/xdg_shell/wlr_xdg_toplevel.c @@ -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 = { - .surface = toplevel->base, + .toplevel = toplevel, .seat = seat, .serial = serial, .x = x, @@ -258,7 +258,7 @@ static void xdg_toplevel_handle_move(struct wl_client *client, } struct wlr_xdg_toplevel_move_event event = { - .surface = toplevel->base, + .toplevel = toplevel, .seat = seat, .serial = serial, }; @@ -287,7 +287,7 @@ static void xdg_toplevel_handle_resize(struct wl_client *client, } struct wlr_xdg_toplevel_resize_event event = { - .surface = toplevel->base, + .toplevel = toplevel, .seat = seat, .serial = serial, .edges = edges, @@ -367,7 +367,7 @@ static void xdg_toplevel_handle_set_fullscreen(struct wl_client *client, store_fullscreen_requested(toplevel, true, output); struct wlr_xdg_toplevel_set_fullscreen_event event = { - .surface = toplevel->base, + .toplevel = toplevel, .fullscreen = true, .output = output, }; @@ -384,7 +384,7 @@ static void xdg_toplevel_handle_unset_fullscreen(struct wl_client *client, store_fullscreen_requested(toplevel, false, NULL); struct wlr_xdg_toplevel_set_fullscreen_event event = { - .surface = toplevel->base, + .toplevel = toplevel, .fullscreen = false, .output = NULL, }; |