aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/BaseDisplay.hh16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index b927691..991887f 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -22,18 +22,20 @@
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.10 2002/02/07 14:44:09 fluxgen Exp $ 25// $Id: BaseDisplay.hh,v 1.11 2002/02/11 10:58:48 fluxgen Exp $
26 26
27#ifndef _BASEDISPLAY_HH_ 27#ifndef _BASEDISPLAY_HH_
28#define _BASEDISPLAY_HH_ 28#define _BASEDISPLAY_HH_
29 29
30#include "LinkedList.hh"
31#include "Timer.hh" 30#include "Timer.hh"
32#include "NotCopyable.hh" 31#include "NotCopyable.hh"
33 32
34#include <X11/Xlib.h> 33#include <X11/Xlib.h>
35#include <X11/Xatom.h> 34#include <X11/Xatom.h>
36 35
36#include <list>
37#include <vector>
38
37// forward declaration 39// forward declaration
38class ScreenInfo; 40class ScreenInfo;
39 41
@@ -229,7 +231,7 @@ public:
229#endif // NEWWMSPEC 231#endif // NEWWMSPEC
230 232
231 inline ScreenInfo *getScreenInfo(int s) 233 inline ScreenInfo *getScreenInfo(int s)
232 { return (ScreenInfo *) screenInfoList->find(s); } 234 { return (ScreenInfo *) screenInfoList[s]; }
233 235
234 inline const Bool &hasShapeExtensions(void) const 236 inline const Bool &hasShapeExtensions(void) const
235 { return shape.extensions; } 237 { return shape.extensions; }
@@ -351,8 +353,12 @@ private:
351 353
352 bool m_startup, m_shutdown; 354 bool m_startup, m_shutdown;
353 Display *m_display; 355 Display *m_display;
354 LinkedList<ScreenInfo> *screenInfoList; 356
355 LinkedList<BTimer> *timerList; 357 typedef std::vector<ScreenInfo *> ScreenInfoList;
358 ScreenInfoList screenInfoList;
359
360 typedef std::list<BTimer *> TimerList;
361 TimerList timerList;
356 362
357 char *m_display_name, *m_app_name; 363 char *m_display_name, *m_app_name;
358 int number_of_screens, m_server_grabs, colors_per_channel; 364 int number_of_screens, m_server_grabs, colors_per_channel;