ScreenInfo::ScreenInfo(unsigned int num) {
_screen = num;
- _root_window = RootWindow(Display::display, _screen);
+ _root_window = RootWindow(**display, _screen);
- _rect.setSize(WidthOfScreen(ScreenOfDisplay(Display::display,
+ _rect.setSize(WidthOfScreen(ScreenOfDisplay(**display,
_screen)),
- HeightOfScreen(ScreenOfDisplay(Display::display,
+ HeightOfScreen(ScreenOfDisplay(**display,
_screen)));
/*
If the default depth is at least 8 we will use that,
Preference is given to 24 bit over larger depths if 24 bit is an option.
*/
- _depth = DefaultDepth(Display::display, _screen);
- _visual = DefaultVisual(Display::display, _screen);
- _colormap = DefaultColormap(Display::display, _screen);
+ _depth = DefaultDepth(**display, _screen);
+ _visual = DefaultVisual(**display, _screen);
+ _colormap = DefaultColormap(**display, _screen);
if (_depth < 8) {
// search for a TrueColor Visual... if we can't find one...
vinfo_template.screen = _screen;
vinfo_template.c_class = TrueColor;
- vinfo_return = XGetVisualInfo(Display::display,
+ vinfo_return = XGetVisualInfo(**display,
VisualScreenMask | VisualClassMask,
&vinfo_template, &vinfo_nitems);
if (vinfo_return) {
if (best != -1) {
_depth = vinfo_return[best].depth;
_visual = vinfo_return[best].visual;
- _colormap = XCreateColormap(Display::display, _root_window, _visual,
+ _colormap = XCreateColormap(**display, _root_window, _visual,
AllocNone);
}
}
// get the default display string and strip the screen number
- string default_string = DisplayString(Display::display);
+ string default_string = DisplayString(**display);
const string::size_type pos = default_string.rfind(".");
if (pos != string::npos)
default_string.resize(pos);
in future versions we should be able, so the 'activeness' is checked
on a pre-screen basis anyways.
*/
- if (XineramaIsActive(Display::display)) {
+ if (XineramaIsActive(**display)) {
/*
If Xinerama is being used, there there is only going to be one screen
present. We still, of course, want to use the screen class, but that
never be more than one screen present with Xinerama active.
*/
int num;
- XineramaScreenInfo *info = XineramaQueryScreens(Display::display,
- &num);
+ XineramaScreenInfo *info = XineramaQueryScreens(**display, &num);
if (num > 0 && info) {
_xinerama_areas.reserve(num);
for (int i = 0; i < num; ++i) {