From b3cb22c003d15a2f9f638af4816b803beb836f14 Mon Sep 17 00:00:00 2001 From: emersion Date: Fri, 14 Sep 2018 19:29:08 +0200 Subject: xdg-output: add _v1 suffix --- include/wlr/types/meson.build | 2 +- include/wlr/types/wlr_xdg_output.h | 47 ----------------------------------- include/wlr/types/wlr_xdg_output_v1.h | 47 +++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 48 deletions(-) delete mode 100644 include/wlr/types/wlr_xdg_output.h create mode 100644 include/wlr/types/wlr_xdg_output_v1.h (limited to 'include/wlr') diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build index 8c81cb0e..fd354795 100644 --- a/include/wlr/types/meson.build +++ b/include/wlr/types/meson.build @@ -35,7 +35,7 @@ install_headers( 'wlr_wl_shell.h', 'wlr_xcursor_manager.h', 'wlr_xdg_decoration_v1.h', - 'wlr_xdg_output.h', + 'wlr_xdg_output_v1.h', 'wlr_xdg_shell.h', 'wlr_xdg_shell_v6.h', subdir: 'wlr/types', diff --git a/include/wlr/types/wlr_xdg_output.h b/include/wlr/types/wlr_xdg_output.h deleted file mode 100644 index 60611307..00000000 --- a/include/wlr/types/wlr_xdg_output.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This an unstable interface of wlroots. No guarantees are made regarding the - * future consistency of this API. - */ -#ifndef WLR_USE_UNSTABLE -#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features" -#endif - -#ifndef WLR_TYPES_WLR_XDG_OUTPUT_H -#define WLR_TYPES_WLR_XDG_OUTPUT_H -#include -#include - -struct wlr_xdg_output { - struct wlr_xdg_output_manager *manager; - struct wl_list resources; - struct wl_list link; - - struct wlr_output_layout_output *layout_output; - - int32_t x, y; - int32_t width, height; - - struct wl_listener destroy; -}; - -struct wlr_xdg_output_manager { - struct wl_global *global; - struct wl_list resources; - struct wlr_output_layout *layout; - - struct wl_list outputs; - - struct wl_listener layout_add; - struct wl_listener layout_change; - struct wl_listener layout_destroy; - - struct { - struct wl_signal destroy; - } events; -}; - -struct wlr_xdg_output_manager *wlr_xdg_output_manager_create( - struct wl_display *display, struct wlr_output_layout *layout); -void wlr_xdg_output_manager_destroy(struct wlr_xdg_output_manager *manager); - -#endif diff --git a/include/wlr/types/wlr_xdg_output_v1.h b/include/wlr/types/wlr_xdg_output_v1.h new file mode 100644 index 00000000..d4279fb9 --- /dev/null +++ b/include/wlr/types/wlr_xdg_output_v1.h @@ -0,0 +1,47 @@ +/* + * This an unstable interface of wlroots. No guarantees are made regarding the + * future consistency of this API. + */ +#ifndef WLR_USE_UNSTABLE +#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features" +#endif + +#ifndef WLR_TYPES_WLR_XDG_OUTPUT_V1_H +#define WLR_TYPES_WLR_XDG_OUTPUT_V1_H +#include +#include + +struct wlr_xdg_output_v1 { + struct wlr_xdg_output_manager_v1 *manager; + struct wl_list resources; + struct wl_list link; + + struct wlr_output_layout_output *layout_output; + + int32_t x, y; + int32_t width, height; + + struct wl_listener destroy; +}; + +struct wlr_xdg_output_manager_v1 { + struct wl_global *global; + struct wl_list resources; + struct wlr_output_layout *layout; + + struct wl_list outputs; + + struct wl_listener layout_add; + struct wl_listener layout_change; + struct wl_listener layout_destroy; + + struct { + struct wl_signal destroy; + } events; +}; + +struct wlr_xdg_output_manager_v1 *wlr_xdg_output_manager_v1_create( + struct wl_display *display, struct wlr_output_layout *layout); +void wlr_xdg_output_manager_v1_destroy(struct wlr_xdg_output_manager_v1 *manager); + +#endif -- cgit v1.2.3