Allow percentage values for some Window commands

4 files changed, 89 insertions, 0 deletions

diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index e03083c..9d335fa 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -28,6 +28,12 @@
 #include <string>
 #include <set>
 
+#ifdef HAVE_CMATH
+  #include <cmath>
+#else
+  #include <math.h>
+#endif
+
 namespace FbTk {
 
 class Color;
@@ -259,6 +265,7 @@ public:
 };
 
 
+
 } // end namespace FbTk
 
 #endif // FBTK_FBWINDOW_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 4c38f84..171f27d 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 \
         CachedPixmap.hh CachedPixmap.cc \
         Slot.hh Signal.hh MemFun.hh SelectArg.hh \
         Util.hh \
+        RelCalcHelper.hh RelCalcHelper.cc \
         ${xpm_SOURCE} \
         ${xft_SOURCE} \
         ${xmb_SOURCE} \
diff --git a/src/FbTk/RelCalcHelper.cc b/src/FbTk/RelCalcHelper.cc
new file mode 100644
index 0000000..a537de4
--- /dev/null
+++ b/src/FbTk/RelCalcHelper.cc
@@ -0,0 +1,38 @@
+// RelCalcHelper.hh for Fluxbox - an X11 Window manager
+// Copyright (c) 2012 Lajos Koszti (ajnasz at ajnasz.hu)
+//
+// 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.
+
+#include "RelCalcHelper.hh"
+
+namespace FbTk {
+
+    namespace RelCalcHelper {
+
+        int calPercentageValueOf(int i, int j) {
+            return floor(i * j / 100 + 0.5);
+        }
+
+        int calPercentageOf(int i, int j) {
+            return floor((float) i / (float) j * 100 + 0.5);
+        }
+
+    }
+
+}
diff --git a/src/FbTk/RelCalcHelper.hh b/src/FbTk/RelCalcHelper.hh
new file mode 100644
index 0000000..67d85e9
--- /dev/null
+++ b/src/FbTk/RelCalcHelper.hh
@@ -0,0 +1,43 @@
+// RelCalcHelper.cc for Fluxbox - an X11 Window manager
+// Copyright (c) 2012 Lajos Koszti (ajnasz at ajnasz.hu)
+//
+// 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_RELCALCHELPER_HH
+#define FBTK_RELCALCHELPER_HH
+
+#ifdef HAVE_CMATH
+  #include <cmath>
+#else
+  #include <math.h>
+#endif
+
+namespace FbTk {
+
+namespace RelCalcHelper {
+
+  int calPercentageOf(int i, int j);
+
+  int calPercentageValueOf(int i, int j);
+
+}
+
+}
+
+#endif // FBTK_RELCALCHELPER_HH