diff options
| author | emersion <contact@emersion.fr> | 2018-04-03 10:38:46 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-03 10:38:46 -0400 |
| commit | 58ac05c276c62c821735e77e15f7f502c82209aa (patch) | |
| tree | e5712bbee8c665990ace1f7f3243aeec9cf9a65d /include/wlr | |
| parent | 1cd7ff7d3ab1cb922e4064ee77db453064cccb5b (diff) | |
| parent | 506acbdecd4436117729e4c40678645725ed2d1f (diff) | |
| download | wlroots-58ac05c276c62c821735e77e15f7f502c82209aa.tar.xz | |
Merge branch 'master' into xwayland-dnd
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_layer_shell.h | 5 | ||||
| -rw-r--r-- | include/wlr/types/wlr_wl_shell.h | 5 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 5 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell_v6.h | 5 | ||||
| -rw-r--r-- | include/wlr/xwayland.h | 5 |
5 files changed, 25 insertions, 0 deletions
diff --git a/include/wlr/types/wlr_layer_shell.h b/include/wlr/types/wlr_layer_shell.h index 8d093ada..1312e568 100644 --- a/include/wlr/types/wlr_layer_shell.h +++ b/include/wlr/types/wlr_layer_shell.h @@ -99,4 +99,9 @@ void wlr_layer_surface_configure(struct wlr_layer_surface *surface, */ void wlr_layer_surface_close(struct wlr_layer_surface *surface); +bool wlr_surface_is_layer_surface(struct wlr_surface *surface); + +struct wlr_layer_surface *wlr_layer_surface_from_wlr_surface( + struct wlr_surface *surface); + #endif diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 00f2bb69..63b1a837 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -150,4 +150,9 @@ struct wlr_wl_shell_surface *wlr_wl_shell_surface_popup_at( struct wlr_wl_shell_surface *surface, double sx, double sy, double *popup_sx, double *popup_sy); +bool wlr_surface_is_wl_shell_surface(struct wlr_surface *surface); + +struct wlr_wl_surface *wlr_wl_shell_surface_from_wlr_surface( + struct wlr_surface *surface); + #endif diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 9938f4b1..b779017f 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -229,4 +229,9 @@ struct wlr_xdg_surface *wlr_xdg_surface_popup_at( struct wlr_xdg_surface *surface, double sx, double sy, double *popup_sx, double *popup_sy); +bool wlr_surface_is_xdg_surface(struct wlr_surface *surface); + +struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface( + struct wlr_surface *surface); + #endif diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index d01240eb..04c1f324 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -289,4 +289,9 @@ void wlr_positioner_v6_invert_x( void wlr_positioner_v6_invert_y( struct wlr_xdg_positioner_v6 *positioner); +bool wlr_surface_is_xdg_surface_v6(struct wlr_surface *surface); + +struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface( + struct wlr_surface *surface); + #endif diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 9b9d9cf9..66622de3 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -185,4 +185,9 @@ void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland, bool wlr_xwayland_surface_is_unmanaged( const struct wlr_xwayland_surface *surface); +bool wlr_surface_is_xwayland_surface(struct wlr_surface *surface); + +struct wlr_xwayland_surface *wlr_xwayland_surface_from_wlr_surface( + struct wlr_surface *surface); + #endif |