Move declarations of Resource enums to a separate file

The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.

1 files changed, 104 insertions, 37 deletions

diff --git a/src/Resources.cc b/src/Resources.cc
index 2cae2b6..cbcc431 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -21,14 +21,12 @@
 
 // holds main resource functions
 
+#include "Resources.hh"
+
+#include "FbTk/Container.hh"
 #include "FbTk/StringUtil.hh"
 #include "FbTk/Resource.hh"
 #include "FbTk/Luamm.hh"
-#include "WinButton.hh"
-
-#include "fluxbox.hh"
-
-#include "Layer.hh"
 
 #include <stdio.h>
 #include <string>
@@ -42,47 +40,116 @@
 using std::string;
 using std::vector;
 
-//-----------------------------------------------------------------
-//---- accessors for int, bool, and some enums with Resource ------
-//-----------------------------------------------------------------
+//--------------------------------------------------
+//---- accessors for some enums with Resource ------
+//--------------------------------------------------
 namespace FbTk {
 
 template<>
-const EnumTraits<WinButton::Type>::Pair EnumTraits<WinButton::Type>::s_map[] = {
-    { "Shade",    WinButton::SHADE },
-    { "Minimize", WinButton::MINIMIZE },
-    { "Maximize", WinButton::MAXIMIZE },
-    { "Close",    WinButton::CLOSE },
-    { "Stick",    WinButton::STICK },
-    { "MenuIcon", WinButton::MENUICON },
-    { "LHalf",    WinButton::LEFT_HALF },
-    { "RHalf",    WinButton::RIGHT_HALF },
-    { NULL,       WinButton::MENUICON }
+const EnumTraits<WinButtonType>::Pair EnumTraits<WinButtonType>::s_map[] = {
+    { "Shade",    SHADEBUTTON },
+    { "Minimize", MINIMIZEBUTTON },
+    { "Maximize", MAXIMIZEBUTTON },
+    { "Close",    CLOSEBUTTON },
+    { "Stick",    STICKBUTTON },
+    { "MenuIcon", MENUICONBUTTON },
+    { "LHalf",    LEFT_HALFBUTTON },
+    { "RHalf",    RIGHT_HALFBUTTON },
+    { NULL,       MENUICONBUTTON }
+};
+
+template<>
+const EnumTraits<TabsAttachArea>::Pair EnumTraits<TabsAttachArea>::s_map[] = {
+    { "Titlebar", ATTACH_AREA_TITLEBAR },
+    { "Window",   ATTACH_AREA_WINDOW },
+    { NULL,       ATTACH_AREA_WINDOW }
+};
+
+template<>
+const EnumTraits<LayerType>::Pair EnumTraits<LayerType>::s_map[] = {
+    { "Menu",     LAYERMENU },
+    { "1",        LAYER1 },
+    { "AboveDock",LAYERABOVE_DOCK },
+    { "3",        LAYER3 },
+    { "Dock",     LAYERDOCK },
+    { "5",        LAYER5 },
+    { "Top",      LAYERTOP },
+    { "7",        LAYER7 },
+    { "Normal",   LAYERNORMAL },
+    { "9",        LAYER9 },
+    { "Bottom",   LAYERBOTTOM },
+    { "11",       LAYER11 },
+    { "Desktop",  LAYERDESKTOP },
+    { NULL,       LAYERDESKTOP }
+};
+
+template<>
+const EnumTraits<Container::Alignment>::Pair EnumTraits<Container::Alignment>::s_map[] = {
+    { "Left",     Container::LEFT },
+    { "Right",    Container::RIGHT },
+    { "Relative", Container::RELATIVE }, 
+    { NULL,       Container::RELATIVE }
+};
+
+template<>
+const EnumTraits<Placement>::Pair EnumTraits<Placement>::s_map[] = {
+    { "TopLeft",      TOPLEFT },
+    { "TopCenter",    TOPCENTER },
+    { "TopRight",     TOPRIGHT },
+    { "BottomLeft",   BOTTOMLEFT },
+    { "BottomCenter", BOTTOMCENTER },
+    { "BottomRight",  BOTTOMRIGHT },
+    { "LeftBottom",   LEFTBOTTOM },
+    { "LeftCenter",   LEFTCENTER },
+    { "LeftTop",      LEFTTOP },
+    { "RightBottom",  RIGHTBOTTOM },
+    { "RightCenter",  RIGHTCENTER },
+    { "RightTop",     RIGHTTOP },
+    { "Top",          TOPCENTER },
+    { "Bottom",       BOTTOMCENTER },
+    { "Left",         LEFTCENTER },
+    { "Right",        RIGHTCENTER },
+    { NULL,           RIGHTTOP }
+};
+
+template <>
+const EnumTraits<PlacementPolicy>::Pair EnumTraits<PlacementPolicy>::s_map[] = {
+    { "RowSmartPlacement",      ROWSMARTPLACEMENT },
+    { "ColSmartPlacement",      COLSMARTPLACEMENT },
+    { "RowMinOverlapPlacement", ROWMINOVERLAPPLACEMENT },
+    { "ColMinOverlapPlacement", COLMINOVERLAPPLACEMENT },
+    { "UnderMousePlacement",    UNDERMOUSEPLACEMENT },
+    { "CascadePlacement",       CASCADEPLACEMENT },
+    { NULL,                     CASCADEPLACEMENT }
+};
+
+template <>
+const EnumTraits<RowDirection>::Pair EnumTraits<RowDirection>::s_map[] = {
+    { "LeftToRight",            LEFTRIGHTDIRECTION },
+    { "RightToLeft",            RIGHTLEFTDIRECTION },
+    { NULL,                     RIGHTLEFTDIRECTION },
+};
+
+template <>
+const EnumTraits<ColumnDirection>::Pair EnumTraits<ColumnDirection>::s_map[] = {
+    { "TopToBottom",            TOPBOTTOMDIRECTION },
+    { "BottomToTop",            BOTTOMTOPDIRECTION },
+    { NULL,                     BOTTOMTOPDIRECTION },
 };
 
 template<>
-const EnumTraits<Fluxbox::TabsAttachArea>::Pair EnumTraits<Fluxbox::TabsAttachArea>::s_map[] = {
-    { "Titlebar", Fluxbox::ATTACH_AREA_TITLEBAR },
-    { "Window",   Fluxbox::ATTACH_AREA_WINDOW },
-    { NULL,       Fluxbox::ATTACH_AREA_WINDOW }
+const EnumTraits<FocusModel>::Pair EnumTraits<FocusModel>::s_map[] = {
+    { "MouseFocus",       MOUSEFOCUS },
+    { "StrictMouseFocus", STRICTMOUSEFOCUS },
+    { "ClickFocus",       CLICKFOCUS },
+    { NULL,               CLICKFOCUS }
 };
 
 template<>
-const EnumTraits<ResourceLayer::Type>::Pair EnumTraits<ResourceLayer::Type>::s_map[] = {
-    { "Menu",     ResourceLayer::MENU },
-    { "1",        ResourceLayer::LAYER1 },
-    { "AboveDock",ResourceLayer::ABOVE_DOCK },
-    { "3",        ResourceLayer::LAYER3 },
-    { "Dock",     ResourceLayer::DOCK },
-    { "5",        ResourceLayer::LAYER5 },
-    { "Top",      ResourceLayer::TOP },
-    { "7",        ResourceLayer::LAYER7 },
-    { "Normal",   ResourceLayer::NORMAL },
-    { "9",        ResourceLayer::LAYER9 },
-    { "Bottom",   ResourceLayer::BOTTOM },
-    { "11",       ResourceLayer::LAYER11 },
-    { "Desktop",  ResourceLayer::DESKTOP },
-    { NULL,       ResourceLayer::DESKTOP }
+const EnumTraits<TabFocusModel>::Pair EnumTraits<TabFocusModel>::s_map[] = {
+    { "SloppyTabFocus",   MOUSETABFOCUS },
+    { "ClickToTabFocus",  CLICKTABFOCUS },
+    { NULL,               CLICKTABFOCUS }
 };
 
 } // end namespace FbTk