@@ -0,0 +1,148 @@
+// ClockTool.cc
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                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.
+
+// $Id: ClockTool.cc,v 1.1 2003/08/11 14:32:39 fluxgen Exp $
+
+#include "ClockTool.hh"
+
+#include "ToolTheme.hh"
+#include "Screen.hh"
+
+#include "FbTk/SimpleCommand.hh"
+#include "FbTk/ImageControl.hh"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#include <ctime>
+
+#include <iostream>
+using namespace std;
+
+ClockTool::ClockTool(const FbTk::FbWindow &parent,
+                     ToolTheme &theme, BScreen &screen):
+    ToolbarItem(ToolbarItem::FIXED),
+    m_button(parent, theme.font(), ""),
+    m_theme(theme),
+    m_screen(screen),
+    m_pixmap(0),
+    m_timeformat(screen.resourceManager(), std::string("%k:%M"), 
+                 screen.name() + ".strftimeFormat", screen.altName() + ".StrftimeFormat") {
+
+    theme.reconfigSig().attach(this);
+    m_button.setGC(theme.textGC());
+    m_button.clear();
+
+    // setup timer to update the graphics each second
+    timeval delay;
+    delay.tv_sec = 1;
+    delay.tv_usec = 0;
+    m_timer.setTimeout(delay);
+    FbTk::RefCount<FbTk::Command> update_graphic(new FbTk::SimpleCommand<ClockTool>(*this, 
+                                                                                    &ClockTool::updateTime));
+    m_timer.setCommand(update_graphic);
+    m_timer.start();
+
+    update(0);
+}
+
+ClockTool::~ClockTool() {
+    // remove cached pixmap
+    if (m_pixmap)
+        m_screen.imageControl().removeImage(m_pixmap);
+}
+
+void ClockTool::move(int x, int y) {
+    m_button.move(x, y);
+}
+
+void ClockTool::resize(unsigned int width, unsigned int height) {
+    m_button.resize(width, height);
+    renderTheme();
+}
+
+void ClockTool::moveResize(int x, int y,
+                      unsigned int width, unsigned int height) {
+    m_button.moveResize(x, y, width, height);
+}
+
+void ClockTool::show() {
+    m_button.show();
+}
+
+void ClockTool::hide() {
+    m_button.hide();
+}
+
+void ClockTool::update(FbTk::Subject *subj) {
+    updateTime();
+    resize(m_button.textWidth(), m_button.height());
+}
+
+unsigned int ClockTool::width() const {
+    return m_theme.font().textWidth(m_button.text().c_str(), m_button.text().size());
+}
+
+unsigned int ClockTool::height() const {
+    return m_button.height();
+}
+
+void ClockTool::updateTime() {
+
+    // update clock
+    time_t the_time = time(0);
+
+    if (the_time != -1) {
+        char time_string[255];
+        struct tm *time_type = localtime(&the_time);
+        if (time_type == 0)
+            return;
+
+#ifdef HAVE_STRFTIME
+        if (!strftime(time_string, 255, m_timeformat->c_str(), time_type))
+            return;
+        m_button.setText(time_string);
+#else // dont have strftime so we have to set it to hour:minut
+        //        sprintf(time_string, "%d:%d", );
+#endif // HAVE_STRFTIME
+    }
+
+
+    m_button.clear();
+}
+
+void ClockTool::renderTheme() {
+    Pixmap old_pm = m_pixmap;
+    if (m_theme.texture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
+        m_pixmap = 0;
+        m_button.setBackgroundColor(m_theme.texture().color());
+    } else {
+        m_pixmap = m_screen.imageControl().renderImage(m_button.width(), m_button.height(), m_theme.texture());
+        m_button.setBackgroundPixmap(m_pixmap);
+    }
+
+    if (old_pm)
+        m_screen.imageControl().removeImage(old_pm);
+
+    m_button.clear();
+}

@@ -0,0 +1,77 @@
+// ClockTool.hh
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                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.
+
+// $Id: ClockTool.hh,v 1.1 2003/08/11 14:32:39 fluxgen Exp $
+
+#ifndef CLOCKTOOL_HH
+#define CLOCKTOOL_HH
+
+
+#include "ToolbarItem.hh"
+#include "TextButton.hh"
+
+#include "FbTk/Observer.hh"
+#include "FbTk/Resource.hh"
+#include "FbTk/Timer.hh"
+
+#include <string>
+
+class ToolTheme;
+class BScreen;
+
+namespace FbTk {
+class ImageControl;
+class Subject;
+}
+
+class ClockTool:public ToolbarItem, public FbTk::Observer {
+public:
+    ClockTool(const FbTk::FbWindow &parent, ToolTheme &theme, BScreen &screen);
+    virtual ~ClockTool();
+
+    void move(int x, int y);
+    void resize(unsigned int width, unsigned int height);
+    void moveResize(int x, int y,
+                    unsigned int width, unsigned int height);
+
+    void show();
+    void hide();
+    unsigned int width() const;
+    unsigned int height() const;
+
+private:
+    void updateTime();
+    void update(FbTk::Subject *subj);
+    void renderTheme();
+
+    TextButton m_button;
+    
+    const ToolTheme &m_theme;
+    BScreen &m_screen;
+    Pixmap m_pixmap;
+    FbTk::Timer m_timer;
+
+    FbTk::Resource<std::string> m_timeformat;
+
+};
+
+#endif // CLOCKTOOL_HH

