all repos — fluxbox @ e0969658986378d0d79b990a9862e5c0e3aff911

custom fork of the fluxbox windowmanager

updated copyright date and added id-tags
fluxgen fluxgen
commit

e0969658986378d0d79b990a9862e5c0e3aff911

parent

a7e1cc466ae291852dd1f0c296417250483b137c

M src/BaseDisplay.ccsrc/BaseDisplay.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -19,9 +22,7 @@ // 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. -// -// Changes for Fluxbox made by Henrik Kinnunen (fluxgen@linuxmail.org) -// +// $Id: BaseDisplay.cc,v 1.4 2002/01/09 14:11:20 fluxgen Exp $ // stupid macros needed to access some functions in version 2 of the GNU C // library
M src/BaseDisplay.hhsrc/BaseDisplay.hh

@@ -1,5 +1,5 @@

-// BaseDisplay.hh for Fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org +// BaseDisplay.hh for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // BaseDisplay.hh for Blackbox - an X11 Window manager // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)

@@ -21,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: BaseDisplay.hh,v 1.5 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _BASEDISPLAY_HH_ #define _BASEDISPLAY_HH_
M src/Basemenu.ccsrc/Basemenu.cc

@@ -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) // // Permission is hereby granted, free of charge, to any person obtaining a

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: 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 // library
M src/Basemenu.hhsrc/Basemenu.hh

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: Basemenu.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _BASEMENU_HH_ #define _BASEMENU_HH_
M src/Configmenu.ccsrc/Configmenu.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: 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 // library
M src/Configmenu.hhsrc/Configmenu.hh

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -19,6 +22,8 @@ // 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: Configmenu.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $ + #ifndef _CONFIGMENU_HH_ #define _CONFIGMENU_HH_

@@ -28,7 +33,6 @@

#include "Basemenu.hh" #include "Screen.hh" #include "fluxbox.hh" - class Configmenu : public Basemenu { private:
M src/DrawUtil.ccsrc/DrawUtil.cc

@@ -1,5 +1,5 @@

// 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 // copy of this software and associated documentation files (the "Software"),

@@ -18,7 +18,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: 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 # include "config.h"
M src/DrawUtil.hhsrc/DrawUtil.hh

@@ -1,5 +1,5 @@

// 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 // copy of this software and associated documentation files (the "Software"),

@@ -18,6 +18,9 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: DrawUtil.hh,v 1.2 2002/01/09 14:11:20 fluxgen Exp $ + #ifndef _DRAWUTIL_HH_ #define _DRAWUTIL_HH_
M src/IconBar.ccsrc/IconBar.cc

@@ -1,5 +1,5 @@

-// IconBar.cc -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// IconBar.cc for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"),

@@ -18,6 +18,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: IconBar.cc,v 1.7 2002/01/09 14:11:20 fluxgen Exp $ #include "IconBar.hh" #include "i18n.hh"
M src/IconBar.hhsrc/IconBar.hh

@@ -1,5 +1,5 @@

-// IconBar.hh -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// IconBar.hh for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"),

@@ -18,6 +18,9 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: IconBar.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $ + #ifndef _ICONBAR_HH_ #define _ICONBAR_HH_
M src/Image.ccsrc/Image.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -21,6 +24,9 @@ // DEALINGS IN THE SOFTWARE.

// stupid macros needed to access some functions in version 2 of the GNU C // library + +// $Id: Image.cc,v 1.3 2002/01/09 14:11:20 fluxgen Exp $ + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif // _GNU_SOURCE
M src/Image.hhsrc/Image.hh

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: Image.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _IMAGE_HH_ #define _IMAGE_HH_
M src/Keys.ccsrc/Keys.cc

@@ -1,5 +1,5 @@

// 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 // copy of this software and associated documentation files (the "Software"),

@@ -19,7 +19,7 @@ // 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: 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 # include "config.h"
M src/Keys.hhsrc/Keys.hh

@@ -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) // // Permission is hereby granted, free of charge, to any person obtaining a

@@ -19,7 +19,7 @@ // 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: 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_ #define _KEYS_HH_
M src/Makefile.amsrc/Makefile.am

@@ -41,16 +41,16 @@

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 + 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
M src/Makefile.insrc/Makefile.in

@@ -119,7 +119,7 @@

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

@@ -139,8 +139,8 @@ X_PRE_LIBS = @X_PRE_LIBS@

fluxbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.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 \ -fluxbox.o bsd-snprintf.o i18n.o main.o Tab.o Keys.o IconBar.o Theme.o \ -StringUtil.o DrawUtil.o +fluxbox.o i18n.o main.o Tab.o Keys.o IconBar.o Theme.o StringUtil.o \ +DrawUtil.o fluxbox_LDADD = $(LDADD) fluxbox_DEPENDENCIES = fluxbox_LDFLAGS =

@@ -167,7 +167,7 @@ .deps/Image.P .deps/Keys.P .deps/LinkedList.P .deps/Netizen.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/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) OBJECTS = $(fluxbox_OBJECTS)
M src/Screen.ccsrc/Screen.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -19,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $id$ // stupid macros needed to access some functions in version 2 of the GNU C // library

