aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-11 20:36:43 (GMT)
committerfluxgen <fluxgen>2002-08-11 20:36:43 (GMT)
commite0a6ffb10320207f351cf20eb9465fd791636d90 (patch)
tree7773a63387bd2000e26dac75532ba64e9d978202
parent54f565b7e30ef6f7a0127bc925a81d6323e42f8b (diff)
downloadfluxbox-e0a6ffb10320207f351cf20eb9465fd791636d90.zip
fluxbox-e0a6ffb10320207f351cf20eb9465fd791636d90.tar.bz2
minor style fixes and added groupfile resources
-rw-r--r--src/fluxbox.hh47
1 files changed, 24 insertions, 23 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 0a2f7c9..ecc9e0f 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,29 +22,11 @@
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.hh,v 1.22 2002/08/04 15:55:13 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.23 2002/08/11 20:36:43 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
29 29
30#include <X11/Xlib.h>
31#include <X11/Xresource.h>
32
33#ifdef HAVE_STDIO_H
34# include <stdio.h>
35#endif // HAVE_STDIO_H
36
37#ifdef TIME_WITH_SYS_TIME
38# include <sys/time.h>
39# include <time.h>
40#else // !TIME_WITH_SYS_TIME
41# ifdef HAVE_SYS_TIME_H
42# include <sys/time.h>
43# else // !HAVE_SYS_TIME_H
44# include <time.h>
45# endif // HAVE_SYS_TIME_H
46#endif // TIME_WITH_SYS_TIME
47
48#include "Resource.hh" 30#include "Resource.hh"
49#include "Keys.hh" 31#include "Keys.hh"
50#include "BaseDisplay.hh" 32#include "BaseDisplay.hh"
@@ -53,10 +35,29 @@
53#include "Window.hh" 35#include "Window.hh"
54#include "Tab.hh" 36#include "Tab.hh"
55#include "Toolbar.hh" 37#include "Toolbar.hh"
56#ifdef SLIT 38
57# include "Slit.hh" 39#ifdef SLIT
40#include "Slit.hh"
58#endif // SLIT 41#endif // SLIT
59 42
43#include <X11/Xlib.h>
44#include <X11/Xresource.h>
45
46#ifdef HAVE_STDIO_H
47# include <stdio.h>
48#endif // HAVE_STDIO_H
49
50#ifdef TIME_WITH_SYS_TIME
51#include <sys/time.h>
52#include <time.h>
53#else // !TIME_WITH_SYS_TIME
54#ifdef HAVE_SYS_TIME_H
55#include <sys/time.h>
56#else // !HAVE_SYS_TIME_H
57#include <time.h>
58#endif // HAVE_SYS_TIME_H
59#endif // TIME_WITH_SYS_TIME
60
60#include <string> 61#include <string>
61#include <vector> 62#include <vector>
62#include <map> 63#include <map>
@@ -193,12 +194,12 @@ private:
193 Resource<bool> m_rc_tabs, m_rc_iconbar; 194 Resource<bool> m_rc_tabs, m_rc_iconbar;
194 Resource<int> m_rc_colors_per_channel; 195 Resource<int> m_rc_colors_per_channel;
195 Resource<std::string> m_rc_stylefile, 196 Resource<std::string> m_rc_stylefile,
196 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile; 197 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
198 m_rc_groupfile;
197 199
198 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right; 200 Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
199 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max; 201 Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
200 202
201 //std::vector<std::string> parseTitleArgs(const char *arg);
202 void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg); 203 void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg);
203 204
204 std::map<Window, FluxboxWindow *> windowSearch; 205 std::map<Window, FluxboxWindow *> windowSearch;