From 85871cb666a8adf8221b0b64049697a9d5ade686 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 14 Feb 2018 14:10:31 -0500 Subject: add wlr_output_layout_adjacent_output --- include/wlr/types/wlr_output_layout.h | 9 +++++++++ include/wlr/util/direction.h | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 include/wlr/util/direction.h (limited to 'include/wlr') diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index 7dd2b16a..ea96c6b8 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -5,6 +5,7 @@ #include #include #include +#include struct wlr_output_layout_state; @@ -96,4 +97,12 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout, struct wlr_output *wlr_output_layout_get_center_output( struct wlr_output_layout *layout); +/** + * Get the closest adjacent output to the reference output from the reference + * point in the given direction. + */ +struct wlr_output *wlr_output_layout_adjacent_output( + struct wlr_output_layout *layout, enum wlr_direction direction, + struct wlr_output *reference, double ref_x, double ref_y); + #endif diff --git a/include/wlr/util/direction.h b/include/wlr/util/direction.h new file mode 100644 index 00000000..b5f3a589 --- /dev/null +++ b/include/wlr/util/direction.h @@ -0,0 +1,11 @@ +#ifndef WLR_UTIL_DIRECTION_H +#define WLR_UTIL_DIRECTION_H + +enum wlr_direction { + WLR_DIRECTION_UP = 0, + WLR_DIRECTION_DOWN = 1, + WLR_DIRECTION_LEFT = 2, + WLR_DIRECTION_RIGHT = 4, +}; + +#endif -- cgit v1.2.3 From 9a8808f8cf514076561c714293568aae4709a95a Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sat, 17 Feb 2018 18:48:50 -0500 Subject: move direction to wlr_output_layout.h --- include/wlr/types/wlr_output_layout.h | 8 +++++++- include/wlr/util/direction.h | 11 ----------- 2 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 include/wlr/util/direction.h (limited to 'include/wlr') diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index ea96c6b8..4d10720e 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -5,7 +5,6 @@ #include #include #include -#include struct wlr_output_layout_state; @@ -97,6 +96,13 @@ void wlr_output_layout_add_auto(struct wlr_output_layout *layout, struct wlr_output *wlr_output_layout_get_center_output( struct wlr_output_layout *layout); +enum wlr_direction { + WLR_DIRECTION_UP = 0, + WLR_DIRECTION_DOWN = 1, + WLR_DIRECTION_LEFT = 2, + WLR_DIRECTION_RIGHT = 4, +}; + /** * Get the closest adjacent output to the reference output from the reference * point in the given direction. diff --git a/include/wlr/util/direction.h b/include/wlr/util/direction.h deleted file mode 100644 index b5f3a589..00000000 --- a/include/wlr/util/direction.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef WLR_UTIL_DIRECTION_H -#define WLR_UTIL_DIRECTION_H - -enum wlr_direction { - WLR_DIRECTION_UP = 0, - WLR_DIRECTION_DOWN = 1, - WLR_DIRECTION_LEFT = 2, - WLR_DIRECTION_RIGHT = 4, -}; - -#endif -- cgit v1.2.3