@@ -189,7 +193,7 @@

image_control->setDither(resource.image_dither); theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), getColormap(), getScreenNumber(), image_control, fluxbox->getStyleFilename(), fluxbox->getRootCommand()); - + #ifdef GNOME /* create the GNOME window */ Window gnome_win = XCreateSimpleWindow(getBaseDisplay()->getXDisplay(),

@@ -425,7 +429,6 @@ delete rootmenuList;

delete iconList; delete netizenList; delete theme; - theme = 0; }

@@ -433,7 +436,8 @@ void BScreen::reconfigure(void) {

if (Fluxbox::instance()->getRootCommand()) theme->setRootCommand(Fluxbox::instance()->getRootCommand()); else - theme->setRootCommand(""); + theme->setRootCommand(""); + theme->load(fluxbox->getStyleFilename()); theme->reconfigure(); I18n *i18n = I18n::instance();
M src/Screen.hhsrc/Screen.hh

@@ -1,5 +1,5 @@

-// Screen.hh for fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// Screen.hh for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // Screen.hh for Blackbox - an X11 Window manager // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)

@@ -22,7 +22,7 @@ // 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: Screen.hh,v 1.7 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _SCREEN_HH_ #define _SCREEN_HH_
M src/StringUtil.ccsrc/StringUtil.cc

@@ -1,5 +1,5 @@

// 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 // copy of this software and associated documentation files (the "Software"),

@@ -18,6 +18,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: StringUtil.cc,v 1.5 2002/01/09 14:11:20 fluxgen Exp $ #include "StringUtil.hh"
M src/StringUtil.hhsrc/StringUtil.hh

@@ -1,5 +1,5 @@

// 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 // copy of this software and associated documentation files (the "Software"),

@@ -19,7 +19,7 @@ // 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: 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_ #define _STRINGUTIL_HH_

@@ -48,7 +48,7 @@ stringtok (Container &container, std::string const &in,

const char * const delimiters = " \t\n") { const std::string::size_type len = in.length(); - std::string::size_type i = 0; + std::string::size_type i = 0; while ( i < len ) { // eat leading whitespace
M src/Tab.ccsrc/Tab.cc

@@ -1,5 +1,5 @@

-// Tab.cc for Fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// Tab.cc for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the "Software"),

@@ -18,6 +18,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: Tab.cc,v 1.14 2002/01/09 14:11:20 fluxgen Exp $ #include "Tab.hh"
M src/Tab.hhsrc/Tab.hh

@@ -1,4 +1,4 @@

-// Tab.hh for Fluxbox +// Tab.hh for Fluxbox Window Manager // Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) // // Permission is hereby granted, free of charge, to any person obtaining a

@@ -18,6 +18,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: Tab.hh,v 1.5 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _TAB_HH_ #define _TAB_HH_
M src/Theme.ccsrc/Theme.cc

@@ -41,7 +41,7 @@ // 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: 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 #define _GNU_SOURCE

@@ -653,7 +653,11 @@

void Theme::loadRootCommand() { XrmValue value; char *value_type; - + #ifdef DEBUG + cerr<<"rootcommand.size()="<<m_rootcommand.size()<<endl; + cerr<<"rootcommand="<<m_rootcommand<<endl; + #endif + if (m_rootcommand.size()) { #ifndef __EMX__ char tmpstring[256]; //to hold m_screennum
M src/Window.ccsrc/Window.cc

@@ -1,6 +1,6 @@

-// Window.cc for fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) - +// Window.cc for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) +// // Window.cc for Blackbox - an X11 Window manager // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -21,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: 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 // library
M src/Window.hhsrc/Window.hh

@@ -1,5 +1,5 @@

-// Window.hh for Fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) +// Window.hh for Fluxbox Window Manager +// Copyright (c) 2001-2002 Henrik Kinnunen (fluxgen@linuxmail.org) // // Window.hh for Blackbox - an X11 Window manager // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)

@@ -21,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: Window.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _WINDOW_HH_ #define _WINDOW_HH_
M src/fluxbox.hhsrc/fluxbox.hh

@@ -1,6 +1,6 @@

-// fluxbox.hh for fluxbox -// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org) - +// fluxbox.hh for Fluxbox Window Manager +// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org) +// // blackbox.hh for Blackbox - an X11 Window manager // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -22,7 +22,7 @@ // 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: fluxbox.hh,v 1.4 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _FLUXBOX_HH_ #define _FLUXBOX_HH_
M src/i18n.ccsrc/i18n.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: 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 // library
M src/i18n.hhsrc/i18n.hh

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: i18n.hh,v 1.3 2002/01/09 14:11:20 fluxgen Exp $ #ifndef _I18N_HH_ #define _I18N_HH_
M src/main.ccsrc/main.cc

@@ -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 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) //

@@ -18,6 +21,8 @@ // THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. + +// $Id: 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 // library

@@ -58,7 +63,21 @@

#include <iostream> 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) { + #ifdef DEBUG_UDS + uds::Init uds_init; + #endif //!DEBUG_UDS + char *session_display = (char *) 0; char *rc_file = (char *) 0;