moved BorderTheme and TextTheme to FbTk

5 files changed, 187 insertions, 0 deletions

diff --git a/src/FbTk/BorderTheme.cc b/src/FbTk/BorderTheme.cc
new file mode 100644
index 0000000..1223954
--- /dev/null
+++ b/src/FbTk/BorderTheme.cc
@@ -0,0 +1,36 @@
+// BorderTheme.cc
+// Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// 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 "BorderTheme.hh"
+
+namespace FbTk {
+
+BorderTheme::BorderTheme(Theme &theme, const std::string &name,
+                         const std::string &altname):
+    m_width(theme, name + ".borderWidth", altname + ".BorderWidth"),
+    m_color(theme, name + ".borderColor", altname + ".BorderColor") {
+    // set default values
+    *m_width = 0;
+    m_color->setFromString("black", theme.screenNum());
+}
+
+}; // end namespace FbTk
diff --git a/src/FbTk/BorderTheme.hh b/src/FbTk/BorderTheme.hh
new file mode 100644
index 0000000..9b9ca55
--- /dev/null
+++ b/src/FbTk/BorderTheme.hh
@@ -0,0 +1,47 @@
+// BorderTheme.hh
+// Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// 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_BORDERTHEME_HH
+#define FBTK_BORDERTHEME_HH
+
+#include "Theme.hh"
+#include "Color.hh"
+
+namespace FbTk {
+
+/// helper class for border theme items
+class BorderTheme {
+public:
+    BorderTheme(Theme &theme, const std::string &name, const std::string &altname);
+    virtual ~BorderTheme() { }
+
+    int width() const { return *m_width; }
+    const Color &color() const { return *m_color; }
+
+private:
+    ThemeItem<int> m_width;
+    ThemeItem<Color> m_color;
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_BORDERTHEME_HH
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index e3e5d76..75733a7 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -28,6 +28,7 @@ libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
         BoolMenuItem.hh IntMenuItem.hh \
         MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
         MenuTheme.hh MenuTheme.cc NotCopyable.hh \
+        BorderTheme.hh BorderTheme.cc TextTheme.hh TextTheme.cc \
         RefCount.hh SimpleCommand.hh SignalHandler.cc SignalHandler.hh \
         Text.hh Text.cc \
         Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
diff --git a/src/FbTk/TextTheme.cc b/src/FbTk/TextTheme.cc
new file mode 100644
index 0000000..848ee01
--- /dev/null
+++ b/src/FbTk/TextTheme.cc
@@ -0,0 +1,48 @@
+// TextTheme.cc
+// Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// 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 "TextTheme.hh"
+
+#include "App.hh"
+
+#include <X11/Xlib.h>
+
+namespace FbTk {
+
+TextTheme::TextTheme(Theme &theme,
+                     const std::string &name, const std::string &altname):
+    m_font(theme, name + ".font", altname + ".Font"),
+    m_text_color(theme, name + ".textColor", altname + ".TextColor"),
+    m_justify(theme, name + ".justify", altname + ".Justify"),
+    m_text_gc(RootWindow(App::instance()->display(), theme.screenNum())) {
+    *m_justify = LEFT;
+    // set default values
+    m_text_color->setFromString("white", theme.screenNum());
+
+    update();
+}
+
+void TextTheme::update() {
+    m_text_gc.setForeground(*m_text_color);
+}
+
+}; // end namespace FbTk
diff --git a/src/FbTk/TextTheme.hh b/src/FbTk/TextTheme.hh
new file mode 100644
index 0000000..ea22d4b
--- /dev/null
+++ b/src/FbTk/TextTheme.hh
@@ -0,0 +1,55 @@
+// TextTheme.hh
+// Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
+//                and Simon Bowden    (rathnor at users.sourceforge.net)
+//
+// 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_TEXTTHEME_HH
+#define FBTK_TEXTTHEME_HH
+
+#include "Theme.hh"
+#include "Font.hh"
+#include "Color.hh"
+#include "Text.hh"
+#include "GContext.hh"
+
+namespace FbTk {
+
+class TextTheme {
+public:
+    TextTheme(Theme &theme, const std::string &name, const std::string &altname);
+    virtual ~TextTheme() { }
+
+    void update();
+
+    Font &font() { return *m_font; }
+    const Font &font() const { return *m_font; }
+    const Color &textColor() const { return *m_text_color; }
+    Justify justify() const { return *m_justify; }
+    GC textGC() const { return m_text_gc.gc(); }
+private:
+    ThemeItem<Font> m_font;
+    ThemeItem<Color> m_text_color;
+    ThemeItem<Justify> m_justify;
+    GContext m_text_gc;
+};
+
+}; // end namespace FbTk
+
+#endif // FBTK_TEXTTHEME_HH