aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-25 13:07:34 (GMT)
committerfluxgen <fluxgen>2003-06-25 13:07:34 (GMT)
commit2a08e33735bea68dd0232d0f00775768069bbf12 (patch)
treea283b00d84f1206fdb4bb65d80c4a0cf9d9fff5d /src/fluxbox.cc
parent2cc98fe16dff976b8e2cd2e517787fada8cdc817 (diff)
downloadfluxbox-2a08e33735bea68dd0232d0f00775768069bbf12.zip
fluxbox-2a08e33735bea68dd0232d0f00775768069bbf12.tar.bz2
compile time option for toolbar
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index d2cfe8d..b4c056f 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,13 +22,12 @@
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.163 2003/06/25 06:02:53 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.164 2003/06/25 13:06:04 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
29#include "I18n.hh" 29#include "I18n.hh"
30#include "Screen.hh" 30#include "Screen.hh"
31#include "Toolbar.hh"
32#include "Window.hh" 31#include "Window.hh"
33#include "Workspace.hh" 32#include "Workspace.hh"
34#include "StringUtil.hh" 33#include "StringUtil.hh"
@@ -41,7 +40,6 @@
41#include "WinClient.hh" 40#include "WinClient.hh"
42#include "Keys.hh" 41#include "Keys.hh"
43#include "FbAtoms.hh" 42#include "FbAtoms.hh"
44#include "ToolbarHandler.hh"
45 43
46//Use GNU extensions 44//Use GNU extensions
47#ifndef _GNU_SOURCE 45#ifndef _GNU_SOURCE
@@ -64,6 +62,10 @@
64#ifdef REMEMBER 62#ifdef REMEMBER
65#include "Remember.hh" 63#include "Remember.hh"
66#endif // REMEMBER 64#endif // REMEMBER
65#ifdef USE_TOOLBAR
66#include "Toolbar.hh"
67#include "ToolbarHandler.hh"
68#endif // USE_TOOLBAR
67 69
68// X headers 70// X headers
69#include <X11/Xlib.h> 71#include <X11/Xlib.h>
@@ -524,7 +526,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
524#endif // HAVE_RANDR 526#endif // HAVE_RANDR
525 527
526 m_screen_list.push_back(screen); 528 m_screen_list.push_back(screen);
529#ifdef USE_TOOLBAR
527 m_atomhandler.push_back(new ToolbarHandler(*screen)); 530 m_atomhandler.push_back(new ToolbarHandler(*screen));
531#endif // USE_TOOLBAR
528 532
529 // attach screen signals to this 533 // attach screen signals to this
530 screen->currentWorkspaceSig().attach(this); 534 screen->currentWorkspaceSig().attach(this);
@@ -1808,15 +1812,6 @@ void Fluxbox::save_rc() {
1808 BScreen *screen = *it; 1812 BScreen *screen = *it;
1809 int screen_number = screen->screenNumber(); 1813 int screen_number = screen->screenNumber();
1810 1814
1811 /*
1812#ifdef SLIT
1813 #ifdef XINERAMA
1814 sprintf(rc_string, "session.screen%d.slit.onHead: %d", screen_number,
1815 screen->getSlitOnHead());
1816 XrmPutLineResource(&new_blackboxrc, rc_string);
1817 #endif // XINERAMA
1818#endif // SLIT
1819 */
1820 sprintf(rc_string, "session.screen%d.rowPlacementDirection: %s", screen_number, 1815 sprintf(rc_string, "session.screen%d.rowPlacementDirection: %s", screen_number,
1821 ((screen->getRowPlacementDirection() == BScreen::LEFTRIGHT) ? 1816 ((screen->getRowPlacementDirection() == BScreen::LEFTRIGHT) ?
1822 "LeftToRight" : "RightToLeft")); 1817 "LeftToRight" : "RightToLeft"));