set teh xinerama stuff even when not compiled with the xinerama extension so code can use it always
This commit is contained in:
parent
3f80d431ad
commit
971e227b14
2 changed files with 6 additions and 6 deletions
|
@ -80,7 +80,7 @@ ScreenInfo::ScreenInfo(int num) {
|
|||
|
||||
_display_string = string("DISPLAY=") + default_string + '.' +
|
||||
itostring(static_cast<unsigned long>(_screen));
|
||||
|
||||
|
||||
#if 0 //def XINERAMA
|
||||
_xinerama_active = False;
|
||||
|
||||
|
@ -112,12 +112,16 @@ ScreenInfo::ScreenInfo(int num) {
|
|||
|
||||
// if we can't find any xinerama regions, then we act as if it is not
|
||||
// active, even though it said it was
|
||||
_xinerama_active = True;
|
||||
_xinerama_active = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
_xinerama_active = false;
|
||||
#endif // XINERAMA
|
||||
if (!_xinerama_active)
|
||||
_xinerama_areas.push_back(Rect(Point(0, 0), _size));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -24,10 +24,8 @@ private:
|
|||
int _screen;
|
||||
std::string _display_string;
|
||||
Size _size;
|
||||
#ifdef XINERAMA
|
||||
std::vector<Rect> _xinerama_areas;
|
||||
bool _xinerama_active;
|
||||
#endif
|
||||
|
||||
public:
|
||||
ScreenInfo(int num);
|
||||
|
@ -39,11 +37,9 @@ public:
|
|||
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 std::vector<Rect> &xineramaAreas() const
|
||||
{ return _xinerama_areas; }
|
||||
inline bool isXineramaActive() const { return _xinerama_active; }
|
||||
#endif
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue