aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira at fluxbox dot org>2012-12-12 09:18:20 (GMT)
committerMathias Gumz <akira at fluxbox dot org>2012-12-12 09:18:20 (GMT)
commit4191cbf2d2a71a5aeae41d54a5638abfc4789122 (patch)
treeea647d0fb35362b432653d0fc098ec8c22412dd4 /src/fluxbox.hh
parentd8cd6a928b76dbe63afa82327c51715cb1a1bdc8 (diff)
downloadfluxbox-4191cbf2d2a71a5aeae41d54a5638abfc4789122.zip
fluxbox-4191cbf2d2a71a5aeae41d54a5638abfc4789122.tar.bz2
Fix build regression: enable XRANDR support by default
The changes made in b178bed60b5bd8b2c9ed0cbc67fd729ff3820589 used the wrong variable to set the default state of '--enable-randr' in configure.in, that is fixed now. I also removed '--enable-randr12': If support for the Xrandr-extension is available at compile time we set HAVE_RANDR; if there is also support for Xrandr-1.2 (or higher), we also set HAVE_RANDR1_2 automatically. Other changes: * cleaned out public interface of 'class Fluxbox' * added 'RANDR' to output of 'fluxbox -info'
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index d1e8e93..35c1649 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -83,7 +83,7 @@ public:
83 bool xsync = false); 83 bool xsync = false);
84 virtual ~Fluxbox(); 84 virtual ~Fluxbox();
85 85
86 static Fluxbox *instance() { return s_singleton; } 86 static Fluxbox *instance();
87 87
88 /// main event loop 88 /// main event loop
89 void eventLoop(); 89 void eventLoop();
@@ -177,8 +177,8 @@ public:
177 typedef std::list<BScreen *> ScreenList; 177 typedef std::list<BScreen *> ScreenList;
178 const ScreenList screenList() const { return m_screen_list; } 178 const ScreenList screenList() const { return m_screen_list; }
179 179
180 bool haveShape() const { return m_have_shape; } 180 bool haveShape() const;
181 int shapeEventbase() const { return m_shape_eventbase; } 181 int shapeEventbase() const;
182 std::string getDefaultDataFilename(const char *name) const; 182 std::string getDefaultDataFilename(const char *name) const;
183 // screen mouse was in at last key event 183 // screen mouse was in at last key event
184 BScreen *mouseScreen() { return m_mousescreen; } 184 BScreen *mouseScreen() { return m_mousescreen; }
@@ -285,9 +285,6 @@ private:
285 285
286 std::auto_ptr<Keys> m_key; 286 std::auto_ptr<Keys> m_key;
287 287
288 //default arguments for titlebar left and right
289 static Fluxbox *s_singleton;
290
291 typedef std::set<AtomHandler *> AtomHandlerContainer; 288 typedef std::set<AtomHandler *> AtomHandlerContainer;
292 typedef AtomHandlerContainer::iterator AtomHandlerContainerIt; 289 typedef AtomHandlerContainer::iterator AtomHandlerContainerIt;
293 290
@@ -297,10 +294,6 @@ private:
297 bool m_restarting; 294 bool m_restarting;
298 bool m_shutdown; 295 bool m_shutdown;
299 int m_server_grabs; 296 int m_server_grabs;
300 int m_randr_event_type; ///< the type number of randr event
301 int m_shape_eventbase; ///< event base for shape events
302 bool m_have_shape; ///< if shape is supported by server
303 Atom m_kwm1_dockwindow, m_kwm2_dockwindow;
304 297
305 AttentionNoticeHandler m_attention_handler; 298 AttentionNoticeHandler m_attention_handler;
306}; 299};