aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am9
-rw-r--r--src/fluxbox.cc19
2 files changed, 11 insertions, 17 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bc4377d..4781bd8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,9 @@ if REGEXP_SRC
53REGEXP_SOURCE = RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc 53REGEXP_SOURCE = RegExp.hh RegExp.cc ClientPattern.hh ClientPattern.cc
54endif 54endif
55endif 55endif
56if TOOLBAR_SRC
57TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc ToolbarHandler.hh ToolbarHandler.cc ToolbarTheme.hh ToolbarTheme.cc IconBar.hh IconBar.cc
58endif
56 59
57fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ 60fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
58 BoolMenuItem.hh \ 61 BoolMenuItem.hh \
@@ -60,7 +63,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
60 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \ 63 FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
61 FbWinFrameTheme.hh FbWinFrameTheme.cc \ 64 FbWinFrameTheme.hh FbWinFrameTheme.cc \
62 fluxbox.cc fluxbox.hh ${gnome_SOURCE} \ 65 fluxbox.cc fluxbox.hh ${gnome_SOURCE} \
63 IconBar.cc IconBar.hh \
64 I18n.cc I18n.hh \ 66 I18n.cc I18n.hh \
65 Keys.cc Keys.hh main.cc \ 67 Keys.cc Keys.hh main.cc \
66 Netizen.cc Netizen.hh \ 68 Netizen.cc Netizen.hh \
@@ -69,9 +71,6 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
69 Screen.cc Screen.hh \ 71 Screen.cc Screen.hh \
70 Slit.cc Slit.hh SlitTheme.hh SlitClient.hh SlitClient.cc \ 72 Slit.cc Slit.hh SlitTheme.hh SlitClient.hh SlitClient.cc \
71 TextButton.hh TextButton.cc \ 73 TextButton.hh TextButton.cc \
72 Toolbar.cc Toolbar.hh \
73 ToolbarHandler.cc ToolbarHandler.hh \
74 ToolbarTheme.hh ToolbarTheme.cc \
75 WinButton.hh WinButton.cc \ 74 WinButton.hh WinButton.cc \
76 WinButtonTheme.hh WinButtonTheme.cc \ 75 WinButtonTheme.hh WinButtonTheme.cc \
77 Window.cc Window.hh \ 76 Window.cc Window.hh \
@@ -82,7 +81,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
82 Strut.hh \ 81 Strut.hh \
83 Xinerama.hh \ 82 Xinerama.hh \
84 Xutil.hh Xutil.cc \ 83 Xutil.hh Xutil.cc \
85 ${REMEMBER_SOURCE} ${REGEXP_SOURCE} 84 ${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE}
86 85
87 86
88LDADD=FbTk/libFbTk.a 87LDADD=FbTk/libFbTk.a
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"));