From e2ee67125e076af9be1f115051c680f6e3b69be5 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Wed, 31 May 2017 16:24:32 -0400 Subject: s/wayland.h/types.h/g --- backend/drm/backend.c | 2 +- backend/drm/drm.c | 2 +- example/main.c | 2 +- include/types.h | 18 ++++++++++++++++++ include/wayland.h | 18 ------------------ include/wlr/types.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/wlr/wayland.h | 46 ---------------------------------------------- types/wlr_output.c | 6 +++--- 8 files changed, 70 insertions(+), 70 deletions(-) create mode 100644 include/types.h delete mode 100644 include/wayland.h create mode 100644 include/wlr/types.h delete mode 100644 include/wlr/wayland.h diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 39f29da5..a7e736bb 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include "backend.h" diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 088539c8..fa91745f 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -13,7 +13,7 @@ #include #include -#include "wayland.h" +#include "types.h" #include "backend.h" #include "backend/drm/backend.h" #include "backend/drm/drm.h" diff --git a/example/main.c b/example/main.c index 33e77f5e..ae602903 100644 --- a/example/main.c +++ b/example/main.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include struct state { diff --git a/include/types.h b/include/types.h new file mode 100644 index 00000000..5513e936 --- /dev/null +++ b/include/types.h @@ -0,0 +1,18 @@ +#ifndef _WLR_WAYLAND_INTERNAL_H +#define _WLR_WAYLAND_INTERNAL_H + +#include +#include +#include + +struct wlr_output_impl { + bool (*set_mode)(struct wlr_output_state *state, struct wlr_output_mode *mode); + void (*enable)(struct wlr_output_state *state, bool enable); + void (*destroy)(struct wlr_output_state *state); +}; + +struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, + struct wlr_output_state *state); +void wlr_output_free(struct wlr_output *output); + +#endif diff --git a/include/wayland.h b/include/wayland.h deleted file mode 100644 index ca79fe33..00000000 --- a/include/wayland.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef _WLR_WAYLAND_INTERNAL_H -#define _WLR_WAYLAND_INTERNAL_H - -#include -#include -#include - -struct wlr_output_impl { - bool (*set_mode)(struct wlr_output_state *state, struct wlr_output_mode *mode); - void (*enable)(struct wlr_output_state *state, bool enable); - void (*destroy)(struct wlr_output_state *state); -}; - -struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, - struct wlr_output_state *state); -void wlr_output_free(struct wlr_output *output); - -#endif diff --git a/include/wlr/types.h b/include/wlr/types.h new file mode 100644 index 00000000..4870b84c --- /dev/null +++ b/include/wlr/types.h @@ -0,0 +1,46 @@ +#ifndef _WLR_WAYLAND_H +#define _WLR_WAYLAND_H + +#include +#include +#include + +struct wlr_output_mode_state; + +struct wlr_output_mode { + struct wlr_output_mode_state *state; + uint32_t flags; // enum wl_output_mode + int32_t width, height; + int32_t refresh; // mHz +}; + +struct wlr_output_impl; +struct wlr_output_state; + +struct wlr_output { + const struct wlr_output_impl *impl; + struct wlr_output_state *state; + + uint32_t flags; + char *name; + char *make; + char *model; + uint32_t scale; + int32_t x, y; + int32_t phys_width, phys_height; // mm + int32_t subpixel; // enum wl_output_subpixel + int32_t transform; // enum wl_output_transform + + list_t *modes; + struct wlr_output_mode *current_mode; + + struct { + struct wl_signal frame; + } events; +}; + +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); +void wlr_output_enable(struct wlr_output *output, bool enable); +void wlr_output_destroy(struct wlr_output *output); + +#endif diff --git a/include/wlr/wayland.h b/include/wlr/wayland.h deleted file mode 100644 index 4870b84c..00000000 --- a/include/wlr/wayland.h +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef _WLR_WAYLAND_H -#define _WLR_WAYLAND_H - -#include -#include -#include - -struct wlr_output_mode_state; - -struct wlr_output_mode { - struct wlr_output_mode_state *state; - uint32_t flags; // enum wl_output_mode - int32_t width, height; - int32_t refresh; // mHz -}; - -struct wlr_output_impl; -struct wlr_output_state; - -struct wlr_output { - const struct wlr_output_impl *impl; - struct wlr_output_state *state; - - uint32_t flags; - char *name; - char *make; - char *model; - uint32_t scale; - int32_t x, y; - int32_t phys_width, phys_height; // mm - int32_t subpixel; // enum wl_output_subpixel - int32_t transform; // enum wl_output_transform - - list_t *modes; - struct wlr_output_mode *current_mode; - - struct { - struct wl_signal frame; - } events; -}; - -bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); -void wlr_output_enable(struct wlr_output *output, bool enable); -void wlr_output_destroy(struct wlr_output *output); - -#endif diff --git a/types/wlr_output.c b/types/wlr_output.c index b424aaaf..826404a1 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -1,8 +1,8 @@ #include #include -#include "wlr/wayland.h" -#include "wlr/common/list.h" -#include "wayland.h" +#include +#include +#include "types.h" struct wlr_output *wlr_output_create(struct wlr_output_impl *impl, struct wlr_output_state *state) { -- cgit v1.2.3