aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-03-18 23:39:53 (GMT)
committerfluxgen <fluxgen>2002-03-18 23:39:53 (GMT)
commitc5bdfbfd500e93b69a19e53008bda7773db861e8 (patch)
treefa2c4f7fdb8f1e9b90f56560087bfa2bf7767f66
parent00dccce50caaacf76e665ce53e3afbda44b5fe2a (diff)
downloadfluxbox-c5bdfbfd500e93b69a19e53008bda7773db861e8.zip
fluxbox-c5bdfbfd500e93b69a19e53008bda7773db861e8.tar.bz2
removed add/removeTimer and fixed some stupid return referenses
-rw-r--r--src/BaseDisplay.hh38
1 files changed, 14 insertions, 24 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 4aa7228..ffc2b8d 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -22,12 +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: BaseDisplay.hh,v 1.14 2002/03/18 15:28:25 fluxgen Exp $ 25// $Id: BaseDisplay.hh,v 1.15 2002/03/18 23:39:53 fluxgen Exp $
26 26
27#ifndef BASEDISPLAY_HH 27#ifndef BASEDISPLAY_HH
28#define BASEDISPLAY_HH 28#define BASEDISPLAY_HH
29 29
30#include "Timer.hh"
31#include "NotCopyable.hh" 30#include "NotCopyable.hh"
32#include "FbAtoms.hh" 31#include "FbAtoms.hh"
33#include <X11/Xlib.h> 32#include <X11/Xlib.h>
@@ -77,9 +76,9 @@ public:
77 76
78 inline ScreenInfo *getScreenInfo(int s) { return screenInfoList[s]; } 77 inline ScreenInfo *getScreenInfo(int s) { return screenInfoList[s]; }
79 78
80 inline const Bool &hasShapeExtensions(void) const { return shape.extensions; } 79 inline const bool hasShapeExtensions(void) const { return shape.extensions; }
81 inline const bool &doShutdown(void) const { return m_shutdown; } 80 inline const bool doShutdown(void) const { return m_shutdown; }
82 inline const bool &isStartup(void) const { return m_startup; } 81 inline const bool isStartup(void) const { return m_startup; }
83 82
84 inline const Cursor &getSessionCursor(void) const { return cursor.session; } 83 inline const Cursor &getSessionCursor(void) const { return cursor.session; }
85 inline const Cursor &getMoveCursor(void) const { return cursor.move; } 84 inline const Cursor &getMoveCursor(void) const { return cursor.move; }
@@ -91,8 +90,8 @@ public:
91 inline const char *getXDisplayName(void) const { return const_cast<const char *>(m_display_name); } 90 inline const char *getXDisplayName(void) const { return const_cast<const char *>(m_display_name); }
92 inline const char *getApplicationName(void) const { return const_cast<const char *>(m_app_name); } 91 inline const char *getApplicationName(void) const { return const_cast<const char *>(m_app_name); }
93 92
94 inline const int &getNumberOfScreens(void) const { return number_of_screens; } 93 inline const int getNumberOfScreens(void) const { return number_of_screens; }
95 inline const int &getShapeEventBase(void) const { return shape.event_basep; } 94 inline const int getShapeEventBase(void) const { return shape.event_basep; }
96 95
97 inline void shutdown(void) { m_shutdown = true; } 96 inline void shutdown(void) { m_shutdown = true; }
98 inline void run(void) { m_startup = m_shutdown = false; } 97 inline void run(void) { m_startup = m_shutdown = false; }
@@ -102,8 +101,6 @@ public:
102 void grab(void); 101 void grab(void);
103 void ungrab(void); 102 void ungrab(void);
104 void eventLoop(void); 103 void eventLoop(void);
105 void addTimer(BTimer *);
106 void removeTimer(BTimer *);
107 104
108 // another pure virtual... this is used to handle signals that BaseDisplay 105 // another pure virtual... this is used to handle signals that BaseDisplay
109 // doesn't understand itself 106 // doesn't understand itself
@@ -128,24 +125,18 @@ private:
128 struct shape { 125 struct shape {
129 Bool extensions; 126 Bool extensions;
130 int event_basep, error_basep; 127 int event_basep, error_basep;
131 } shape; 128 } shape;
132
133
134 129
135 bool m_startup, m_shutdown; 130 bool m_startup, m_shutdown;
136 Display *m_display; 131 Display *m_display;
137 132
138 typedef std::vector<ScreenInfo *> ScreenInfoList; 133 typedef std::vector<ScreenInfo *> ScreenInfoList;
139 ScreenInfoList screenInfoList; 134 ScreenInfoList screenInfoList;
140
141 typedef std::list<BTimer *> TimerList;
142 TimerList timerList;
143 135
144 char *m_display_name, *m_app_name; 136 char *m_display_name, *m_app_name;
145 int number_of_screens, m_server_grabs, colors_per_channel; 137 int number_of_screens, m_server_grabs, colors_per_channel;
146 138
147protected: 139protected:
148
149 virtual void process_event(XEvent *) = 0; 140 virtual void process_event(XEvent *) = 0;
150 141
151}; 142};
@@ -161,11 +152,11 @@ public:
161 inline const Window &getRootWindow(void) const { return root_window; } 152 inline const Window &getRootWindow(void) const { return root_window; }
162 inline const Colormap &getColormap(void) const { return colormap; } 153 inline const Colormap &getColormap(void) const { return colormap; }
163 154
164 inline const int &getDepth(void) const { return depth; } 155 inline const int getDepth(void) const { return depth; }
165 inline const int &getScreenNumber(void) const { return screen_number; } 156 inline const int getScreenNumber(void) const { return screen_number; }
166 157
167 inline const unsigned int &getWidth(void) const { return width; } 158 inline const unsigned int getWidth(void) const { return width; }
168 inline const unsigned int &getHeight(void) const { return height; } 159 inline const unsigned int getHeight(void) const { return height; }
169 160
170private: 161private:
171 BaseDisplay *basedisplay; 162 BaseDisplay *basedisplay;
@@ -176,8 +167,7 @@ private:
176 int depth, screen_number; 167 int depth, screen_number;
177 unsigned int width, height; 168 unsigned int width, height;
178 169
179
180}; 170};
181 171
182 172
183#endif // __BaseDisplay_hh 173#endif // BASEDISPLAY_HH