@@ -0,0 +1,115 @@
+// WorkspaceNameTool.cc
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                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.
+
+// $Id: WorkspaceNameTool.cc,v 1.1 2003/08/11 14:32:39 fluxgen Exp $
+
+#include "WorkspaceNameTool.hh"
+
+#include "ToolTheme.hh"
+#include "Screen.hh"
+#include "Workspace.hh"
+
+#include "FbTk/ImageControl.hh"
+
+WorkspaceNameTool::WorkspaceNameTool(const FbTk::FbWindow &parent, 
+                                     ToolTheme &theme, BScreen &screen):
+    ToolbarItem(ToolbarItem::FIXED),
+    m_button(parent, theme.font(), "a workspace name"),
+    m_theme(theme),
+    m_screen(screen),
+    m_pixmap(0) {
+    // set text
+    m_button.setText(m_screen.currentWorkspace()->name());
+    // setup signals
+    screen.currentWorkspaceSig().attach(this);
+    theme.reconfigSig().attach(this);
+}
+
+WorkspaceNameTool::~WorkspaceNameTool() {
+    if (m_pixmap)
+        m_screen.imageControl().removeImage(m_pixmap);
+}
+
+void WorkspaceNameTool::move(int x, int y) {
+    m_button.move(x, y);
+}
+
+void WorkspaceNameTool::resize(unsigned int width, unsigned int height) {
+    m_button.resize(width, height);
+}
+
+
+void WorkspaceNameTool::moveResize(int x, int y,
+                                   unsigned int width, unsigned int height) {
+    m_button.moveResize(x, y, width, height);
+}
+
+void WorkspaceNameTool::update(FbTk::Subject *subj) {
+    m_button.setText(m_screen.currentWorkspace()->name());
+    renderTheme();
+}
+
+unsigned int WorkspaceNameTool::width() const {
+    // calculate largest size
+    int max_size = 0;
+    const int num_workspaces = m_screen.getNumberOfWorkspaces();
+    for (int workspace = 0; workspace < num_workspaces; ++workspace) {
+        const std::string &name = m_screen.getWorkspace(workspace)->name().c_str();
+        int size = m_theme.font().textWidth(name.c_str(), name.size());
+        if (size > max_size)
+            max_size = size;
+    }
+    // so align text dont cut the last character
+    max_size += 2;
+
+    return max_size;
+}
+
+unsigned int WorkspaceNameTool::height() const {
+    return m_button.height();
+}
+
+
+void WorkspaceNameTool::show() {
+    m_button.show();
+}
+
+void WorkspaceNameTool::hide() {
+    m_button.hide();
+}
+
+void WorkspaceNameTool::renderTheme() {
+    Pixmap tmp = m_pixmap;
+    if (m_theme.texture().type() == (FbTk::Texture::FLAT | FbTk::Texture::SOLID)) {
+        m_pixmap = 0;
+        m_button.setBackgroundColor(m_theme.texture().color());
+    } else {
+        m_pixmap = m_screen.imageControl().renderImage(width(), height(),
+                                                       m_theme.texture());
+    }
+    if (tmp)
+        m_screen.imageControl().removeImage(tmp);
+
+    m_button.setFont(m_theme.font());
+    m_button.setJustify(m_theme.justify());
+    m_button.clear();
+}

@@ -0,0 +1,62 @@
+// WorkspaceNameTool.hh
+// Copyright (c) 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//                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.
+
+// $Id: WorkspaceNameTool.hh,v 1.1 2003/08/11 14:32:39 fluxgen Exp $
+
+#ifndef WORKSPACENAMETOOL_HH
+#define WORKSPACENAMETOOL_HH
+
+#include "ToolbarItem.hh"
+#include "TextButton.hh"
+
+#include "FbTk/Observer.hh"
+
+class BScreen;
+class ToolTheme;
+
+class WorkspaceNameTool: public ToolbarItem, FbTk::Observer {
+public:
+    WorkspaceNameTool(const FbTk::FbWindow &parent, ToolTheme &theme, BScreen &screen);
+    virtual ~WorkspaceNameTool();
+
+    void move(int x, int y);
+    void resize(unsigned int width, unsigned int height);
+    void moveResize(int x, int y,
+                    unsigned int width, unsigned int height);
+
+    void show();
+    void hide();
+    unsigned int width() const;
+    unsigned int height() const;
+
+    void update(FbTk::Subject *subj);
+
+private:
+    void renderTheme();
+    TextButton m_button;
+    const ToolTheme &m_theme;
+    BScreen &m_screen;
+    Pixmap m_pixmap;
+};
+
+#endif // WORKSPACENAMETOOL_HH
+