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

updated copyright date and added id-tags

Browse source
This commit is contained in:
fluxgen 2002-01-09 14:11:20 +00:00
parent a7e1cc466a
commit e096965898
29 changed files with 146 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/BaseDisplay.cc
View file

@ -1,3 +1,6 @@
// BaseDisplay.cc for Fluxbox Window manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// BaseDisplay.cc for Blackbox - an X11 Window manager // BaseDisplay.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,9 +22,7 @@
// 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: BaseDisplay.cc,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
// Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org)
//
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library

6
src/BaseDisplay.hh
View file

@ -1,5 +1,5 @@
// BaseDisplay.hh for Fluxbox // BaseDisplay.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// BaseDisplay.hh for Blackbox - an X11 Window manager // BaseDisplay.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@ -22,6 +22,8 @@
// 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: BaseDisplay.hh,v 1.5 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _BASEDISPLAY_HH_ #ifndef _BASEDISPLAY_HH_
#define _BASEDISPLAY_HH_ #define _BASEDISPLAY_HH_

7
src/Basemenu.cc
View file

@ -1,4 +1,7 @@
// Basemenu.cc for fluxbox - an X11 Window manager // Basemenu.cc for Fluxbox Window manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Basemenu.cc for blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
@ -19,6 +22,8 @@
// 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: Basemenu.cc,v 1.5 2002/01/09 14:11:20 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE

5
src/Basemenu.hh
View file

@ -1,3 +1,6 @@
// Basemenu.hh for Fluxbox Window manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Basemenu.hh for Blackbox - an X11 Window manager // Basemenu.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: Basemenu.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _BASEMENU_HH_ #ifndef _BASEMENU_HH_
#define _BASEMENU_HH_ #define _BASEMENU_HH_

5
src/Configmenu.cc
View file

@ -1,3 +1,6 @@
// Configmenu.cc for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Configmenu.cc for Blackbox - An X11 Window Manager // Configmenu.cc for Blackbox - An X11 Window Manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: Configmenu.cc,v 1.8 2002/01/09 14:11:20 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE

6
src/Configmenu.hh
View file

