nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed some unneeded headers

Browse source
This commit is contained in:
Mathias Gumz 2007-12-30 16:32:53 +01:00
parent 4cc810b0d3
commit 04cd2fd14c
77 changed files with 161 additions and 251 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ArrowButton.hh
View file

@ -24,7 +24,7 @@
#ifndef ARROWBUTTON_HH #ifndef ARROWBUTTON_HH
#define ARROWBUTTON_HH #define ARROWBUTTON_HH
#include "Button.hh" #include "FbTk/Button.hh"
/// Displays a arrow on a button /// Displays a arrow on a button
class ArrowButton: public FbTk::Button { class ArrowButton: public FbTk::Button {

3
src/ButtonTool.cc
View file

@ -22,10 +22,9 @@
// $Id$ // $Id$
#include "ButtonTool.hh" #include "ButtonTool.hh"
#include "ButtonTheme.hh"
#include "FbTk/Button.hh" #include "FbTk/Button.hh"
#include "FbTk/ImageControl.hh" #include "FbTk/ImageControl.hh"
#include "ButtonTheme.hh"
ButtonTool::ButtonTool(FbTk::Button *button, ButtonTool::ButtonTool(FbTk::Button *button,
ToolbarItem::Type type, ToolbarItem::Type type,

3
src/ClientPattern.hh
View file

@ -27,9 +27,8 @@
#define CLIENTPATTERN_HH #define CLIENTPATTERN_HH
#include "FbTk/RegExp.hh" #include "FbTk/RegExp.hh"
#include "NotCopyable.hh" #include "FbTk/NotCopyable.hh"
#include <string>
#include <list> #include <list>
class Focusable; class Focusable;

1
src/ClockTool.cc
View file

@ -46,7 +46,6 @@
#include <time.h> #include <time.h>
#endif #endif
#include <sys/time.h> #include <sys/time.h>
#include <string>
#include <typeinfo> #include <typeinfo>
class ClockMenuItem: public FbTk::MenuItem { class ClockMenuItem: public FbTk::MenuItem {

2
src/ClockTool.hh
View file

@ -34,8 +34,6 @@
#include "FbTk/Timer.hh" #include "FbTk/Timer.hh"
#include "FbTk/FbString.hh" #include "FbTk/FbString.hh"
#include <string>
class ToolTheme; class ToolTheme;
class BScreen; class BScreen;

3
src/CurrentWindowCmd.cc
View file

@ -35,9 +35,6 @@
#include "FbTk/stringstream.hh" #include "FbTk/stringstream.hh"
#include "FbTk/StringUtil.hh" #include "FbTk/StringUtil.hh"
#include <string>
#include <vector>
using FbTk::Command; using FbTk::Command;
namespace { namespace {

2
src/CurrentWindowCmd.hh
View file

@ -25,7 +25,7 @@
#ifndef CURRENTWINDOWCMD_HH #ifndef CURRENTWINDOWCMD_HH
#define CURRENTWINDOWCMD_HH #define CURRENTWINDOWCMD_HH
#include "Command.hh" #include "FbTk/Command.hh"
#include "Window.hh" #include "Window.hh"
#include "ClientPattern.hh" #include "ClientPattern.hh"

2
src/FbAtoms.cc
View file

@ -22,7 +22,7 @@
// $Id$ // $Id$
#include "FbAtoms.hh" #include "FbAtoms.hh"
#include "App.hh" #include "FbTk/App.hh"
#include <string> #include <string>

7
src/FbCommands.hh
View file

@ -26,16 +26,13 @@
#ifndef FBCOMMANDS_HH #ifndef FBCOMMANDS_HH
#define FBCOMMANDS_HH #define FBCOMMANDS_HH
#include "Command.hh" #include "FbTk/Command.hh"
#include "FbTk/RefCount.hh" #include "FbTk/RefCount.hh"
#include "ClientMenu.hh" #include "ClientMenu.hh"
#include "ClientPattern.hh" #include "ClientPattern.hh"
#include "FocusableList.hh" #include "FocusableList.hh"
#include <list>
#include <string>
namespace FbCommands { namespace FbCommands {
/// executes a system command /// executes a system command

4
src/FbMenu.hh
View file

@ -24,8 +24,8 @@
#ifndef FBMENU_HH #ifndef FBMENU_HH
#define FBMENU_HH #define FBMENU_HH
#include "Menu.hh" #include "FbTk/Menu.hh"
#include "XLayerItem.hh" #include "FbTk/XLayerItem.hh"
namespace FbTk { namespace FbTk {
class MenuTheme; class MenuTheme;

2
src/FbRootWindow.cc
View file

@ -22,8 +22,8 @@
// $Id$ // $Id$
#include "FbRootWindow.hh" #include "FbRootWindow.hh"
#include "App.hh"
#include "FbTk/App.hh"
#include <X11/Xutil.h> #include <X11/Xutil.h>
FbRootWindow::FbRootWindow(int screen_num): FbRootWindow::FbRootWindow(int screen_num):

2
src/FbTk/App.cc
View file

@ -26,8 +26,6 @@
#include "EventManager.hh" #include "EventManager.hh"
#include <string>
namespace FbTk { namespace FbTk {
App *App::s_app = 0; App *App::s_app = 0;

2
src/FbTk/Button.hh
View file

@ -32,8 +32,6 @@
#include "Color.hh" #include "Color.hh"
#include "Text.hh" #include "Text.hh"
#include <X11/Xlib.h>
namespace FbTk { namespace FbTk {
class Theme; class Theme;

14
src/FbTk/FbDrawable.cc
View file

@ -42,7 +42,7 @@ void FbDrawable::copyArea(Drawable src, GC gc,
unsigned int width, unsigned int height) { unsigned int width, unsigned int height) {
if (drawable() == 0 || src == 0 || gc == 0) if (drawable() == 0 || src == 0 || gc == 0)
return; return;
XCopyArea(s_display, XCopyArea(display(),
src, drawable(), gc, src, drawable(), gc,
src_x, src_y, src_x, src_y,
width, height, width, height,
@ -53,7 +53,7 @@ void FbDrawable::fillRectangle(GC gc, int x, int y,
unsigned int width, unsigned int height) { unsigned int width, unsigned int height) {
if (drawable() == 0 || gc == 0) if (drawable() == 0 || gc == 0)
return; return;
XFillRectangle(s_display, XFillRectangle(display(),
drawable(), gc, drawable(), gc,
x, y, x, y,
width, height); width, height);
@ -63,7 +63,7 @@ void FbDrawable::drawRectangle(GC gc, int x, int y,
unsigned int width, unsigned int height) { unsigned int width, unsigned int height) {
if (drawable() == 0 || gc == 0) if (drawable() == 0 || gc == 0)
return; return;
XDrawRectangle(s_display, XDrawRectangle(display(),
drawable(), gc, drawable(), gc,
x, y, x, y,
width, height); width, height);
@ -73,7 +73,7 @@ void FbDrawable::drawLine(GC gc, int start_x, int start_y,
int end_x, int end_y) { int end_x, int end_y) {
if (drawable() == 0 || gc == 0) if (drawable() == 0 || gc == 0)
return; return;
XDrawLine(s_display, XDrawLine(display(),
drawable(), drawable(),
gc, gc,
start_x, start_y, start_x, start_y,
@ -84,7 +84,7 @@ void FbDrawable::fillPolygon(GC gc, XPoint *points, int npoints,
int shape, int mode) { int shape, int mode) {
if (drawable() == 0 || gc == 0 || points == 0 || npoints == 0) if (drawable() == 0 || gc == 0 || points == 0 || npoints == 0)
return; return;
XFillPolygon(s_display, XFillPolygon(display(),
drawable(), gc, points, npoints, drawable(), gc, points, npoints,
shape, mode); shape, mode);
} }
@ -157,12 +157,12 @@ void FbDrawable::drawTriangle(GC gc, FbDrawable::TriangleType type,
void FbDrawable::drawPoint(GC gc, int x, int y) { void FbDrawable::drawPoint(GC gc, int x, int y) {
if (drawable() == 0 || gc == 0) if (drawable() == 0 || gc == 0)
return; return;
XDrawPoint(s_display, drawable(), gc, x, y); XDrawPoint(display(), drawable(), gc, x, y);
} }
#endif #endif
XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const { XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) const {
return XGetImage(s_display, drawable(), return XGetImage(display(), drawable(),
x, y, width, height, x, y, width, height,
AllPlanes, // plane mask AllPlanes, // plane mask
ZPixmap); ZPixmap);

2
src/FbTk/FbDrawable.hh
View file

@ -75,7 +75,7 @@ public:
virtual unsigned int depth() const = 0; virtual unsigned int depth() const = 0;
static Display *display() { return s_display; } static Display *display() { return s_display; }
protected: protected:
static Display *s_display; // display connection // display connection static Display *s_display; // display connection
}; };
} // end namespace FbTk } // end namespace FbTk

2
src/FbTk/FbPixmap.hh
View file

@ -27,8 +27,6 @@
#include "FbDrawable.hh" #include "FbDrawable.hh"
#include "Text.hh" #include "Text.hh"
#include <X11/Xlib.h>
namespace FbTk { namespace FbTk {
/// a wrapper for X Pixmap /// a wrapper for X Pixmap

10
src/FbTk/FbString.cc
View file

@ -20,7 +20,9 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id$ // $Id$
#include "FbString.hh"
#ifdef HAVE_CERRNO #ifdef HAVE_CERRNO
#include <cerrno> #include <cerrno>
@ -38,14 +40,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#include "FbString.hh"
#include "config.h"
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_ICONV
#include <iconv.h>
#endif // HAVE_ICONV
#include <langinfo.h> #include <langinfo.h>
#include <locale.h> #include <locale.h>

7
src/FbTk/FbWindow.hh
View file

@ -108,7 +108,7 @@ public:
virtual void move(int x, int y) { virtual void move(int x, int y) {
if (x == m_x && y == m_y) if (x == m_x && y == m_y)
return; return;
XMoveWindow(s_display, m_window, x, y); XMoveWindow(display(), m_window, x, y);
m_x = x; m_x = x;
m_y = y; m_y = y;
updateBackground(true); updateBackground(true);
@ -117,7 +117,7 @@ public:
virtual void resize(unsigned int width, unsigned int height) { virtual void resize(unsigned int width, unsigned int height) {
if (width == m_width && height == m_height) if (width == m_width && height == m_height)
return; return;
XResizeWindow(s_display, m_window, width, height); XResizeWindow(display(), m_window, width, height);
m_width = width; m_width = width;
m_height = height; m_height = height;
updateBackground(false); updateBackground(false);
@ -126,7 +126,7 @@ public:
virtual void moveResize(int x, int y, unsigned int width, unsigned int height) { 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) if (x == m_x && y == m_y && width == m_width && height == m_height)
return; return;
XMoveResizeWindow(s_display, m_window, x, y, width, height); XMoveResizeWindow(display(), m_window, x, y, width, height);
m_x = x; m_x = x;
m_y = y; m_y = y;
m_width = width; m_width = width;
@ -183,7 +183,6 @@ public:
unsigned char alpha() const; unsigned char alpha() const;
int screenNumber() const; int screenNumber() const;
long eventMask() const; long eventMask() const;
Display *display() const { return s_display; }
/// compare X window /// compare X window
bool operator == (Window win) const { return m_window == win; } bool operator == (Window win) const { return m_window == win; }

2
src/FbTk/GContext.hh
View file

@ -27,8 +27,6 @@
#include "Color.hh" #include "Color.hh"
#include "FbPixmap.hh" #include "FbPixmap.hh"
#include <X11/Xlib.h>
namespace FbTk { namespace FbTk {
class FbDrawable; class FbDrawable;

1
src/FbTk/ImageControl.hh
View file

@ -33,7 +33,6 @@
#include "Timer.hh" #include "Timer.hh"
#include "NotCopyable.hh" #include "NotCopyable.hh"
#include <X11/Xlib.h>
#include <list> #include <list>
namespace FbTk { namespace FbTk {

2
src/FbTk/IntMenuItem.hh
View file

@ -24,8 +24,6 @@
#include "MenuItem.hh" #include "MenuItem.hh"
#include <string>
namespace FbTk { namespace FbTk {
class Accessor<class T>; class Accessor<class T>;

1
src/FbTk/MacroCommand.cc
View file

@ -27,7 +27,6 @@
#include "StringUtil.hh" #include "StringUtil.hh"
#include <list> #include <list>
#include <string>
namespace FbTk { namespace FbTk {

8
src/FbTk/Menu.hh
View file

@ -24,20 +24,18 @@
// $Id$ // $Id$
#ifndef FBTK_MENU_HH #ifndef FBTK_MENU_HH
#define FBTK_MENU_HH #define FBTK_MENU_HH
#include <X11/Xlib.h>
#include <vector> #include <vector>
#include <string>
#include <memory> #include <memory>
#include "FbString.hh"
#include "FbWindow.hh" #include "FbWindow.hh"
#include "EventHandler.hh" #include "EventHandler.hh"
#include "Observer.hh" #include "Observer.hh"
#include "MenuTheme.hh" #include "MenuTheme.hh"
#include "Timer.hh" #include "Timer.hh"
#include "FbString.hh"
#include "TypeAhead.hh" #include "TypeAhead.hh"
namespace FbTk { namespace FbTk {

1
src/FbTk/ObjectRegistry.hh
View file

@ -26,7 +26,6 @@
#include "StringUtil.hh" #include "StringUtil.hh"
#include <string>
#include <map> #include <map>
using std::string; using std::string;

1
src/FbTk/RegExp.cc
View file

@ -27,7 +27,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
#include <string>
#include <iostream> #include <iostream>
using std::string; using std::string;

1
src/FbTk/Shape.hh
View file

@ -24,7 +24,6 @@
#include "FbPixmap.hh" #include "FbPixmap.hh"
#include <X11/Xlib.h>
#include <vector> #include <vector>
namespace FbTk { namespace FbTk {

6
src/FbTk/Theme.hh
View file

@ -28,13 +28,13 @@
#ifndef FBTK_THEME_HH #ifndef FBTK_THEME_HH
#define FBTK_THEME_HH #define FBTK_THEME_HH
#include "XrmDatabaseHelper.hh"
#include "Subject.hh"
#include <string> #include <string>
#include <list> #include <list>
#include <vector> #include <vector>
#include "XrmDatabaseHelper.hh"
#include "Subject.hh"
namespace FbTk { namespace FbTk {
class Theme; class Theme;

1
src/FbTk/TypeAhead.hh
View file

@ -23,7 +23,6 @@
#define FBTK_TYPEAHEAD_HH #define FBTK_TYPEAHEAD_HH
#include "ITypeAheadable.hh" #include "ITypeAheadable.hh"
#include <vector>
#include "SearchResult.hh" #include "SearchResult.hh"
namespace FbTk { namespace FbTk {

2
src/FbTk/XFontImp.hh
View file

@ -26,8 +26,6 @@
#include "FontImp.hh" #include "FontImp.hh"
#include <X11/Xlib.h>
namespace FbTk { namespace FbTk {
/// regular X font implementation for FbTk /// regular X font implementation for FbTk

2
src/FbTk/XLayer.hh
View file

@ -26,8 +26,8 @@
#ifndef FBTK_XLAYER_HH #ifndef FBTK_XLAYER_HH
#define FBTK_XLAYER_HH #define FBTK_XLAYER_HH
#include <list>
#include "Layer.hh" #include "Layer.hh"
#include <list>
namespace FbTk { namespace FbTk {

4
src/FbTk/XftFontImp.hh
View file

@ -24,9 +24,9 @@
#ifndef FBTK_XFTFONTIMP_HH #ifndef FBTK_XFTFONTIMP_HH
#define FBTK_XFTFONTIMP_HH #define FBTK_XFTFONTIMP_HH
#include <X11/Xft/Xft.h>
#include "FontImp.hh" #include "FontImp.hh"
#include <string>
#include <X11/Xft/Xft.h>
namespace FbTk { namespace FbTk {

2
src/FbTk/XmbFontImp.cc
View file

@ -56,8 +56,6 @@
#include <string.h> #include <string.h>
#endif #endif
#include <X11/Xlib.h>
using std::string; using std::string;
namespace { namespace {

2
src/FbTk/XmbFontImp.hh
View file

@ -26,8 +26,6 @@
#include "FontImp.hh" #include "FontImp.hh"
#include <X11/Xlib.h>
namespace FbTk { namespace FbTk {
/// multibyte font implementation for FbTk /// multibyte font implementation for FbTk

6
src/FbWinFrame.cc
View file

@ -68,9 +68,9 @@ FbWinFrame::FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageContr
ButtonMotionMask | ExposureMask | ButtonMotionMask | ExposureMask |
EnterWindowMask | LeaveWindowMask), EnterWindowMask | LeaveWindowMask),
m_grip_left(m_handle, 0, 0, 10, 4, m_grip_left(m_handle, 0, 0, 10, 4,
ButtonPressMask | ButtonReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | ExposureMask | ButtonMotionMask | ExposureMask |
EnterWindowMask | LeaveWindowMask), EnterWindowMask | LeaveWindowMask),
m_clientarea(m_window, 0, 0, 100, 100, m_clientarea(m_window, 0, 0, 100, 100,
ButtonPressMask | ButtonReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | ExposureMask | ButtonMotionMask | ExposureMask |

2
src/FbWinFrame.hh
View file

@ -36,8 +36,6 @@
#include "FbTk/Shape.hh" #include "FbTk/Shape.hh"
#include <vector> #include <vector>
#include <list>
#include <string>
#include <memory> #include <memory>
class FbWinFrameTheme; class FbWinFrameTheme;

5
src/Gnome.cc
View file

@ -23,16 +23,15 @@
#include "Gnome.hh" #include "Gnome.hh"
#include "App.hh" #include "FbTk/App.hh"
#include "FbTk/I18n.hh"
#include "Window.hh" #include "Window.hh"
#include "Screen.hh" #include "Screen.hh"
#include "WinClient.hh" #include "WinClient.hh"
#include "Workspace.hh" #include "Workspace.hh"
#include "Layer.hh" #include "Layer.hh"
#include "FbTk/I18n.hh"
#include <iostream> #include <iostream>
#include <new>
#ifdef HAVE_CSTRING #ifdef HAVE_CSTRING
#include <cstring> #include <cstring>
#else #else

5
src/HeadArea.hh
View file

@ -22,11 +22,10 @@
#ifndef HEADAREA_HH #ifndef HEADAREA_HH
#define HEADAREA_HH #define HEADAREA_HH
#include "FbTk/NotCopyable.hh"
#include <memory> #include <memory>
#include <list> #include <list>
#include "FbTk/NotCopyable.hh"
class Strut; class Strut;
class HeadArea: private FbTk::NotCopyable { class HeadArea: private FbTk::NotCopyable {
@ -37,7 +36,7 @@ public:
void clearStrut(Strut *str); void clearStrut(Strut *str);
bool updateAvailableWorkspaceArea(); bool updateAvailableWorkspaceArea();
const Strut *availableWorkspaceArea() const { const Strut *availableWorkspaceArea() const {
return m_available_workspace_area.get(); return m_available_workspace_area.get();
} }
private: private:

1
src/IconbarTool.cc
View file

@ -50,7 +50,6 @@
#include "FbTk/MenuSeparator.hh" #include "FbTk/MenuSeparator.hh"
#include <typeinfo> #include <typeinfo>
#include <string>
#include <iterator> #include <iterator>
#ifdef HAVE_CSTRING #ifdef HAVE_CSTRING
#include <cstring> #include <cstring>

2
src/IconbarTool.hh
View file

@ -33,8 +33,6 @@
#include "FbTk/Observer.hh" #include "FbTk/Observer.hh"
#include "FbTk/Resource.hh" #include "FbTk/Resource.hh"
#include <X11/Xlib.h>
#include <map> #include <map>
class IconbarTheme; class IconbarTheme;

1
src/Keys.cc
View file

@ -83,7 +83,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#endif // HAVE_SYS_STAT_H #endif // HAVE_SYS_STAT_H
#include <X11/Xlib.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>

10
src/Keys.hh
View file

@ -24,16 +24,16 @@
#ifndef KEYS_HH #ifndef KEYS_HH
#define KEYS_HH #define KEYS_HH
#include <string>
#include <list>
#include <map>
#include <X11/Xlib.h>
#include "FbTk/NotCopyable.hh" #include "FbTk/NotCopyable.hh"
#include "FbTk/RefCount.hh" #include "FbTk/RefCount.hh"
#include "FbTk/Command.hh" #include "FbTk/Command.hh"
#include "FbTk/KeyUtil.hh" #include "FbTk/KeyUtil.hh"
#include <string>
#include <list>
#include <map>
namespace FbTk { namespace FbTk {
class EventHandler; class EventHandler;
} }

2
src/Layer.hh
View file

@ -23,7 +23,7 @@
#define LAYER_HH #define LAYER_HH
#include <string> #include <string>
#include <stdio.h> #include <cstdio>
using std::string; using std::string;

8
src/Remember.cc
View file

@ -43,7 +43,6 @@
#include "FbTk/Transparent.hh" #include "FbTk/Transparent.hh"
#include <X11/Xlib.h>
#ifdef HAVE_CSTRING #ifdef HAVE_CSTRING
#include <cstring> #include <cstring>
#else #else
@ -51,14 +50,11 @@
#endif #endif
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
#include <iostream> #include <iostream>
#include <fstream>
#include <string>
#include <memory>
#include <set> #include <set>

1
src/Remember.hh
View file

@ -36,7 +36,6 @@
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <list> #include <list>
#include <string>
#include <utility> #include <utility>
#include <memory> #include <memory>

1
src/RootCmdMenuItem.hh
View file

@ -25,7 +25,6 @@
#define ROOTCMDMENUITEM_HH #define ROOTCMDMENUITEM_HH
#include "FbTk/MenuItem.hh" #include "FbTk/MenuItem.hh"
#include <string>
class RootCmdMenuItem: public FbTk::MenuItem { class RootCmdMenuItem: public FbTk::MenuItem {
public: public:

4
src/RootTheme.hh
View file

@ -27,10 +27,6 @@
#include "FbTk/Theme.hh" #include "FbTk/Theme.hh"
#include "FbTk/GContext.hh" #include "FbTk/GContext.hh"
#include <X11/Xlib.h>
#include <string>
class BackgroundItem; class BackgroundItem;
class BScreen; class BScreen;

5
src/Screen.cc
View file

@ -39,7 +39,6 @@
// themes // themes
#include "FbWinFrameTheme.hh" #include "FbWinFrameTheme.hh"
#include "FbTk/MenuTheme.hh"
#include "RootTheme.hh" #include "RootTheme.hh"
#include "WinButtonTheme.hh" #include "WinButtonTheme.hh"
#include "SlitTheme.hh" #include "SlitTheme.hh"
@ -80,8 +79,8 @@
#include "FbTk/STLUtil.hh" #include "FbTk/STLUtil.hh"
//use GNU extensions //use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

2
src/Screen.hh
View file

@ -38,7 +38,6 @@
#include "FbTk/NotCopyable.hh" #include "FbTk/NotCopyable.hh"
#include "FbTk/Observer.hh" #include "FbTk/Observer.hh"
#include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#ifdef HAVE_CSTDIO #ifdef HAVE_CSTDIO
@ -46,7 +45,6 @@
#else #else
#include <stdio.h> #include <stdio.h>
#endif #endif
#include <string>
#include <list> #include <list>
#include <vector> #include <vector>
#include <fstream> #include <fstream>

1
src/ScreenPlacement.cc
View file

@ -23,7 +23,6 @@
#include "ScreenPlacement.hh" #include "ScreenPlacement.hh"
#include "RowSmartPlacement.hh" #include "RowSmartPlacement.hh"
#include "MinOverlapPlacement.hh" #include "MinOverlapPlacement.hh"
#include "UnderMousePlacement.hh" #include "UnderMousePlacement.hh"

1
src/ScreenResources.cc
View file

@ -26,7 +26,6 @@
// holds screen resource handling // holds screen resource handling
#include "Screen.hh" #include "Screen.hh"
#include <string>
#ifdef HAVE_CSTRING #ifdef HAVE_CSTRING
#include <cstring> #include <cstring>
#else #else

13
src/Slit.cc
View file

@ -36,19 +36,19 @@
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include "Screen.hh" #include "Screen.hh"
#include "ImageControl.hh" #include "FbTk/ImageControl.hh"
#include "RefCount.hh" #include "FbTk/RefCount.hh"
#include "EventManager.hh" #include "FbTk/EventManager.hh"
#include "SimpleCommand.hh" #include "FbTk/SimpleCommand.hh"
#include "FbTk/Theme.hh"
#include "FbTk/Transparent.hh"
#include "MacroCommand.hh" #include "MacroCommand.hh"
#include "FbCommands.hh" #include "FbCommands.hh"
#include "Layer.hh" #include "Layer.hh"
#include "LayerMenu.hh" #include "LayerMenu.hh"
#include "XLayer.hh" #include "XLayer.hh"
#include "RootTheme.hh" #include "RootTheme.hh"
#include "FbTk/Theme.hh"
#include "FbMenu.hh" #include "FbMenu.hh"
#include "Transparent.hh"
#ifdef XINERAMA #ifdef XINERAMA
#include "Xinerama.hh" #include "Xinerama.hh"
@ -70,7 +70,6 @@
#endif // HAVE_SYS_STAT_H #endif // HAVE_SYS_STAT_H
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>

2
src/Slit.hh
View file

@ -37,11 +37,9 @@
#include "FbTk/Resource.hh" #include "FbTk/Resource.hh"
#include "FbTk/XLayerItem.hh" #include "FbTk/XLayerItem.hh"
#include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <list> #include <list>
#include <string>
#include <memory> #include <memory>
class SlitTheme; class SlitTheme;

2
src/SlitClient.cc
View file

@ -24,7 +24,7 @@
#include "SlitClient.hh" #include "SlitClient.hh"
#include "Screen.hh" #include "Screen.hh"
#include "App.hh" #include "FbTk/App.hh"
#include "Xutil.hh" #include "Xutil.hh"
#include <X11/Xutil.h> #include <X11/Xutil.h>

1
src/SlitClient.hh
View file

@ -27,7 +27,6 @@
#include "NotCopyable.hh" #include "NotCopyable.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <string> #include <string>
class BScreen; class BScreen;

2
src/SystemTray.hh
View file

@ -31,8 +31,6 @@
#include "ToolbarItem.hh" #include "ToolbarItem.hh"
#include <X11/Xlib.h>
#include <list> #include <list>
class BScreen; class BScreen;

2
src/ToolTheme.hh
View file

@ -30,8 +30,6 @@
#include "FbTk/BorderTheme.hh" #include "FbTk/BorderTheme.hh"
#include "FbTk/Texture.hh" #include "FbTk/Texture.hh"
#include <string>
/// Handles toolbar item theme for text and texture /// Handles toolbar item theme for text and texture
class ToolTheme: public FbTk::Theme, public FbTk::TextTheme { class ToolTheme: public FbTk::Theme, public FbTk::TextTheme {
public: public:

4
src/WinButton.cc
View file

@ -21,14 +21,13 @@
/// $Id$ /// $Id$
#include <X11/Xlib.h>
#include "WinButton.hh" #include "WinButton.hh"
#include "App.hh"
#include "Window.hh" #include "Window.hh"
#include "Screen.hh" #include "Screen.hh"
#include "WinClient.hh" #include "WinClient.hh"
#include "WinButtonTheme.hh" #include "WinButtonTheme.hh"
#include "FbTk/App.hh"
#include "FbTk/Color.hh" #include "FbTk/Color.hh"
#ifdef SHAPE #ifdef SHAPE
@ -349,6 +348,5 @@ void WinButton::update(FbTk::Subject *subj) {
setPressedPixmap(p_pm); setPressedPixmap(p_pm);
} }
clear(); clear();
} }

4
src/WinClient.hh
View file

@ -24,10 +24,8 @@
#ifndef WINCLIENT_HH #ifndef WINCLIENT_HH
#define WINCLIENT_HH #define WINCLIENT_HH
#include "Focusable.hh"
#include "Window.hh" #include "Window.hh"
#include "Subject.hh" #include "FbTk/FbWindow.hh"
#include "FbWindow.hh"
#include "FbTk/FbString.hh" #include "FbTk/FbString.hh"
#include <X11/Xutil.h> #include <X11/Xutil.h>

6
src/Window.cc
View file

@ -40,12 +40,12 @@
#include "WindowCmd.hh" #include "WindowCmd.hh"
#include "Remember.hh" #include "Remember.hh"
#include "MenuCreator.hh" #include "MenuCreator.hh"
#include "StringUtil.hh"
#include "FocusControl.hh" #include "FocusControl.hh"
#include "Layer.hh" #include "Layer.hh"
#include "IconButton.hh" #include "IconButton.hh"
#include "ScreenPlacement.hh" #include "ScreenPlacement.hh"
#include "FbTk/StringUtil.hh"
#include "FbTk/Compose.hh" #include "FbTk/Compose.hh"
#include "FbTk/EventManager.hh" #include "FbTk/EventManager.hh"
#include "FbTk/KeyUtil.hh" #include "FbTk/KeyUtil.hh"
@ -3706,11 +3706,11 @@ const string &FluxboxWindow::title() const {
} }
const std::string &FluxboxWindow::getWMClassName() const { 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 { 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 { std::string FluxboxWindow::getWMRole() const {

2
src/Window.hh
View file

@ -37,8 +37,6 @@
#include "Focusable.hh" #include "Focusable.hh"
#include "WinButton.hh" #include "WinButton.hh"
#include <X11/Xlib.h>
#include <sys/time.h> #include <sys/time.h>
#include <vector> #include <vector>
#include <string> #include <string>

7
src/WorkspaceCmd.hh
View file

@ -24,15 +24,12 @@
#ifndef WORKSPACECMD_HH #ifndef WORKSPACECMD_HH
#define WORKSPACECMD_HH #define WORKSPACECMD_HH
#include "Command.hh" #include "FbTk/Command.hh"
#include "FbTk/RefCount.hh"
#include "ClientPattern.hh" #include "ClientPattern.hh"
#include "FocusControl.hh" #include "FocusControl.hh"
#include "FbTk/RefCount.hh"
#include <string>
class WindowListCmd: public FbTk::Command { class WindowListCmd: public FbTk::Command {
public: public:
WindowListCmd(FbTk::RefCount<FbTk::Command> cmd, int opts, WindowListCmd(FbTk::RefCount<FbTk::Command> cmd, int opts,

8
src/Xinerama.hh
View file

@ -25,13 +25,13 @@
#ifndef XINERAMA_HH #ifndef XINERAMA_HH
#define XINERAMA_HH #define XINERAMA_HH
#include "MenuItem.hh"
#include "FbMenu.hh" #include "FbMenu.hh"
#include "RefCount.hh"
#include "SimpleCommand.hh"
#include "fluxbox.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 // provides a generic way for giving an object a xinerama head menu
// The object must have two functions: // The object must have two functions:
// int getOnHead(), and // int getOnHead(), and

7
src/Xutil.cc
View file

@ -26,17 +26,10 @@
#include "FbTk/I18n.hh" #include "FbTk/I18n.hh"
#include "FbTk/App.hh" #include "FbTk/App.hh"
#include "FbTk/FbString.hh"
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <iostream> #include <iostream>
#ifdef HAVE_CSTRING
#include <cstring>
#else
#include <string.h>
#endif
using std::string; using std::string;

2
src/Xutil.hh
View file

@ -28,8 +28,6 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "FbTk/FbString.hh" #include "FbTk/FbString.hh"
#include <string>
namespace Xutil { namespace Xutil {
FbTk::FbString getWMName(Window window); FbTk::FbString getWMName(Window window);

11
src/fluxbox.hh
View file

@ -24,8 +24,8 @@
// $Id$ // $Id$
#ifndef FLUXBOX_HH #ifndef FLUXBOX_HH
#define FLUXBOX_HH #define FLUXBOX_HH
#include "FbTk/App.hh" #include "FbTk/App.hh"
#include "FbTk/Resource.hh" #include "FbTk/Resource.hh"
@ -34,7 +34,6 @@
#include "FbTk/SignalHandler.hh" #include "FbTk/SignalHandler.hh"
#include "AttentionNoticeHandler.hh" #include "AttentionNoticeHandler.hh"
#include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#ifdef HAVE_CSTDIO #ifdef HAVE_CSTDIO
@ -51,7 +50,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#else // !TIME_WITH_SYS_TIME #else // !TIME_WITH_SYS_TIME
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#else // !HAVE_SYS_TIME_H #else // !HAVE_SYS_TIME_H
#include <time.h> #include <time.h>
@ -73,9 +72,9 @@ class FbAtoms;
class Toolbar; class Toolbar;
/// main class for the window manager. /// main class for the window manager.
/** /**
singleton type singleton type
*/ */
class Fluxbox : public FbTk::App, class Fluxbox : public FbTk::App,
public FbTk::SignalEventHandler, public FbTk::SignalEventHandler,