diff options
author | fluxgen <fluxgen> | 2002-10-25 21:17:15 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-10-25 21:17:15 (GMT) |
commit | 6c5732899d6b406bd55f759f640cda2acd3f2182 (patch) | |
tree | 0794d288760ccb2e076aaad066969fd89f45329c | |
parent | e111d9f44531054ac747c1401cadafbc9fb29a39 (diff) | |
download | fluxbox-6c5732899d6b406bd55f759f640cda2acd3f2182.zip fluxbox-6c5732899d6b406bd55f759f640cda2acd3f2182.tar.bz2 |
compile time option for gnome and net wm hints, updateds for screen constructor
-rw-r--r-- | src/fluxbox.cc | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index c8df4d9..8aac41b 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: fluxbox.cc,v 1.79 2002/10/23 22:00:46 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.80 2002/10/25 21:17:15 fluxgen Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "fluxbox.hh" | 28 | #include "fluxbox.hh" |
@@ -40,12 +40,7 @@ | |||
40 | #include "Resource.hh" | 40 | #include "Resource.hh" |
41 | #include "XrmDatabaseHelper.hh" | 41 | #include "XrmDatabaseHelper.hh" |
42 | #include "AtomHandler.hh" | 42 | #include "AtomHandler.hh" |
43 | #include "Gnome.hh" | ||
44 | #include "Ewmh.hh" | ||
45 | 43 | ||
46 | #ifdef SLIT | ||
47 | #include "Slit.hh" | ||
48 | #endif // SLIT | ||
49 | 44 | ||
50 | //Use GNU extensions | 45 | //Use GNU extensions |
51 | #ifndef _GNU_SOURCE | 46 | #ifndef _GNU_SOURCE |
@@ -56,6 +51,16 @@ | |||
56 | #include "../config.h" | 51 | #include "../config.h" |
57 | #endif // HAVE_CONFIG_H | 52 | #endif // HAVE_CONFIG_H |
58 | 53 | ||
54 | #ifdef SLIT | ||
55 | #include "Slit.hh" | ||
56 | #endif // SLIT | ||
57 | #ifdef USE_GNOME | ||
58 | #include "Gnome.hh" | ||
59 | #endif // USE_GNOME | ||
60 | #ifdef USE_NEWWMSPEC | ||
61 | #include "Ewmh.hh" | ||
62 | #endif //USE_NEWWMSPEC | ||
63 | |||
59 | // X headers | 64 | // X headers |
60 | #include <X11/Xlib.h> | 65 | #include <X11/Xlib.h> |
61 | #include <X11/Xutil.h> | 66 | #include <X11/Xutil.h> |
@@ -88,28 +93,20 @@ | |||
88 | #include <sys/select.h> | 93 | #include <sys/select.h> |
89 | #endif // HAVE_SYS_SELECT_H | 94 | #endif // HAVE_SYS_SELECT_H |
90 | 95 | ||
91 | #ifdef HAVE_SIGNAL_H | ||
92 | #include <signal.h> | ||
93 | #endif // HAVE_SIGNAL_H | ||
94 | |||
95 | #ifdef HAVE_SYS_SIGNAL_H | ||
96 | # include <sys/signal.h> | ||
97 | #endif // HAVE_SYS_SIGNAL_H | ||
98 | |||
99 | #ifdef HAVE_SYS_STAT_H | 96 | #ifdef HAVE_SYS_STAT_H |
100 | # include <sys/types.h> | 97 | #include <sys/types.h> |
101 | # include <sys/stat.h> | 98 | #include <sys/stat.h> |
102 | #endif // HAVE_SYS_STAT_H | 99 | #endif // HAVE_SYS_STAT_H |
103 | 100 | ||
104 | #ifdef TIME_WITH_SYS_TIME | 101 | #ifdef TIME_WITH_SYS_TIME |
105 | # include <sys/time.h> | 102 | #include <sys/time.h> |
106 | # include <time.h> | 103 | #include <time.h> |
107 | #else // !TIME_WITH_SYS_TIME | 104 | #else // !TIME_WITH_SYS_TIME |
108 | # ifdef HAVE_SYS_TIME_H | 105 | #ifdef HAVE_SYS_TIME_H |
109 | # include <sys/time.h> | 106 | #include <sys/time.h> |
110 | # else // !HAVE_SYS_TIME_H | 107 | #else // !HAVE_SYS_TIME_H |
111 | # include <time.h> | 108 | #include <time.h> |
112 | # endif // HAVE_SYS_TIME_H | 109 | #endif // HAVE_SYS_TIME_H |
113 | #endif // TIME_WITH_SYS_TIME | 110 | #endif // TIME_WITH_SYS_TIME |
114 | 111 | ||
115 | #ifdef HAVE_LIBGEN_H | 112 | #ifdef HAVE_LIBGEN_H |
@@ -324,7 +321,7 @@ key(0) | |||
324 | abort(); | 321 | abort(); |
325 | } | 322 | } |
326 | 323 | ||
327 | //setup system signals | 324 | //catch system signals |
328 | SignalHandler *sigh = SignalHandler::instance(); | 325 | SignalHandler *sigh = SignalHandler::instance(); |
329 | 326 | ||
330 | sigh->registerHandler(SIGSEGV, this); | 327 | sigh->registerHandler(SIGSEGV, this); |
@@ -341,13 +338,18 @@ key(0) | |||
341 | cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur); | 338 | cursor.move = XCreateFontCursor(getXDisplay(), XC_fleur); |
342 | cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle); | 339 | cursor.ll_angle = XCreateFontCursor(getXDisplay(), XC_ll_angle); |
343 | cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle); | 340 | cursor.lr_angle = XCreateFontCursor(getXDisplay(), XC_lr_angle); |
344 | 341 | ||
342 | //singleton pointer | ||
343 | singleton = this; | ||
344 | |||
345 | // setup atom handlers | 345 | // setup atom handlers |
346 | #ifdef USE_GNOME | ||
346 | m_atomhandler.push_back(new Gnome()); // for gnome 1 atom support | 347 | m_atomhandler.push_back(new Gnome()); // for gnome 1 atom support |
348 | #endif //USE_GNOME | ||
349 | #ifdef USE_NEWWMSPEC | ||
347 | m_atomhandler.push_back(new Ewmh()); // for Extended window manager atom support | 350 | m_atomhandler.push_back(new Ewmh()); // for Extended window manager atom support |
351 | #endif // USE_NEWWMSPEC | ||
348 | 352 | ||
349 | //singleton pointer | ||
350 | singleton = this; | ||
351 | grab(); | 353 | grab(); |
352 | 354 | ||
353 | setupConfigFiles(); | 355 | setupConfigFiles(); |
@@ -384,7 +386,7 @@ key(0) | |||
384 | char scrname[128], altscrname[128]; | 386 | char scrname[128], altscrname[128]; |
385 | sprintf(scrname, "session.screen%d", i); | 387 | sprintf(scrname, "session.screen%d", i); |
386 | sprintf(altscrname, "session.Screen%d", i); | 388 | sprintf(altscrname, "session.Screen%d", i); |
387 | BScreen *screen = new BScreen(m_screen_rm, this, scrname, altscrname, i); | 389 | BScreen *screen = new BScreen(m_screen_rm, scrname, altscrname, i); |
388 | if (! screen->isScreenManaged()) { | 390 | if (! screen->isScreenManaged()) { |
389 | delete screen; | 391 | delete screen; |
390 | continue; | 392 | continue; |