-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifndef __screeninfo_hh
#define __screeninfo_hh
+#include "size.hh"
#include "rect.hh"
extern "C" {
}
#include <string>
+#include <vector>
namespace otk {
Colormap _colormap;
int _depth;
- unsigned int _screen;
+ int _screen;
std::string _display_string;
- Rect _rect;
+ Size _size;
#ifdef XINERAMA
- RectList _xinerama_areas;
+ std::vector<Rect> _xinerama_areas;
bool _xinerama_active;
#endif
public:
- ScreenInfo(unsigned int num);
+ ScreenInfo(int num);
inline Visual *visual() const { return _visual; }
inline Window rootWindow() const { return _root_window; }
inline Colormap colormap() const { return _colormap; }
inline int depth() const { return _depth; }
- inline unsigned int screen() const { return _screen; }
- inline const Rect& rect() const { return _rect; }
- inline unsigned int width() const { return _rect.width(); }
- inline unsigned int height() const { return _rect.height(); }
+ inline int screen() const { return _screen; }
+ inline const Size& size() const { return _size; }
inline const std::string& displayString() const { return _display_string; }
#ifdef XINERAMA
- inline const RectList &xineramaAreas() const { return _xinerama_areas; }
+ inline const std::vector<Rect> &xineramaAreas() const
+ { return _xinerama_areas; }
inline bool isXineramaActive() const { return _xinerama_active; }
#endif
};