added FbTk::Util::clamp() and simplified related code

3 files changed, 48 insertions, 11 deletions

diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 67be7a0..45a24b3 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -64,6 +64,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         Select2nd.hh STLUtil.hh \
         CachedPixmap.hh CachedPixmap.cc \
         Slot.hh Signal.hh MemFun.hh RelaySignal.hh SelectArg.hh \
+        Util.hh \
         ${xpm_SOURCE} \
         ${xft_SOURCE} \
         ${xmb_SOURCE} \
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index a9135e3..6469a14 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -26,6 +26,8 @@
 #include "App.hh"
 #include "FbWindow.hh"
 
+#include "Util.hh"
+
 using namespace FbTk;
 
 MultLayers::MultLayers(int numlayers) :
@@ -56,11 +58,7 @@ XLayerItem *MultLayers::getLowestItemAboveLayer(int layernum) {
 }
 
 void MultLayers::addToTop(XLayerItem &item, int layernum) {
-    if (layernum < 0)
-        layernum = 0;
-    else if (layernum >= static_cast<signed>(m_layers.size()))
-        layernum = m_layers.size()-1;
-
+    layernum = FbTk::Util::clamp(layernum, 0, static_cast<signed>(m_layers.size()) - 1);
     m_layers[layernum]->insert(item);
     restack();
 }
@@ -108,12 +106,7 @@ void MultLayers::moveToLayer(XLayerItem &item, int layernum) {
     if (curr_layer.getLayerNum() == layernum)
         return;
 
-    // clamp layer number
-    if (layernum < 0)
-        layernum = 0;
-    else if (layernum >= static_cast<signed>(m_layers.size()))
-        layernum = m_layers.size()-1;
-    // remove item from old layer and insert it into the
+    layernum = FbTk::Util::clamp(layernum, 0, static_cast<signed>(m_layers.size()) - 1);
     item.setLayer(*m_layers[layernum]);
 }
 
diff --git a/src/FbTk/Util.hh b/src/FbTk/Util.hh
new file mode 100644
index 0000000..5e5a986
--- /dev/null
+++ b/src/FbTk/Util.hh
@@ -0,0 +1,43 @@
+// Util.hh for fluxbox 
+// Copyright (c) 2010 Mathias Gumz (akira at fluxbox org)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+#ifndef FBTK_UTIL_HH
+#define FBTK_UTIL_HH
+
+namespace FbTk {
+
+namespace Util {
+
+template<typename T>
+inline T clamp(const T& value, const T& lower, const T& upper) {
+    if (value < lower)
+        return lower;
+    else if (value > upper)
+        return upper;
+    return value;
+}
+
+} // end namespace Util
+
+} // end namespace FbTk
+
+
+#endif // FBTK_UTIL_HH