removed some unneeded headers
Mathias Gumz akira at fluxbox dot org
77 files changed,
161 insertions(+),
251 deletions(-)
jump to
M
src/ArrowButton.hh
→
src/ArrowButton.hh
@@ -24,7 +24,7 @@
#ifndef ARROWBUTTON_HH #define ARROWBUTTON_HH -#include "Button.hh" +#include "FbTk/Button.hh" /// Displays a arrow on a button class ArrowButton: public FbTk::Button {
M
src/AtomHandler.hh
→
src/AtomHandler.hh
@@ -40,7 +40,7 @@ virtual void initForScreen(BScreen &screen) = 0;
virtual void setupFrame(FluxboxWindow &win) = 0; virtual void setupClient(WinClient &winclient) = 0; - virtual void updateFocusedWindow(BScreen &screen, Window win) = 0; + virtual void updateFocusedWindow(BScreen &screen, Window win) = 0; virtual void updateClientList(BScreen &screen) = 0; virtual void updateWorkspaceNames(BScreen &screen) = 0; virtual void updateCurrentWorkspace(BScreen &screen) = 0;@@ -54,7 +54,7 @@ virtual void updateState(FluxboxWindow &win) = 0;
virtual void updateHints(FluxboxWindow &win) = 0; virtual void updateLayer(FluxboxWindow &win) = 0; virtual void updateFrameExtents(FluxboxWindow &win) { } - virtual bool checkClientMessage(const XClientMessageEvent &ce, + virtual bool checkClientMessage(const XClientMessageEvent &ce, BScreen * screen, WinClient * const winclient) = 0; virtual bool propertyNotify(WinClient &winclient, Atom the_property) = 0;@@ -67,7 +67,7 @@ protected:
AtomHandler():m_update(true) { } void disableUpdate() { m_update = false; } - void enableUpdate() { m_update = true; } + void enableUpdate() { m_update = true; } private: bool m_update; ///< do we get update or not };
M
src/ButtonTool.cc
→
src/ButtonTool.cc
@@ -22,10 +22,9 @@
// $Id$ #include "ButtonTool.hh" - +#include "ButtonTheme.hh" #include "FbTk/Button.hh" #include "FbTk/ImageControl.hh" -#include "ButtonTheme.hh" ButtonTool::ButtonTool(FbTk::Button *button, ToolbarItem::Type type,
M
src/ClientPattern.hh
→
src/ClientPattern.hh
@@ -27,9 +27,8 @@ #ifndef CLIENTPATTERN_HH
#define CLIENTPATTERN_HH #include "FbTk/RegExp.hh" -#include "NotCopyable.hh" +#include "FbTk/NotCopyable.hh" -#include <string> #include <list> class Focusable;
M
src/ClockTool.cc
→
src/ClockTool.cc
@@ -46,13 +46,12 @@ #else
#include <time.h> #endif #include <sys/time.h> -#include <string> #include <typeinfo> class ClockMenuItem: public FbTk::MenuItem { public: explicit ClockMenuItem(ClockTool &tool): - FbTk::MenuItem(""), m_tool(tool) { + FbTk::MenuItem(""), m_tool(tool) { // determine 12/24 hour format _FB_USES_NLS; if (m_tool.timeFormat().find("%k") != std::string::npos ||@@ -78,7 +77,7 @@ else if ((pos = newformat.find("%H")) != std::string::npos)
newstr = "%I"; else if ((pos = newformat.find("%T")) != std::string::npos) newstr = "%r"; - + // 12 hour if (newstr.empty()) { clock24hour = false;@@ -88,9 +87,9 @@ else if ((pos = newformat.find("%I")) != std::string::npos)
newstr = "%H"; else if ((pos = newformat.find("%r")) != std::string::npos) newstr = "%T"; - + } - + if (!newstr.empty()) { newformat.replace(pos, 2, newstr);@@ -102,7 +101,7 @@ else if ((pos = newformat.find("%P")) != std::string::npos)
newformat.erase(pos, 2); } - + m_tool.setTimeFormat(newformat); if (m_tool.timeFormat().find("%k") != std::string::npos ||@@ -111,7 +110,7 @@ m_tool.timeFormat().find("%T") != std::string::npos)
setLabel( _FB_XTEXT(Toolbar, Clock24, "Clock: 24h", "set Clockmode to 24h") ); else setLabel( _FB_XTEXT(Toolbar, Clock12, "Clock: 12h", "set Clockmode to 12h") ); - + } // else some other strange format...so we don't do anything FbTk::MenuItem::click(button, time, mods); }@@ -127,7 +126,7 @@ if (screen == 0)
return; std::string resourcename = screen->name() + ".strftimeFormat"; - CommandDialog *dialog = new CommandDialog(*screen, "Edit Clock Format", + CommandDialog *dialog = new CommandDialog(*screen, "Edit Clock Format", "SetResourceValue " + resourcename + " "); FbTk::RefCount<FbTk::Command> cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse("reconfigure")); dialog->setPostCommand(cmd);@@ -143,7 +142,7 @@ m_button(parent, theme.font(), ""),
m_theme(theme), m_screen(screen), m_pixmap(0), - m_timeformat(screen.resourceManager(), std::string("%k:%M"), + m_timeformat(screen.resourceManager(), std::string("%k:%M"), screen.name() + ".strftimeFormat", screen.altName() + ".StrftimeFormat"), m_stringconvertor(FbTk::StringConvertor::ToFbString) { // attach signals@@ -162,7 +161,7 @@ // setup timer to check the clock every 0.01 second
// if nothing has changed, it wont update the graphics m_timer.setInterval(1); // m_timer.setTimeout(delay); // don't need to set timeout on interval timer - FbTk::RefCount<FbTk::Command> update_graphic(new FbTk::SimpleCommand<ClockTool>(*this, + FbTk::RefCount<FbTk::Command> update_graphic(new FbTk::SimpleCommand<ClockTool>(*this, &ClockTool::updateTime)); m_timer.setCommand(update_graphic); m_timer.start();@@ -248,7 +247,7 @@ renderTheme(m_button.alpha());
} -unsigned int ClockTool::borderWidth() const { +unsigned int ClockTool::borderWidth() const { return m_button.borderWidth(); }@@ -297,12 +296,12 @@
// Just change things that affect the size void ClockTool::updateSizing() { m_button.setBorderWidth(m_theme.border().width()); - // resizes if new timeformat + // resizes if new timeformat update(0); } void ClockTool::reRender() { - if (m_pixmap) + if (m_pixmap) m_screen.imageControl().removeImage(m_pixmap); if (m_theme.texture().usePixmap()) {
M
src/ClockTool.hh
→
src/ClockTool.hh
@@ -34,8 +34,6 @@ #include "FbTk/Resource.hh"
#include "FbTk/Timer.hh" #include "FbTk/FbString.hh" -#include <string> - class ToolTheme; class BScreen;@@ -76,7 +74,7 @@ void reRender();
void updateSizing(); FbTk::TextButton m_button; - + const ToolTheme &m_theme; BScreen &m_screen; Pixmap m_pixmap;
M
src/CurrentWindowCmd.cc
→
src/CurrentWindowCmd.cc
@@ -35,9 +35,6 @@ #include "FbTk/ObjectRegistry.hh"
#include "FbTk/stringstream.hh" #include "FbTk/StringUtil.hh" -#include <string> -#include <vector> - using FbTk::Command; namespace {
M
src/CurrentWindowCmd.hh
→
src/CurrentWindowCmd.hh
@@ -25,7 +25,7 @@
#ifndef CURRENTWINDOWCMD_HH #define CURRENTWINDOWCMD_HH -#include "Command.hh" +#include "FbTk/Command.hh" #include "Window.hh" #include "ClientPattern.hh"
M
src/FbAtoms.cc
→
src/FbAtoms.cc
@@ -22,7 +22,7 @@
// $Id$ #include "FbAtoms.hh" -#include "App.hh" +#include "FbTk/App.hh" #include <string>
M
src/FbCommands.hh
→
src/FbCommands.hh
@@ -26,15 +26,12 @@
#ifndef FBCOMMANDS_HH #define FBCOMMANDS_HH -#include "Command.hh" - +#include "FbTk/Command.hh" #include "FbTk/RefCount.hh" + #include "ClientMenu.hh" #include "ClientPattern.hh" #include "FocusableList.hh" - -#include <list> -#include <string> namespace FbCommands {
M
src/FbMenu.hh
→
src/FbMenu.hh
@@ -24,8 +24,8 @@
#ifndef FBMENU_HH #define FBMENU_HH -#include "Menu.hh" -#include "XLayerItem.hh" +#include "FbTk/Menu.hh" +#include "FbTk/XLayerItem.hh" namespace FbTk { class MenuTheme;
M
src/FbRootWindow.cc
→
src/FbRootWindow.cc
@@ -22,8 +22,8 @@
// $Id$ #include "FbRootWindow.hh" -#include "App.hh" +#include "FbTk/App.hh" #include <X11/Xutil.h> FbRootWindow::FbRootWindow(int screen_num):
M
src/FbTk/App.cc
→
src/FbTk/App.cc
@@ -26,8 +26,6 @@ #include "Image.hh"
#include "EventManager.hh" -#include <string> - namespace FbTk { App *App::s_app = 0;
M
src/FbTk/Button.hh
→
src/FbTk/Button.hh
@@ -32,19 +32,17 @@ #include "Command.hh"
#include "Color.hh" #include "Text.hh" -#include <X11/Xlib.h> - namespace FbTk { class Theme; -class Button:public FbTk::FbWindow, public EventHandler, +class Button:public FbTk::FbWindow, public EventHandler, private NotCopyable { public: Button(int screen_num, int x, int y, unsigned int width, unsigned int height); Button(const FbWindow &parent, int x, int y, unsigned int width, unsigned int height); virtual ~Button(); - + /// sets action when the button is clicked with #button mouse btn void setOnClick(RefCount<Command> &com, int button = 1);
M
src/FbTk/EventManager.hh
→
src/FbTk/EventManager.hh
@@ -35,7 +35,7 @@ */
class EventManager { public: static EventManager *instance(); - + void handleEvent(XEvent &ev); // adds a parent to listen to the childrens events void addParent(EventHandler &ev, const FbWindow &parent);
M
src/FbTk/FbDrawable.cc
→
src/FbTk/FbDrawable.cc
@@ -42,7 +42,7 @@ int dest_x, int dest_y,
unsigned int width, unsigned int height) { if (drawable() == 0 || src == 0 || gc == 0) return; - XCopyArea(s_display, + XCopyArea(display(), src, drawable(), gc, src_x, src_y, width, height,@@ -53,27 +53,27 @@ void FbDrawable::fillRectangle(GC gc, int x, int y,
unsigned int width, unsigned int height) { if (drawable() == 0 || gc == 0) return; - XFillRectangle(s_display, + XFillRectangle(display(), drawable(), gc, x, y, width, height); } -void FbDrawable::drawRectangle(GC gc, int x, int y, +void FbDrawable::drawRectangle(GC gc, int x, int y, unsigned int width, unsigned int height) { if (drawable() == 0 || gc == 0) return; - XDrawRectangle(s_display, + XDrawRectangle(display(), drawable(), gc, x, y, width, height); } -void FbDrawable::drawLine(GC gc, int start_x, int start_y, +void FbDrawable::drawLine(GC gc, int start_x, int start_y, int end_x, int end_y) { if (drawable() == 0 || gc == 0) return; - XDrawLine(s_display, + XDrawLine(display(), drawable(), gc, start_x, start_y,@@ -84,7 +84,7 @@ void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints,
int shape, int mode) { if (drawable() == 0 || gc == 0 || points == 0 || npoints == 0) return; - XFillPolygon(s_display, + XFillPolygon(display(), drawable(), gc, points, npoints, shape, mode); }@@ -92,7 +92,7 @@
// x, y, width and height define a space within which we're drawing a triangle (centred) // scale defines number of triangles that'd fit in a space of 100 width x 100 height // (i.e. 200 = half size, 300 = a third). Its a bit backwards but it allows more flexibility -void FbDrawable::drawTriangle(GC gc, FbDrawable::TriangleType type, +void FbDrawable::drawTriangle(GC gc, FbDrawable::TriangleType type, int x, int y, unsigned int width, unsigned int height, int scale) { if (drawable() == 0 || gc == 0 || width == 0 || height == 0)@@ -141,7 +141,7 @@ pts[0].x = (width / 2) ; pts[0].y = (height / 2) + (ay / 2);
pts[1].x = -ax/2+1; pts[1].y = -ay; pts[2].x = ax-1; pts[2].y = 0; break; - + } // re-centre on the specified points@@ -149,21 +149,21 @@ pts[0].x += x;
pts[0].y += y; fillPolygon(gc, - pts, 3, + pts, 3, Convex, CoordModePrevious); } #ifdef NOT_USED void FbDrawable::drawPoint(GC gc, int x, int y) { if (drawable() == 0 || gc == 0) - return; - XDrawPoint(s_display, drawable(), gc, x, y); + return; + XDrawPoint(display(), drawable(), gc, x, y); } #endif XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const { - return XGetImage(s_display, drawable(), - x, y, width, height, + return XGetImage(display(), drawable(), + x, y, width, height, AllPlanes, // plane mask ZPixmap); }
M
src/FbTk/FbDrawable.hh
→
src/FbTk/FbDrawable.hh
@@ -75,7 +75,7 @@ virtual unsigned int height() const = 0;
virtual unsigned int depth() const = 0; static Display *display() { return s_display; } protected: - static Display *s_display; // display connection // display connection + static Display *s_display; // display connection }; } // end namespace FbTk
M
src/FbTk/FbPixmap.hh
→
src/FbTk/FbPixmap.hh
@@ -27,8 +27,6 @@
#include "FbDrawable.hh" #include "Text.hh" -#include <X11/Xlib.h> - namespace FbTk { /// a wrapper for X Pixmap
M
src/FbTk/FbString.cc
→
src/FbTk/FbString.cc
@@ -20,7 +20,9 @@ // 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$ +// $Id$ + +#include "FbString.hh" #ifdef HAVE_CERRNO #include <cerrno>@@ -38,14 +40,8 @@ #else
#include <stdlib.h> #endif -#include "FbString.hh" -#include "config.h" - #include <stdio.h> -#ifdef HAVE_ICONV -#include <iconv.h> -#endif // HAVE_ICONV #include <langinfo.h> #include <locale.h>
M
src/FbTk/FbWindow.hh
→
src/FbTk/FbWindow.hh
@@ -108,7 +108,7 @@
virtual void move(int x, int y) { if (x == m_x && y == m_y) return; - XMoveWindow(s_display, m_window, x, y); + XMoveWindow(display(), m_window, x, y); m_x = x; m_y = y; updateBackground(true);@@ -117,7 +117,7 @@
virtual void resize(unsigned int width, unsigned int height) { if (width == m_width && height == m_height) return; - XResizeWindow(s_display, m_window, width, height); + XResizeWindow(display(), m_window, width, height); m_width = width; m_height = height; updateBackground(false);@@ -126,7 +126,7 @@
virtual void moveResize(int x, int y, unsigned int width, unsigned int height) { if (x == m_x && y == m_y && width == m_width && height == m_height) return; - XMoveResizeWindow(s_display, m_window, x, y, width, height); + XMoveResizeWindow(display(), m_window, x, y, width, height); m_x = x; m_y = y; m_width = width;@@ -183,7 +183,6 @@ unsigned int depth() const { return m_depth; }
unsigned char alpha() const; int screenNumber() const; long eventMask() const; - Display *display() const { return s_display; } /// compare X window bool operator == (Window win) const { return m_window == win; }
M
src/FbTk/FileUtil.hh
→
src/FbTk/FileUtil.hh
@@ -61,7 +61,7 @@ /// copies file 'from' to 'to'
bool copyFile(const char* from, const char* to); }; // end of File namespace - + /// Wrapper class for DIR * routines class Directory : private FbTk::NotCopyable { public:@@ -70,19 +70,19 @@ ~Directory();
const std::string &name() const { return m_name; } /// go to start of filelist void rewind(); - /// gets next dirent info struct in directory and + /// gets next dirent info struct in directory and /// jumps to next directory entry struct dirent * read(); /// reads next filename in directory std::string readFilename(); /// close directory - void close(); + void close(); /// open directory /// @param dir the directory name bool open(const char *dir); /// @return number of entries in the directory size_t entries() const { return m_num_entries; } - + private: std::string m_name; DIR *m_dir;
M
src/FbTk/Font.hh
→
src/FbTk/Font.hh
@@ -63,15 +63,15 @@ @return true on success, else false and it'll fall back on the last
loaded font */ bool load(const std::string &name); - + void setHalo(bool flag) { m_halo = flag; if (m_halo) setShadow(false); } void setHaloColor(const Color& color) { m_halo_color = color; } - + void setShadow(bool flag) { m_shadow = flag; if (m_shadow) setHalo(false); } void setShadowColor(const Color& color) { m_shadow_color = color; } void setShadowOffX(int offx) { m_shadow_offx = offx; } void setShadowOffY(int offy) { m_shadow_offy = offy; } - + /** @param text text to check size @param size length of text in bytes@@ -110,7 +110,7 @@ private:
FbTk::FontImp* m_fontimp; ///< font implementation std::string m_fontstr; ///< font name - + static bool s_multibyte; ///< if the fontimp should be a multibyte font static bool s_utf8mode; ///< should the font use utf8 font imp
M
src/FbTk/GContext.cc
→
src/FbTk/GContext.cc
@@ -33,9 +33,9 @@ namespace FbTk {
Display *GContext::m_display = 0; -GContext::GContext(const FbTk::FbDrawable &drawable): +GContext::GContext(const FbTk::FbDrawable &drawable): m_gc(XCreateGC(drawable.display(), drawable.drawable(), 0, 0)) { - + if (m_display == 0) m_display = drawable.display();@@ -78,7 +78,7 @@
void GContext::copy(const GContext &gc) { // copy X gc copy(gc.gc()); - + //!! TODO: copy our extended gcontext }
M
src/FbTk/GContext.hh
→
src/FbTk/GContext.hh
@@ -27,8 +27,6 @@
#include "Color.hh" #include "FbPixmap.hh" -#include <X11/Xlib.h> - namespace FbTk { class FbDrawable;
M
src/FbTk/Image.hh
→
src/FbTk/Image.hh
@@ -33,16 +33,16 @@
class ImageBase; class PixmapWithMask; -/// loads images +/// loads images class Image { public: - + /// called at FbTk::App creation time, init some internal stuff static void init(); /// called at FbTk:App destruction time, frees stuff allocated by init() static void shutdown(); - + /// @return an instance of PixmapWithMask on success, 0 on failure static PixmapWithMask *load(const std::string &filename, int screen_num); /// for register file type and imagebase@@ -67,7 +67,7 @@ };
/// common interface for all image classes class ImageBase { -public: +public: virtual ~ImageBase() { Image::remove(*this); } virtual PixmapWithMask *load(const std::string &name, int screen_num) const = 0; };
M
src/FbTk/ImageControl.hh
→
src/FbTk/ImageControl.hh
@@ -33,7 +33,6 @@ #include "Texture.hh"
#include "Timer.hh" #include "NotCopyable.hh" -#include <X11/Xlib.h> #include <list> namespace FbTk {
M
src/FbTk/IntMenuItem.hh
→
src/FbTk/IntMenuItem.hh
@@ -24,8 +24,6 @@ #define FBTK_INTMENUITEM_HH
#include "MenuItem.hh" -#include <string> - namespace FbTk { class Accessor<class T>;
M
src/FbTk/MacroCommand.cc
→
src/FbTk/MacroCommand.cc
@@ -27,7 +27,6 @@ #include "ObjectRegistry.hh"
#include "StringUtil.hh" #include <list> -#include <string> namespace FbTk {
M
src/FbTk/Menu.hh
→
src/FbTk/Menu.hh
@@ -24,20 +24,18 @@ // DEALINGS IN THE SOFTWARE.
// $Id$ -#ifndef FBTK_MENU_HH -#define FBTK_MENU_HH +#ifndef FBTK_MENU_HH +#define FBTK_MENU_HH -#include <X11/Xlib.h> #include <vector> -#include <string> #include <memory> +#include "FbString.hh" #include "FbWindow.hh" #include "EventHandler.hh" #include "Observer.hh" #include "MenuTheme.hh" #include "Timer.hh" -#include "FbString.hh" #include "TypeAhead.hh" namespace FbTk {
M
src/FbTk/MenuSeparator.cc
→
src/FbTk/MenuSeparator.cc
@@ -1,7 +1,7 @@
// MenuSeparator.cc for FbTk - Fluxbox ToolKit // Copyright (c) 2004 - 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@@ -30,7 +30,7 @@ #include "FbDrawable.hh"
namespace FbTk { -void MenuSeparator::draw(FbDrawable &drawable, +void MenuSeparator::draw(FbDrawable &drawable, const MenuTheme &theme, bool highlight, bool draw_foreground, bool draw_background, int x, int y,
M
src/FbTk/MenuSeparator.hh
→
src/FbTk/MenuSeparator.hh
@@ -1,7 +1,7 @@
// MenuSeparator.hh for FbTk - Fluxbox ToolKit // Copyright (c) 2004 - 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@@ -31,7 +31,7 @@ namespace FbTk {
class MenuSeparator: public MenuItem { public: - virtual void draw(FbDrawable &drawable, + virtual void draw(FbDrawable &drawable, const MenuTheme &theme, bool highlight, bool draw_foreground, bool draw_background, int x, int y,
M
src/FbTk/ObjectRegistry.hh
→
src/FbTk/ObjectRegistry.hh
@@ -26,7 +26,6 @@ #define OBJECTREGISTRY_HH
#include "StringUtil.hh" -#include <string> #include <map> using std::string;
M
src/FbTk/RegExp.cc
→
src/FbTk/RegExp.cc
@@ -27,7 +27,6 @@ #ifndef _GNU_SOURCE
#define _GNU_SOURCE #endif // _GNU_SOURCE -#include <string> #include <iostream> using std::string;
M
src/FbTk/Shape.hh
→
src/FbTk/Shape.hh
@@ -24,7 +24,6 @@ #define SHAPE_HH
#include "FbPixmap.hh" -#include <X11/Xlib.h> #include <vector> namespace FbTk {
M
src/FbTk/Theme.hh
→
src/FbTk/Theme.hh
@@ -28,12 +28,12 @@
#ifndef FBTK_THEME_HH #define FBTK_THEME_HH +#include "XrmDatabaseHelper.hh" +#include "Subject.hh" + #include <string> #include <list> #include <vector> - -#include "XrmDatabaseHelper.hh" -#include "Subject.hh" namespace FbTk {
M
src/FbTk/TypeAhead.hh
→
src/FbTk/TypeAhead.hh
@@ -23,7 +23,6 @@ #ifndef FBTK_TYPEAHEAD_HH
#define FBTK_TYPEAHEAD_HH #include "ITypeAheadable.hh" -#include <vector> #include "SearchResult.hh" namespace FbTk {
M
src/FbTk/XFontImp.hh
→
src/FbTk/XFontImp.hh
@@ -26,8 +26,6 @@ #define FBTK_XFONTIMP_HH
#include "FontImp.hh" -#include <X11/Xlib.h> - namespace FbTk { /// regular X font implementation for FbTk
M
src/FbTk/XLayer.hh
→
src/FbTk/XLayer.hh
@@ -26,8 +26,8 @@
#ifndef FBTK_XLAYER_HH #define FBTK_XLAYER_HH -#include <list> #include "Layer.hh" +#include <list> namespace FbTk {
M
src/FbTk/XftFontImp.hh
→
src/FbTk/XftFontImp.hh
@@ -24,9 +24,9 @@
#ifndef FBTK_XFTFONTIMP_HH #define FBTK_XFTFONTIMP_HH -#include <X11/Xft/Xft.h> #include "FontImp.hh" -#include <string> + +#include <X11/Xft/Xft.h> namespace FbTk {
M
src/FbTk/XmbFontImp.cc
→
src/FbTk/XmbFontImp.cc
@@ -56,8 +56,6 @@ #else
#include <string.h> #endif -#include <X11/Xlib.h> - using std::string; namespace {
M
src/FbTk/XmbFontImp.hh
→
src/FbTk/XmbFontImp.hh
@@ -26,8 +26,6 @@ #define FBTK_XMBFONTIMP_HH
#include "FontImp.hh" -#include <X11/Xlib.h> - namespace FbTk { /// multibyte font implementation for FbTk
M
src/FbWinFrame.cc
→
src/FbWinFrame.cc
@@ -68,9 +68,9 @@ ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | ExposureMask | EnterWindowMask | LeaveWindowMask), m_grip_left(m_handle, 0, 0, 10, 4, - ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask | ExposureMask | - EnterWindowMask | LeaveWindowMask), + ButtonPressMask | ButtonReleaseMask | + ButtonMotionMask | ExposureMask | + EnterWindowMask | LeaveWindowMask), m_clientarea(m_window, 0, 0, 100, 100, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | ExposureMask |
M
src/FbWinFrame.hh
→
src/FbWinFrame.hh
@@ -36,8 +36,6 @@ #include "FbTk/Container.hh"
#include "FbTk/Shape.hh" #include <vector> -#include <list> -#include <string> #include <memory> class FbWinFrameTheme;
M
src/Gnome.cc
→
src/Gnome.cc
@@ -23,16 +23,15 @@ // $Id$
#include "Gnome.hh" -#include "App.hh" +#include "FbTk/App.hh" +#include "FbTk/I18n.hh" #include "Window.hh" #include "Screen.hh" #include "WinClient.hh" #include "Workspace.hh" #include "Layer.hh" -#include "FbTk/I18n.hh" #include <iostream> -#include <new> #ifdef HAVE_CSTRING #include <cstring> #else
M
src/Gnome.hh
→
src/Gnome.hh
@@ -62,7 +62,7 @@ WIN_HINTS_SKIP_TASKBAR = (1<<2), // do not show on taskbar
WIN_HINTS_GROUP_TRANSIENT = (1<<3), // Reserved - definition is unclear WIN_HINTS_FOCUS_ON_CLICK = (1<<4) // app only accepts focus if clicked }; - + Gnome(); ~Gnome(); void initForScreen(BScreen &screen);@@ -83,7 +83,7 @@ void updateHints(FluxboxWindow &win);
void updateWorkspace(FluxboxWindow &win); bool checkClientMessage(const XClientMessageEvent &ce, BScreen * screen, WinClient * const winclient); - + // ignore these ones void updateFrameClose(FluxboxWindow &win) {} bool propertyNotify(WinClient &winclient, Atom the_property);@@ -99,7 +99,7 @@ m_gnome_wm_win_icons, m_gnome_wm_win_workspace,
m_gnome_wm_win_workspace_count, m_gnome_wm_win_workspace_names, m_gnome_wm_win_client_list; Atom m_gnome_wm_prot; - Atom m_gnome_wm_supporting_wm_check; + Atom m_gnome_wm_supporting_wm_check; std::vector<Window> m_gnomewindows; };
M
src/HeadArea.hh
→
src/HeadArea.hh
@@ -22,10 +22,9 @@
#ifndef HEADAREA_HH #define HEADAREA_HH +#include "FbTk/NotCopyable.hh" #include <memory> #include <list> - -#include "FbTk/NotCopyable.hh" class Strut;@@ -37,7 +36,7 @@ Strut *requestStrut(int head, int left, int right, int top, int bottom, Strut* next = 0);
void clearStrut(Strut *str); bool updateAvailableWorkspaceArea(); const Strut *availableWorkspaceArea() const { - return m_available_workspace_area.get(); + return m_available_workspace_area.get(); } private:
M
src/IconButton.cc
→
src/IconButton.cc
@@ -51,8 +51,8 @@
IconButton::IconButton(const FbTk::FbWindow &parent, IconbarTheme &theme, Focusable &win): FbTk::TextButton(parent, theme.focusedText().font(), win.title()), - m_win(win), - m_icon_window(*this, 1, 1, 1, 1, + m_win(win), + m_icon_window(*this, 1, 1, 1, 1, ExposureMask | ButtonPressMask | ButtonReleaseMask), m_use_pixmap(true), m_theme(theme),@@ -62,7 +62,7 @@
m_win.titleSig().attach(this); m_win.focusSig().attach(this); m_win.attentionSig().attach(this); - + FbTk::EventManager::instance()->add(*this, m_icon_window); reconfigTheme();@@ -174,8 +174,8 @@ clear();
return; } - // we got signal that either title or - // icon pixmap was updated, + // we got signal that either title or + // icon pixmap was updated, // so we refresh everything Display *display = FbTk::App::instance()->display();@@ -197,7 +197,7 @@ neww = newh;
FbTk::translateCoords(orientation(), iconx, icony, w, h); FbTk::translatePosition(orientation(), iconx, icony, neww, newh, 0); - + m_icon_window.moveResize(iconx, icony, neww, newh); m_icon_pixmap.copy(m_win.icon().pixmap().drawable(),@@ -254,7 +254,7 @@ FbTk::TextButton::drawText(m_icon_window.x() + m_icon_window.width() + 1, y, drawable);
else FbTk::TextButton::drawText(1, y, drawable); } - + bool IconButton::setOrientation(FbTk::Orientation orient) { if (orientation() == orient) return true;
M
src/IconbarTool.cc
→
src/IconbarTool.cc
@@ -50,7 +50,6 @@ #include "FbTk/MacroCommand.hh"
#include "FbTk/MenuSeparator.hh" #include <typeinfo> -#include <string> #include <iterator> #ifdef HAVE_CSTRING #include <cstring>
M
src/IconbarTool.hh
→
src/IconbarTool.hh
@@ -33,8 +33,6 @@ #include "FbTk/CachedPixmap.hh"
#include "FbTk/Observer.hh" #include "FbTk/Resource.hh" -#include <X11/Xlib.h> - #include <map> class IconbarTheme;
M
src/Keys.cc
→
src/Keys.cc
@@ -83,7 +83,6 @@ #ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #endif // HAVE_SYS_STAT_H -#include <X11/Xlib.h> #include <X11/Xproto.h> #include <X11/keysym.h> #include <X11/Xutil.h>
M
src/Keys.hh
→
src/Keys.hh
@@ -24,15 +24,15 @@
#ifndef KEYS_HH #define KEYS_HH -#include <string> -#include <list> -#include <map> -#include <X11/Xlib.h> - #include "FbTk/NotCopyable.hh" #include "FbTk/RefCount.hh" #include "FbTk/Command.hh" #include "FbTk/KeyUtil.hh" + +#include <string> +#include <list> +#include <map> + namespace FbTk { class EventHandler;
M
src/Layer.hh
→
src/Layer.hh
@@ -23,7 +23,7 @@ #ifndef LAYER_HH
#define LAYER_HH #include <string> -#include <stdio.h> +#include <cstdio> using std::string;
M
src/LayerMenu.cc
→
src/LayerMenu.cc
@@ -35,7 +35,7 @@ FbTk::XLayer &layer, LayerObject *object, bool save_rc):
ToggleMenu(tm, imgctrl, layer) { _FB_USES_NLS; - + struct { int set; int base;@@ -50,17 +50,17 @@ {0, 0, _FB_XTEXT(Layer, Normal, "Normal", "Layer normal"), Layer::NORMAL},
{0, 0, _FB_XTEXT(Layer, Bottom, "Bottom", "Layer bottom"), Layer::BOTTOM}, {0, 0, _FB_XTEXT(Layer, Desktop, "Desktop", "Layer desktop"), Layer::DESKTOP}, }; - + FbTk::RefCount<FbTk::Command> saverc_cmd(new FbCommands::SaveResources()); for (size_t i=0; i < 6; ++i) { // TODO: fetch nls string - if (save_rc) { - insert(new LayerMenuItem(layer_menuitems[i].default_str, + if (save_rc) { + insert(new LayerMenuItem(layer_menuitems[i].default_str, object, layer_menuitems[i].layernum, saverc_cmd)); } else { - insert(new LayerMenuItem(layer_menuitems[i].default_str, - object, layer_menuitems[i].layernum)); + insert(new LayerMenuItem(layer_menuitems[i].default_str, + object, layer_menuitems[i].layernum)); } } updateMenu();
M
src/Remember.cc
→
src/Remember.cc
@@ -43,7 +43,6 @@ #include "FbTk/stringstream.hh"
#include "FbTk/Transparent.hh" -#include <X11/Xlib.h> #ifdef HAVE_CSTRING #include <cstring> #else@@ -51,14 +50,11 @@ #include <string.h>
#endif //use GNU extensions -#ifndef _GNU_SOURCE -#define _GNU_SOURCE +#ifndef _GNU_SOURCE +#define _GNU_SOURCE #endif // _GNU_SOURCE #include <iostream> -#include <fstream> -#include <string> -#include <memory> #include <set>
M
src/Remember.hh
→
src/Remember.hh
@@ -36,7 +36,6 @@
#include <fstream> #include <map> #include <list> -#include <string> #include <utility> #include <memory>
M
src/RootCmdMenuItem.hh
→
src/RootCmdMenuItem.hh
@@ -25,7 +25,6 @@ #ifndef ROOTCMDMENUITEM_HH
#define ROOTCMDMENUITEM_HH #include "FbTk/MenuItem.hh" -#include <string> class RootCmdMenuItem: public FbTk::MenuItem { public:
M
src/RootTheme.cc
→
src/RootTheme.cc
@@ -1,6 +1,6 @@
// RootTheme.cc // Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot 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@@ -57,7 +57,7 @@ public:
BackgroundItem(FbTk::Theme &tm, const std::string &name, const std::string &altname): FbTk::ThemeItem<FbTk::Texture>(tm, name, altname), m_changed(false), m_loaded(false) { - + } void load(const std::string *o_name = 0, const std::string *o_altname = 0) {@@ -190,7 +190,7 @@ if (strstr(m_background->options().c_str(), "none") != 0)
return; // - // Else parse background from style + // Else parse background from style // m_background->setApplied();@@ -200,7 +200,7 @@ std::string filename = m_background->filename();
FbTk::StringUtil::removeTrailingWhitespace(filename); FbTk::StringUtil::removeFirstWhitespace(filename); // if background argument is a file then - // parse image options and call image setting + // parse image options and call image setting // command specified in the resources filename = FbTk::StringUtil::expandFilename(filename); if (FbTk::FileUtil::isRegularFile(filename.c_str())) {@@ -212,7 +212,7 @@ if (strstr(m_background->options().c_str(), "centered") != 0)
options = "-C "; if (strstr(m_background->options().c_str(), "aspect") != 0) options = "-A "; - + // compose wallpaper application "fbsetbg" with argumetns std::string commandargs = realProgramName("fbsetbg") + " " + options + filename;@@ -231,12 +231,12 @@ } else {
// render normal texture with fbsetroot - // Make sure the color strings are valid, + // Make sure the color strings are valid, // so we dont pass any `commands` that can be executed - bool color_valid = - FbTk::Color::validColorString(m_background->colorString().c_str(), + bool color_valid = + FbTk::Color::validColorString(m_background->colorString().c_str(), screenNum()); - bool color_to_valid = + bool color_to_valid = FbTk::Color::validColorString(m_background->colorToString().c_str(), screenNum());
M
src/RootTheme.hh
→
src/RootTheme.hh
@@ -27,10 +27,6 @@
#include "FbTk/Theme.hh" #include "FbTk/GContext.hh" -#include <X11/Xlib.h> - -#include <string> - class BackgroundItem; class BScreen;
M
src/Screen.cc
→
src/Screen.cc
@@ -39,7 +39,6 @@ #include "ScreenPlacement.hh"
// themes #include "FbWinFrameTheme.hh" -#include "FbTk/MenuTheme.hh" #include "RootTheme.hh" #include "WinButtonTheme.hh" #include "SlitTheme.hh"@@ -80,8 +79,8 @@ #include "FbTk/FbString.hh"
#include "FbTk/STLUtil.hh" //use GNU extensions -#ifndef _GNU_SOURCE -#define _GNU_SOURCE +#ifndef _GNU_SOURCE +#define _GNU_SOURCE #endif // _GNU_SOURCE #ifdef HAVE_CONFIG_H
M
src/Screen.hh
→
src/Screen.hh
@@ -38,7 +38,6 @@ #include "FbTk/MultLayers.hh"
#include "FbTk/NotCopyable.hh" #include "FbTk/Observer.hh" -#include <X11/Xlib.h> #include <X11/Xresource.h> #ifdef HAVE_CSTDIO@@ -46,7 +45,6 @@ #include <cstdio>
#else #include <stdio.h> #endif -#include <string> #include <list> #include <vector> #include <fstream>
M
src/ScreenPlacement.cc
→
src/ScreenPlacement.cc
@@ -23,7 +23,6 @@ // $Id$
#include "ScreenPlacement.hh" - #include "RowSmartPlacement.hh" #include "MinOverlapPlacement.hh" #include "UnderMousePlacement.hh"
M
src/ScreenResources.cc
→
src/ScreenResources.cc
@@ -26,7 +26,6 @@
// holds screen resource handling #include "Screen.hh" -#include <string> #ifdef HAVE_CSTRING #include <cstring> #else
M
src/Slit.cc
→
src/Slit.cc
@@ -36,19 +36,19 @@ #include "config.h"
#endif // HAVE_CONFIG_H #include "Screen.hh" -#include "ImageControl.hh" -#include "RefCount.hh" -#include "EventManager.hh" -#include "SimpleCommand.hh" +#include "FbTk/ImageControl.hh" +#include "FbTk/RefCount.hh" +#include "FbTk/EventManager.hh" +#include "FbTk/SimpleCommand.hh" +#include "FbTk/Theme.hh" +#include "FbTk/Transparent.hh" #include "MacroCommand.hh" #include "FbCommands.hh" #include "Layer.hh" #include "LayerMenu.hh" #include "XLayer.hh" #include "RootTheme.hh" -#include "FbTk/Theme.hh" #include "FbMenu.hh" -#include "Transparent.hh" #ifdef XINERAMA #include "Xinerama.hh"@@ -70,7 +70,6 @@ #include <sys/stat.h>
#endif // HAVE_SYS_STAT_H #include <X11/Xatom.h> -#include <X11/Xlib.h> #include <iostream> #include <algorithm>
M
src/Slit.hh
→
src/Slit.hh
@@ -37,11 +37,9 @@ #include "FbTk/Timer.hh"
#include "FbTk/Resource.hh" #include "FbTk/XLayerItem.hh" -#include <X11/Xlib.h> #include <X11/Xutil.h> #include <list> -#include <string> #include <memory> class SlitTheme;
M
src/SlitClient.cc
→
src/SlitClient.cc
@@ -24,7 +24,7 @@
#include "SlitClient.hh" #include "Screen.hh" -#include "App.hh" +#include "FbTk/App.hh" #include "Xutil.hh" #include <X11/Xutil.h>
M
src/SlitClient.hh
→
src/SlitClient.hh
@@ -27,7 +27,6 @@
#include "NotCopyable.hh" #include <X11/Xlib.h> - #include <string> class BScreen;
M
src/SystemTray.hh
→
src/SystemTray.hh
@@ -31,8 +31,6 @@ #include "FbTk/Observer.hh"
#include "ToolbarItem.hh" -#include <X11/Xlib.h> - #include <list> class BScreen;
M
src/ToolTheme.hh
→
src/ToolTheme.hh
@@ -30,8 +30,6 @@ #include "FbTk/TextTheme.hh"
#include "FbTk/BorderTheme.hh" #include "FbTk/Texture.hh" -#include <string> - /// Handles toolbar item theme for text and texture class ToolTheme: public FbTk::Theme, public FbTk::TextTheme { public:
M
src/WinButton.cc
→
src/WinButton.cc
@@ -21,14 +21,13 @@ // DEALINGS IN THE SOFTWARE.
/// $Id$ -#include <X11/Xlib.h> #include "WinButton.hh" -#include "App.hh" #include "Window.hh" #include "Screen.hh" #include "WinClient.hh" #include "WinButtonTheme.hh" +#include "FbTk/App.hh" #include "FbTk/Color.hh" #ifdef SHAPE@@ -36,7 +35,7 @@ #include <X11/extensions/shape.h>
#endif // SHAPE -WinButton::WinButton(const FluxboxWindow &listen_to, +WinButton::WinButton(const FluxboxWindow &listen_to, WinButtonTheme &theme, Type buttontype, const FbTk::FbWindow &parent, int x, int y,@@ -63,7 +62,7 @@
// when someone else tries to set the background, we may override it void WinButton::setBackgroundPixmap(Pixmap pm) { Pixmap my_pm = getBackgroundPixmap(); - + if (my_pm != 0) { overrode_bg = true; pm = my_pm;@@ -145,7 +144,7 @@ return m_theme.closePixmap().pixmap().drawable();
else return m_theme.closeUnfocusPixmap().pixmap().drawable(); break; - case SHADE: + case SHADE: if (m_listen_to.isShaded()) { if (focused) return m_theme.unshadePixmap().pixmap().drawable();@@ -245,7 +244,7 @@ width()/10*2 + oddW, height()/10*2 + oddH);
} break; case CLOSE: - drawLine(gc(), + drawLine(gc(), 2, 2, width() - 3, height() - 3); // I can't figure out why this second one needs a y offset of 1?????@@ -259,23 +258,23 @@ // Mine:
// XFree86 Version 4.3.0.1 (Debian 4.3.0.dfsg.1-1 20040428170728) // (X Protocol Version 11, Revision 0, Release 6.6) - drawLine(gc(), + drawLine(gc(), 2, height() - 3, width() - 3, 2); break; case SHADE: - + { int size = width() - 5 - oddW; drawRectangle(gc(), 2, 2, size, 2); - + // draw a one-quarter triangle below the rectangle drawTriangle(gc(), (m_listen_to.isShaded() ? FbTk::FbDrawable::DOWN: FbTk::FbDrawable::UP), - 4, 6, - size-2, size/2 - 1, + 4, 6, + size-2, size/2 - 1, 100); break;@@ -284,16 +283,16 @@ case MENUICON:
if (m_icon_pixmap.drawable()) { if (m_icon_mask.drawable()) { - XSetClipMask(m_listen_to.fbWindow().display(), + XSetClipMask(m_listen_to.fbWindow().display(), gc(), m_icon_mask.drawable()); - XSetClipOrigin(m_listen_to.fbWindow().display(), + XSetClipOrigin(m_listen_to.fbWindow().display(), gc(), 2, 2); } - + copyArea(m_icon_pixmap.drawable(), gc(), - 0, 0, - 2, 2, + 0, 0, + 2, 2, m_icon_pixmap.width(), m_icon_pixmap.height()); if (m_icon_mask.drawable())@@ -318,22 +317,22 @@ void WinButton::update(FbTk::Subject *subj) {
// update the menu icon if (m_type == MENUICON && !m_listen_to.empty()) { - + Display* display = m_listen_to.fbWindow().display(); int screen = m_listen_to.screen().screenNumber(); if (m_listen_to.icon().pixmap().drawable() != None) { - m_icon_pixmap.copy(m_listen_to.icon().pixmap().drawable(), + m_icon_pixmap.copy(m_listen_to.icon().pixmap().drawable(), DefaultDepth(display, screen), screen); m_icon_pixmap.scale(width() - 4, height() - 4); } else m_icon_pixmap.release(); - + if (m_listen_to.icon().mask().drawable() != None) { m_icon_mask.copy(m_listen_to.icon().mask().drawable(), 0, 0); m_icon_mask.scale(width() - 4, height() - 4); } else m_icon_mask.release(); - + } // pressed_pixmap isn't stateful in any current buttons, so no need@@ -348,7 +347,6 @@ Pixmap p_pm = getPressedPixmap();
if (p_pm != None) setPressedPixmap(p_pm); } - clear(); }
M
src/WinClient.hh
→
src/WinClient.hh
@@ -24,10 +24,8 @@
#ifndef WINCLIENT_HH #define WINCLIENT_HH -#include "Focusable.hh" #include "Window.hh" -#include "Subject.hh" -#include "FbWindow.hh" +#include "FbTk/FbWindow.hh" #include "FbTk/FbString.hh" #include <X11/Xutil.h>
M
src/Window.cc
→
src/Window.cc
@@ -40,12 +40,12 @@ #include "WinButtonTheme.hh"
#include "WindowCmd.hh" #include "Remember.hh" #include "MenuCreator.hh" -#include "StringUtil.hh" #include "FocusControl.hh" #include "Layer.hh" #include "IconButton.hh" #include "ScreenPlacement.hh" +#include "FbTk/StringUtil.hh" #include "FbTk/Compose.hh" #include "FbTk/EventManager.hh" #include "FbTk/KeyUtil.hh"@@ -3706,11 +3706,11 @@ return (m_client ? m_client->title() : m_title);
} const std::string &FluxboxWindow::getWMClassName() const { - return (m_client ? m_client->getWMClassName() : m_instance_name); + return (m_client ? m_client->getWMClassName() : getWMClassName()); } const std::string &FluxboxWindow::getWMClassClass() const { - return (m_client ? m_client->getWMClassClass() : m_class_name); + return (m_client ? m_client->getWMClassClass() : getWMClassClass()); } std::string FluxboxWindow::getWMRole() const {
M
src/Window.hh
→
src/Window.hh
@@ -37,8 +37,6 @@ #include "FbWinFrame.hh"
#include "Focusable.hh" #include "WinButton.hh" -#include <X11/Xlib.h> - #include <sys/time.h> #include <vector> #include <string>
M
src/WorkspaceCmd.hh
→
src/WorkspaceCmd.hh
@@ -24,14 +24,11 @@ // $Id$
#ifndef WORKSPACECMD_HH #define WORKSPACECMD_HH -#include "Command.hh" +#include "FbTk/Command.hh" +#include "FbTk/RefCount.hh" #include "ClientPattern.hh" #include "FocusControl.hh" - -#include "FbTk/RefCount.hh" - -#include <string> class WindowListCmd: public FbTk::Command { public:
M
src/Xinerama.hh
→
src/Xinerama.hh
@@ -25,12 +25,12 @@
#ifndef XINERAMA_HH #define XINERAMA_HH -#include "MenuItem.hh" #include "FbMenu.hh" -#include "RefCount.hh" -#include "SimpleCommand.hh" - #include "fluxbox.hh" + +#include "FbTk/RefCount.hh" +#include "FbTk/SimpleCommand.hh" +#include "FbTk/MenuItem.hh" // provides a generic way for giving an object a xinerama head menu // The object must have two functions:
M
src/Xutil.cc
→
src/Xutil.cc
@@ -26,17 +26,10 @@ #include "Xutil.hh"
#include "FbTk/I18n.hh" #include "FbTk/App.hh" -#include "FbTk/FbString.hh" #include <X11/Xutil.h> #include <X11/Xatom.h> -#include <X11/Xlib.h> #include <iostream> -#ifdef HAVE_CSTRING - #include <cstring> -#else - #include <string.h> -#endif using std::string;
M
src/Xutil.hh
→
src/Xutil.hh
@@ -28,8 +28,6 @@
#include <X11/Xlib.h> #include "FbTk/FbString.hh" -#include <string> - namespace Xutil { FbTk::FbString getWMName(Window window);
M
src/fluxbox.hh
→
src/fluxbox.hh
@@ -24,8 +24,8 @@ // DEALINGS IN THE SOFTWARE.
// $Id$ -#ifndef FLUXBOX_HH -#define FLUXBOX_HH +#ifndef FLUXBOX_HH +#define FLUXBOX_HH #include "FbTk/App.hh" #include "FbTk/Resource.hh"@@ -34,7 +34,6 @@ #include "FbTk/Observer.hh"
#include "FbTk/SignalHandler.hh" #include "AttentionNoticeHandler.hh" -#include <X11/Xlib.h> #include <X11/Xresource.h> #ifdef HAVE_CSTDIO@@ -51,7 +50,7 @@ #ifdef TIME_WITH_SYS_TIME
#include <sys/time.h> #include <time.h> #else // !TIME_WITH_SYS_TIME -#ifdef HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H #include <sys/time.h> #else // !HAVE_SYS_TIME_H #include <time.h>@@ -73,9 +72,9 @@ class FbAtoms;
class Toolbar; -/// main class for the window manager. +/// main class for the window manager. /** - singleton type + singleton type */ class Fluxbox : public FbTk::App, public FbTk::SignalEventHandler,