@ -1,3 +1,6 @@
// Configmenu.hh for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Configmenu.hh for Blackbox - An X11 Window Manager // Configmenu.hh for Blackbox - An X11 Window Manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: Configmenu.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _CONFIGMENU_HH_ #ifndef _CONFIGMENU_HH_
#define _CONFIGMENU_HH_ #define _CONFIGMENU_HH_
@ -29,7 +34,6 @@ class Configmenu;
#include "Screen.hh" #include "Screen.hh"
#include "fluxbox.hh" #include "fluxbox.hh"
class Configmenu : public Basemenu { class Configmenu : public Basemenu {
private: private:
class Focusmenu : public Basemenu { class Focusmenu : public Basemenu {

5
src/DrawUtil.cc
View file

@ -1,5 +1,5 @@
// DrawUtil.cc for fluxbox // DrawUtil.cc for fluxbox
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -18,7 +18,8 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: DrawUtil.cc,v 1.3 2002/01/07 23:42:25 fluxgen Exp $
// $Id: DrawUtil.cc,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"

5
src/DrawUtil.hh
View file

@ -1,5 +1,5 @@
// DrawUtil.hh for fluxbox // DrawUtil.hh for fluxbox
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -18,6 +18,9 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: DrawUtil.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _DRAWUTIL_HH_ #ifndef _DRAWUTIL_HH_
#define _DRAWUTIL_HH_ #define _DRAWUTIL_HH_

6
src/IconBar.cc
View file

@ -1,5 +1,5 @@
// IconBar.cc // IconBar.cc for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,6 +19,8 @@
// 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: IconBar.cc,v 1.7 2002/01/09 14:11:20 fluxgen Exp $
#include "IconBar.hh" #include "IconBar.hh"
#include "i18n.hh" #include "i18n.hh"

7
src/IconBar.hh
View file

@ -1,5 +1,5 @@
// IconBar.hh // IconBar.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -18,6 +18,9 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // 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 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: IconBar.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _ICONBAR_HH_ #ifndef _ICONBAR_HH_
#define _ICONBAR_HH_ #define _ICONBAR_HH_

6
src/Image.cc
View file

@ -1,3 +1,6 @@
// Image.cc for Flxubox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxbox@linuxmail.org)
//
// Image.cc for Blackbox - an X11 Window manager // Image.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -21,6 +24,9 @@
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
// $Id: Image.cc,v 1.3 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
#endif // _GNU_SOURCE #endif // _GNU_SOURCE

5
src/Image.hh
View file

@ -1,3 +1,6 @@
// Image.hh for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxbox@linuxmail.org)
//
// Image.hh for Blackbox - an X11 Window manager // Image.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: Image.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _IMAGE_HH_ #ifndef _IMAGE_HH_
#define _IMAGE_HH_ #define _IMAGE_HH_

4
src/Keys.cc
View file

@ -1,5 +1,5 @@
// Keys.cc for Fluxbox - an X11 Window manager // Keys.cc for Fluxbox - an X11 Window manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,7 +19,7 @@
// 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: Keys.cc,v 1.6 2002/01/08 21:45:49 fluxgen Exp $ //$Id: Keys.cc,v 1.7 2002/01/09 14:11:20 fluxgen Exp $
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"

4
src/Keys.hh
View file

@ -1,4 +1,4 @@
// Key2.hh for Fluxbox - an X11 Window manager // Keys.hh for Fluxbox - an X11 Window manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
@ -19,7 +19,7 @@
// 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: Keys.hh,v 1.3 2002/01/07 23:46:58 fluxgen Exp $ // $Id: Keys.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _KEYS_HH_ #ifndef _KEYS_HH_
#define _KEYS_HH_ #define _KEYS_HH_

20
src/Makefile.am
View file

@ -41,16 +41,16 @@ CPPFLAGS= -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \
bin_PROGRAMS= fluxbox bin_PROGRAMS= fluxbox
fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \ fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \
Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \ Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh \
Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh \ Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh \
Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\ Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh\
Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh \ Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh \
Window.cc Window.hh Windowmenu.cc Windowmenu.hh \ Window.cc Window.hh Windowmenu.cc Windowmenu.hh \
Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \ Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh \
fluxbox.cc fluxbox.hh bsd-snprintf.c bsd-snprintf.h \ fluxbox.cc fluxbox.hh \
i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\ i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\
IconBar.cc IconBar.hh Theme.hh Theme.cc \ IconBar.cc IconBar.hh Theme.hh Theme.cc \
StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh
MAINTAINERCLEANFILES= Makefile.in MAINTAINERCLEANFILES= Makefile.in

8
src/Makefile.in
View file

@ -119,7 +119,7 @@ CPPFLAGS = -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ @DEBUG@ @
bin_PROGRAMS = fluxbox bin_PROGRAMS = fluxbox
fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh Window.cc Window.hh Windowmenu.cc Windowmenu.hh Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh fluxbox.cc fluxbox.hh bsd-snprintf.c bsd-snprintf.h i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh IconBar.cc IconBar.hh Theme.hh Theme.cc StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh Window.cc Window.hh Windowmenu.cc Windowmenu.hh Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh fluxbox.cc fluxbox.hh i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh IconBar.cc IconBar.hh Theme.hh Theme.cc StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
@ -139,8 +139,8 @@ X_PRE_LIBS = @X_PRE_LIBS@
fluxbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.o \ fluxbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.o \
Icon.o Image.o LinkedList.o Netizen.o Rootmenu.o Screen.o Slit.o \ Icon.o Image.o LinkedList.o Netizen.o Rootmenu.o Screen.o Slit.o \
Timer.o Toolbar.o Window.o Windowmenu.o Workspace.o Workspacemenu.o \ Timer.o Toolbar.o Window.o Windowmenu.o Workspace.o Workspacemenu.o \
fluxbox.o bsd-snprintf.o i18n.o main.o Tab.o Keys.o IconBar.o Theme.o \ fluxbox.o i18n.o main.o Tab.o Keys.o IconBar.o Theme.o StringUtil.o \
StringUtil.o DrawUtil.o DrawUtil.o
fluxbox_LDADD = $(LDADD) fluxbox_LDADD = $(LDADD)
fluxbox_DEPENDENCIES = fluxbox_DEPENDENCIES =
fluxbox_LDFLAGS = fluxbox_LDFLAGS =
@ -167,7 +167,7 @@ DEP_FILES = .deps/BaseDisplay.P .deps/Basemenu.P .deps/Clientmenu.P \
.deps/Rootmenu.P .deps/Screen.P .deps/Slit.P .deps/StringUtil.P \ .deps/Rootmenu.P .deps/Screen.P .deps/Slit.P .deps/StringUtil.P \
.deps/Tab.P .deps/Theme.P .deps/Timer.P .deps/Toolbar.P .deps/Window.P \ .deps/Tab.P .deps/Theme.P .deps/Timer.P .deps/Toolbar.P .deps/Window.P \
.deps/Windowmenu.P .deps/Workspace.P .deps/Workspacemenu.P \ .deps/Windowmenu.P .deps/Workspace.P .deps/Workspacemenu.P \
.deps/bsd-snprintf.P .deps/fluxbox.P .deps/i18n.P .deps/main.P .deps/fluxbox.P .deps/i18n.P .deps/main.P
SOURCES = $(fluxbox_SOURCES) SOURCES = $(fluxbox_SOURCES)
OBJECTS = $(fluxbox_OBJECTS) OBJECTS = $(fluxbox_OBJECTS)

12
src/Screen.cc
View file

@ -1,4 +1,6 @@
// $id$ // Screen.cc for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Screen.cc for Blackbox - an X11 Window manager // Screen.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -20,6 +22,8 @@
// 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$
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -189,7 +193,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) {
image_control->setDither(resource.image_dither); image_control->setDither(resource.image_dither);
theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(),
image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand()); image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand());
#ifdef GNOME #ifdef GNOME
/* create the GNOME window */ /* create the GNOME window */
Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(), Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(),
@ -425,7 +429,6 @@ BScreen::~BScreen(void) {
delete iconList; delete iconList;
delete netizenList; delete netizenList;
delete theme; delete theme;
theme = 0;
} }
@ -433,7 +436,8 @@ void BScreen::reconfigure(void) {
if (Fluxbox::instance()->getRootCommand()) if (Fluxbox::instance()->getRootCommand())
theme->setRootCommand(Fluxbox::instance()->getRootCommand()); theme->setRootCommand(Fluxbox::instance()->getRootCommand());
else else
theme->setRootCommand(""); theme->setRootCommand("");
theme->load(fluxbox->getStyleFilename()); theme->load(fluxbox->getStyleFilename());
theme->reconfigure(); theme->reconfigure();
I18n *i18n = I18n::instance(); I18n *i18n = I18n::instance();

6
src/Screen.hh
View file

@ -1,5 +1,5 @@
// Screen.hh for fluxbox // Screen.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Screen.hh for Blackbox - an X11 Window manager // Screen.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@ -22,7 +22,7 @@
// 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: Screen.hh,v 1.7 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _SCREEN_HH_ #ifndef _SCREEN_HH_
#define _SCREEN_HH_ #define _SCREEN_HH_

4
src/StringUtil.cc
View file

@ -1,5 +1,5 @@
// StringUtil.cc for fluxbox // StringUtil.cc for fluxbox
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,6 +19,8 @@
// 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: StringUtil.cc,v 1.5 2002/01/09 14:11:20 fluxgen Exp $
#include "StringUtil.hh" #include "StringUtil.hh"
#include <string> #include <string>

6
src/StringUtil.hh
View file

@ -1,5 +1,5 @@
// StringUtil.hh for fluxbox // StringUtil.hh for fluxbox
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,7 +19,7 @@
// 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: StringUtil.hh,v 1.3 2002/01/08 00:10:02 fluxgen Exp $ //$Id: StringUtil.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _STRINGUTIL_HH_ #ifndef _STRINGUTIL_HH_
#define _STRINGUTIL_HH_ #define _STRINGUTIL_HH_
@ -48,7 +48,7 @@ struct StringUtil
const char * const delimiters = " \t\n") const char * const delimiters = " \t\n")
{ {
const std::string::size_type len = in.length(); const std::string::size_type len = in.length();
std::string::size_type i = 0; std::string::size_type i = 0;
while ( i < len ) { while ( i < len ) {
// eat leading whitespace // eat leading whitespace

6
src/Tab.cc
View file

@ -1,5 +1,5 @@
// Tab.cc for Fluxbox // Tab.cc for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@ -19,6 +19,8 @@
// 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: Tab.cc,v 1.14 2002/01/09 14:11:20 fluxgen Exp $
#include "Tab.hh" #include "Tab.hh"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

4
src/Tab.hh
View file

@ -1,4 +1,4 @@
// Tab.hh for Fluxbox // Tab.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
@ -19,6 +19,8 @@
// 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: Tab.hh,v 1.5 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _TAB_HH_ #ifndef _TAB_HH_
#define _TAB_HH_ #define _TAB_HH_

8
src/Theme.cc
View file

@ -41,7 +41,7 @@
// 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: Theme.cc,v 1.12 2002/01/09 00:08:19 fluxgen Exp $ // $Id: Theme.cc,v 1.13 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE #define _GNU_SOURCE
@ -653,7 +653,11 @@ void Theme::loadToolbarStyle() {
void Theme::loadRootCommand() { void Theme::loadRootCommand() {
XrmValue value; XrmValue value;
char *value_type; char *value_type;
#ifdef DEBUG
cerr<<"rootcommand.size()="<<m_rootcommand.size()<<endl;
cerr<<"rootcommand="<<m_rootcommand<<endl;
#endif
if (m_rootcommand.size()) { if (m_rootcommand.size()) {
#ifndef __EMX__ #ifndef __EMX__
char tmpstring[256]; //to hold m_screennum char tmpstring[256]; //to hold m_screennum

8
src/Window.cc
View file

@ -1,6 +1,6 @@
// Window.cc for fluxbox // Window.cc for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// Window.cc for Blackbox - an X11 Window manager // Window.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -22,6 +22,8 @@
// 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: Window.cc,v 1.15 2002/01/09 14:11:20 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE

6
src/Window.hh
View file

@ -1,5 +1,5 @@
// Window.hh for Fluxbox // Window.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org)
// //
// Window.hh for Blackbox - an X11 Window manager // Window.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@ -22,6 +22,8 @@
// 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: Window.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _WINDOW_HH_ #ifndef _WINDOW_HH_
#define _WINDOW_HH_ #define _WINDOW_HH_

8
src/fluxbox.hh
View file

@ -1,6 +1,6 @@
// fluxbox.hh for fluxbox // fluxbox.hh for Fluxbox Window Manager
// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// blackbox.hh for Blackbox - an X11 Window manager // blackbox.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -22,7 +22,7 @@
// 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: fluxbox.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _FLUXBOX_HH_ #ifndef _FLUXBOX_HH_
#define _FLUXBOX_HH_ #define _FLUXBOX_HH_

5
src/i18n.cc
View file

@ -1,3 +1,6 @@
// i18n.hh for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// i18n.cc for Blackbox - an X11 Window manager // i18n.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: i18n.cc,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE

5
src/i18n.hh
View file

@ -1,3 +1,6 @@
// i18n.hh for Fluxbox Window Manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// i18n.hh for Blackbox - an X11 Window manager // i18n.hh for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: i18n.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $
#ifndef _I18N_HH_ #ifndef _I18N_HH_
#define _I18N_HH_ #define _I18N_HH_

19
src/main.cc
View file

@ -1,3 +1,6 @@
// main.cc for Fluxbox Window manager
// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
//
// main.cc for Blackbox - an X11 Window manager // main.cc for Blackbox - an X11 Window manager
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
// //
@ -19,6 +22,8 @@
// 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: main.cc,v 1.2 2002/01/09 14:11:20 fluxgen Exp $
// stupid macros needed to access some functions in version 2 of the GNU C // stupid macros needed to access some functions in version 2 of the GNU C
// library // library
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -58,7 +63,21 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
#ifdef DEBUG_UDS
#include <uds/init.hh>
#include <uds/uds.hh>
// configure UDS
uds::uds_flags_t uds::flags = uds::leak_check;
#endif //!DEBUG_UDS
int main(int argc, char **argv) { int main(int argc, char **argv) {
#ifdef DEBUG_UDS
uds::Init uds_init;
#endif //!DEBUG_UDS
char *session_display = (char *) 0; char *session_display = (char *) 0;
char *rc_file = (char *) 0; char *rc_file = (char *) 0;