From e0969658986378d0d79b990a9862e5c0e3aff911 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Wed, 9 Jan 2002 14:11:20 +0000 Subject: updated copyright date and added id-tags --- src/BaseDisplay.cc | 7 ++++--- src/BaseDisplay.hh | 6 ++++-- src/Basemenu.cc | 7 ++++++- src/Basemenu.hh | 5 +++++ src/Configmenu.cc | 5 +++++ src/Configmenu.hh | 6 +++++- src/DrawUtil.cc | 5 +++-- src/DrawUtil.hh | 5 ++++- src/IconBar.cc | 6 ++++-- src/IconBar.hh | 7 +++++-- src/Image.cc | 6 ++++++ src/Image.hh | 5 +++++ src/Keys.cc | 4 ++-- src/Keys.hh | 4 ++-- src/Makefile.am | 20 ++++++++++---------- src/Makefile.in | 8 ++++---- src/Screen.cc | 12 ++++++++---- src/Screen.hh | 6 +++--- src/StringUtil.cc | 4 +++- src/StringUtil.hh | 6 +++--- src/Tab.cc | 6 ++++-- src/Tab.hh | 4 +++- src/Theme.cc | 8 ++++++-- src/Window.cc | 8 +++++--- src/Window.hh | 6 ++++-- src/fluxbox.hh | 8 ++++---- src/i18n.cc | 5 +++++ src/i18n.hh | 5 +++++ src/main.cc | 19 +++++++++++++++++++ 29 files changed, 146 insertions(+), 57 deletions(-) diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc index 060438f..1f7b8a7 100644 --- a/src/BaseDisplay.cc +++ b/src/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 @@ // 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 diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh index d2c3bb9..b068416 100644 --- a/src/BaseDisplay.hh +++ b/src/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) @@ -22,6 +22,8 @@ // 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_ diff --git a/src/Basemenu.cc b/src/Basemenu.cc index bf031dd..32b1585 100644 --- a/src/Basemenu.cc +++ b/src/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 @@ -19,6 +22,8 @@ // 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 #ifndef _GNU_SOURCE diff --git a/src/Basemenu.hh b/src/Basemenu.hh index 208f949..c1bef65 100644 --- a/src/Basemenu.hh +++ b/src/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) // @@ -19,6 +22,8 @@ // 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_ diff --git a/src/Configmenu.cc b/src/Configmenu.cc index ca547bb..1fdf2bf 100644 --- a/src/Configmenu.cc +++ b/src/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) // @@ -19,6 +22,8 @@ // 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 #ifndef _GNU_SOURCE diff --git a/src/Configmenu.hh b/src/Configmenu.hh index 4713634..28adafb 100644 --- a/src/Configmenu.hh +++ b/src/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 @@ // 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_ @@ -29,7 +34,6 @@ class Configmenu; #include "Screen.hh" #include "fluxbox.hh" - class Configmenu : public Basemenu { private: class Focusmenu : public Basemenu { diff --git a/src/DrawUtil.cc b/src/DrawUtil.cc index 4f8a02d..a276e48 100644 --- a/src/DrawUtil.cc +++ b/src/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 @@ // 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" diff --git a/src/DrawUtil.hh b/src/DrawUtil.hh index d1ef415..19d2cac 100644 --- a/src/DrawUtil.hh +++ b/src/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 @@ // 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_ diff --git a/src/IconBar.cc b/src/IconBar.cc index a20f1fd..13f39c9 100644 --- a/src/IconBar.cc +++ b/src/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"), @@ -19,6 +19,8 @@ // 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" diff --git a/src/IconBar.hh b/src/IconBar.hh index 4da0d07..7a8792b 100644 --- a/src/IconBar.hh +++ b/src/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 @@ // 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_ diff --git a/src/Image.cc b/src/Image.cc index 46ee34f..611d307 100644 --- a/src/Image.cc +++ b/src/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 @@ // 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 diff --git a/src/Image.hh b/src/Image.hh index a86a60a..672c632 100644 --- a/src/Image.hh +++ b/src/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) // @@ -19,6 +22,8 @@ // 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_ diff --git a/src/Keys.cc b/src/Keys.cc index 53c9911..5db7f69 100644 --- a/src/Keys.cc +++ b/src/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 @@ // 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" diff --git a/src/Keys.hh b/src/Keys.hh index 910c866..9d1f090 100644 --- a/src/Keys.hh +++ b/src/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 @@ // 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_ diff --git a/src/Makefile.am b/src/Makefile.am index d2344c2..5b294fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,16 +41,16 @@ CPPFLAGS= -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \ 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 diff --git a/src/Makefile.in b/src/Makefile.in index 76f6b52..87a6604 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -119,7 +119,7 @@ CPPFLAGS = -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ @DEBUG@ @ 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 @@ DEP_FILES = .deps/BaseDisplay.P .deps/Basemenu.P .deps/Clientmenu.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) diff --git a/src/Screen.cc b/src/Screen.cc index 944821d..9f67c3b 100644 --- a/src/Screen.cc +++ b/src/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) // @@ -20,6 +22,8 @@ // 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 #ifndef _GNU_SOURCE @@ -189,7 +193,7 @@ BScreen::BScreen(Fluxbox *b, int scrn) : ScreenInfo(b, scrn) { 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 @@ BScreen::~BScreen(void) { 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(); diff --git a/src/Screen.hh b/src/Screen.hh index 186e0b0..35a4a85 100644 --- a/src/Screen.hh +++ b/src/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 @@ // 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_ diff --git a/src/StringUtil.cc b/src/StringUtil.cc index 0f91b44..036a4f4 100644 --- a/src/StringUtil.cc +++ b/src/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"), @@ -19,6 +19,8 @@ // 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" #include diff --git a/src/StringUtil.hh b/src/StringUtil.hh index cf069fb..59ce57c 100644 --- a/src/StringUtil.hh +++ b/src/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 @@ // 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 @@ struct StringUtil 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 diff --git a/src/Tab.cc b/src/Tab.cc index 17d9922..975c2d9 100644 --- a/src/Tab.cc +++ b/src/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"), @@ -19,6 +19,8 @@ // 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" #ifdef HAVE_CONFIG_H diff --git a/src/Tab.hh b/src/Tab.hh index c6b393f..75010f2 100644 --- a/src/Tab.hh +++ b/src/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 @@ -19,6 +19,8 @@ // 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_ diff --git a/src/Theme.cc b/src/Theme.cc index 6fb0909..ed43120 100644 --- a/src/Theme.cc +++ b/src/Theme.cc @@ -41,7 +41,7 @@ // 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::loadToolbarStyle() { void Theme::loadRootCommand() { XrmValue value; char *value_type; - + #ifdef DEBUG + cerr<<"rootcommand.size()="<