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

compile time option for gnome and net wm hints, updateds for screen constructor

Browse source
This commit is contained in:
fluxgen 2002-10-25 21:17:15 +00:00
parent e111d9f445
commit 6c5732899d
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/fluxbox.cc
View file

@ -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.cc,v 1.79 2002/10/23 22:00:46 fluxgen Exp $ // $Id: fluxbox.cc,v 1.80 2002/10/25 21:17:15 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -40,12 +40,7 @@
#include "Resource.hh" #include "Resource.hh"
#include "XrmDatabaseHelper.hh" #include "XrmDatabaseHelper.hh"
#include "AtomHandler.hh" #include "AtomHandler.hh"
#include "Gnome.hh"
#include "Ewmh.hh"
#ifdef SLIT
#include "Slit.hh"
#endif // SLIT
//Use GNU extensions //Use GNU extensions
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
@ -56,6 +51,16 @@
#include "../config.h" #include "../config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#ifdef SLIT
#include "Slit.hh"
#endif // SLIT
#ifdef USE_GNOME
#include "Gnome.hh"
#endif // USE_GNOME
#ifdef USE_NEWWMSPEC
#include "Ewmh.hh"
#endif //USE_NEWWMSPEC
// X headers // X headers
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -88,14 +93,6 @@
#include <sys/select.h> #include <sys/select.h>
#endif // HAVE_SYS_SELECT_H #endif // HAVE_SYS_SELECT_H
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif // HAVE_SIGNAL_H
#ifdef HAVE_SYS_SIGNAL_H
# include <sys/signal.h>
#endif // HAVE_SYS_SIGNAL_H
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -324,7 +321,7 @@ key(0)
abort(); abort();
} }
//setup system signals //catch system signals
SignalHandler *sigh = SignalHandler::instance(); SignalHandler *sigh = SignalHandler::instance();
sigh->registerHandler(SIGSEGV, this); sigh->registerHandler(SIGSEGV, this);
@ -342,12 +339,17 @@ key(0)
cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle); cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle);
cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle); cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle);
// setup atom handlers
m_atomhandler.push_back(new Gnome()); // for gnome 1 atom support
m_atomhandler.push_back(new Ewmh()); // for Extended window manager atom support
//singleton pointer //singleton pointer
singleton = this; singleton = this;
// setup atom handlers
#ifdef USE_GNOME
m_atomhandler.push_back(new Gnome()); // for gnome 1 atom support
#endif //USE_GNOME
#ifdef USE_NEWWMSPEC
m_atomhandler.push_back(new Ewmh()); // for Extended window manager atom support
#endif // USE_NEWWMSPEC
grab(); grab();
setupConfigFiles(); setupConfigFiles();
@ -384,7 +386,7 @@ key(0)
char scrname[128], altscrname[128]; char scrname[128], altscrname[128];
sprintf(scrname, "session.screen%d", i); sprintf(scrname, "session.screen%d", i);
sprintf(altscrname, "session.Screen%d", i); sprintf(altscrname, "session.Screen%d", i);
BScreen *screen = new BScreen(m_screen_rm, this, scrname, altscrname, i); BScreen *screen = new BScreen(m_screen_rm, scrname, altscrname, i);
if (! screen->isScreenManaged()) { if (! screen->isScreenManaged()) {
delete screen; delete screen;
continue; continue;