summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-08-18 11:38:54 +0200
committerDave Davenport <qball@gmpclient.org>2017-08-18 11:38:54 +0200
commit3c52f1514018c2a4af0c496193731a1035cadb17 (patch)
tree3baea9ee4b8eb664a7039323423da9925ba9c414 /include
parent9105e5549f32c0ff2130d6904c07cedc0094ffad (diff)
Move more enums to rofi-types.h
Diffstat (limited to 'include')
-rw-r--r--include/rofi-types.h32
-rw-r--r--include/rofi.h1
-rw-r--r--include/settings.h31
-rw-r--r--include/theme.h2
4 files changed, 33 insertions, 33 deletions
diff --git a/include/rofi-types.h b/include/rofi-types.h
index e6a2026d..80998463 100644
--- a/include/rofi-types.h
+++ b/include/rofi-types.h
@@ -141,6 +141,38 @@ typedef struct
ThemeColor color;
} RofiHighlightColorStyle;
+
+/**
+ * Enumeration indicating location or gravity of window.
+ *
+ * \verbatim WL_NORTH_WEST WL_NORTH WL_NORTH_EAST \endverbatim
+ * \verbatim WL_EAST WL_CENTER WL_EAST \endverbatim
+ * \verbatim WL_SOUTH_WEST WL_SOUTH WL_SOUTH_EAST\endverbatim
+ *
+ * @ingroup CONFIGURATION
+ */
+typedef enum
+{
+ /** Center */
+ WL_CENTER = 0,
+ /** Top middle */
+ WL_NORTH = 1,
+ /** Middle right */
+ WL_EAST = 2,
+ /** Bottom middle */
+ WL_SOUTH = 4,
+ /** Middle left */
+ WL_WEST = 8,
+ /** Left top corner. */
+ WL_NORTH_WEST = WL_NORTH | WL_WEST,
+ /** Top right */
+ WL_NORTH_EAST = WL_NORTH | WL_EAST,
+ /** Bottom right */
+ WL_SOUTH_EAST = WL_SOUTH | WL_EAST,
+ /** Bottom left */
+ WL_SOUTH_WEST = WL_SOUTH | WL_WEST,
+} WindowLocation;
+
typedef union
{
/** integer */
diff --git a/include/rofi.h b/include/rofi.h
index 8830b62d..5b513b88 100644
--- a/include/rofi.h
+++ b/include/rofi.h
@@ -32,6 +32,7 @@
#include <glib.h>
#include <string.h>
#include <stdlib.h>
+#include "rofi-types.h"
#include "keyb.h"
#include "mode.h"
#include "view.h"
diff --git a/include/settings.h b/include/settings.h
index 2ea8b34c..295a8cd0 100644
--- a/include/settings.h
+++ b/include/settings.h
@@ -44,37 +44,6 @@ typedef enum
} MatchingMethod;
/**
- * Enumeration indicating location or gravity of window.
- *
- * \verbatim WL_NORTH_WEST WL_NORTH WL_NORTH_EAST \endverbatim
- * \verbatim WL_EAST WL_CENTER WL_EAST \endverbatim
- * \verbatim WL_SOUTH_WEST WL_SOUTH WL_SOUTH_EAST\endverbatim
- *
- * @ingroup CONFIGURATION
- */
-typedef enum
-{
- /** Center */
- WL_CENTER = 0,
- /** Top middle */
- WL_NORTH = 1,
- /** Middle right */
- WL_EAST = 2,
- /** Bottom middle */
- WL_SOUTH = 4,
- /** Middle left */
- WL_WEST = 8,
- /** Left top corner. */
- WL_NORTH_WEST = WL_NORTH | WL_WEST,
- /** Top right */
- WL_NORTH_EAST = WL_NORTH | WL_EAST,
- /** Bottom right */
- WL_SOUTH_EAST = WL_SOUTH | WL_EAST,
- /** Bottom left */
- WL_SOUTH_WEST = WL_SOUTH | WL_WEST,
-} WindowLocation;
-
-/**
* Settings structure holding all (static) configurable options.
* @ingroup CONFIGURATION
*/
diff --git a/include/theme.h b/include/theme.h
index 6c06a956..f01a325c 100644
--- a/include/theme.h
+++ b/include/theme.h
@@ -30,8 +30,6 @@
#include <glib.h>
#include <cairo.h>
#include <widgets/widget.h>
-#include <settings.h>
-
#include "rofi-types.h"
/**