diff options
Diffstat (limited to 'src/BaseDisplay.hh')
-rw-r--r-- | src/BaseDisplay.hh | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh index 3cf8d40..d7075c1 100644 --- a/src/BaseDisplay.hh +++ b/src/BaseDisplay.hh | |||
@@ -22,7 +22,7 @@ | |||
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.16 2002/03/19 14:30:42 fluxgen Exp $ | 25 | // $Id: BaseDisplay.hh,v 1.17 2002/03/19 21:19:55 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef BASEDISPLAY_HH | 27 | #ifndef BASEDISPLAY_HH |
28 | #define BASEDISPLAY_HH | 28 | #define BASEDISPLAY_HH |
@@ -32,9 +32,9 @@ | |||
32 | #include <X11/Xlib.h> | 32 | #include <X11/Xlib.h> |
33 | 33 | ||
34 | #ifdef XINERAMA | 34 | #ifdef XINERAMA |
35 | extern "C" { | 35 | extern "C" { |
36 | #include <X11/extensions/Xinerama.h> | 36 | #include <X11/extensions/Xinerama.h> |
37 | } | 37 | } |
38 | #endif // XINERAMA | 38 | #endif // XINERAMA |
39 | 39 | ||
40 | #include <list> | 40 | #include <list> |
@@ -166,12 +166,12 @@ public: | |||
166 | inline const unsigned int getHeight(void) const { return height; } | 166 | inline const unsigned int getHeight(void) const { return height; } |
167 | 167 | ||
168 | #ifdef XINERAMA | 168 | #ifdef XINERAMA |
169 | inline bool hasXinerama(void) { return m_hasXinerama; } | 169 | inline bool hasXinerama(void) const { return m_hasXinerama; } |
170 | inline int getNumHeads(void) { return xineramaNumHeads; } | 170 | inline int getNumHeads(void) const { return xineramaNumHeads; } |
171 | unsigned int getHead(int x, int y); | 171 | unsigned int getHead(int x, int y) const; |
172 | unsigned int getCurrHead(void); | 172 | unsigned int getCurrHead(void) const; |
173 | unsigned int getHeadWidth(unsigned int head); | 173 | unsigned int getHeadWidth(unsigned int head) const; |
174 | unsigned int getHeadHeight(unsigned int head); | 174 | unsigned int getHeadHeight(unsigned int head) const; |
175 | int getHeadX(unsigned int head); | 175 | int getHeadX(unsigned int head); |
176 | int getHeadY(unsigned int head); | 176 | int getHeadY(unsigned int head); |
177 | #endif // XINERAMA | 177 | #endif // XINERAMA |
@@ -184,13 +184,14 @@ private: | |||
184 | 184 | ||
185 | int depth, screen_number; | 185 | int depth, screen_number; |
186 | unsigned int width, height; | 186 | unsigned int width, height; |
187 | |||
188 | }; | ||
189 | |||
190 | #ifdef XINERAMA | 187 | #ifdef XINERAMA |
191 | bool m_hasXinerama; | 188 | bool m_hasXinerama; |
192 | int xineramaMajor, xineramaMinor, xineramaNumHeads, xineramaLastHead; | 189 | int xineramaMajor, xineramaMinor, xineramaNumHeads, xineramaLastHead; |
193 | XineramaScreenInfo *xineramaInfos; | 190 | XineramaScreenInfo *xineramaInfos; |
194 | #endif // XINERAMA | 191 | #endif // XINERAMA |
195 | 192 | ||
193 | }; | ||
194 | |||
195 | |||
196 | |||
196 | #endif // BASEDISPLAY_HH | 197 | #endif // BASEDISPLAY_HH |