#endif
#include "wx/display.h"
+#include "wx/intl.h"
#include "wx/log.h"
#ifndef WX_PRECOMP
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/extensions/Xinerama.h>
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
#include <X11/extensions/xf86vmode.h>
+#endif
}
-//free private data common to x (usually s3) servers
-#define wxClearXVM(vm) if(vm.privsize) XFree(vm.c_private)
class wxDisplayUnixPriv
{
public:
wxRect m_rect;
int m_depth;
- XF86VidModeModeInfo m_DefaultVidMode;
- ~wxDisplayUnixPriv()
- {
- wxClearXVM(m_DefaultVidMode);
- }
};
size_t wxDisplayBase::GetCount()
for (i = 0; i < numscreens; ++i)
{
if (p.x >= screenarr[i].x_org &&
- p.x <= screenarr[i].x_org + screenarr[i].width &&
+ p.x < screenarr[i].x_org + screenarr[i].width &&
p.y >= screenarr[i].y_org &&
- p.y <= screenarr[i].y_org + screenarr[i].height)
+ p.y < screenarr[i].y_org + screenarr[i].height)
{
which_screen = i;
}
{
wxSize size = wxGetDisplaySize();
if (p.x >= 0 &&
- p.x <= size.GetWidth() &&
- p.y > 0 &&
- p.y <= size.GetHeight())
+ p.x < size.GetWidth() &&
+ p.y >= 0 &&
+ p.y < size.GetHeight())
{
return 0;
}
return -1;
}
-
}
wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisplayUnixPriv )
XineramaScreenInfo *screenarr;
int numscreens;
screenarr = XineramaQueryScreens(disp, &numscreens);
+
m_priv->m_rect = wxRect(screenarr[index].x_org, screenarr[index].y_org,
screenarr[index].width, screenarr[index].height);
m_priv->m_depth = DefaultDepth(disp, DefaultScreen(disp));
m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight());
m_priv->m_depth = wxDisplayDepth();
}
-
-
- XF86VidModeModeLine VM;
- int nDotClock;
-
- XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
- &nDotClock, &VM);
-
- //A XF86VidModeModeLine is a XF86ModeModeInfo without the dotclock
- //field. It would be nice to mayby use a memcpy() here instead of
- //all this?
- m_priv->m_DefaultVidMode.dotclock = nDotClock;
- m_priv->m_DefaultVidMode.hdisplay = VM.hdisplay;
- m_priv->m_DefaultVidMode.hsyncstart = VM.hsyncstart;
- m_priv->m_DefaultVidMode.hsyncend = VM.hsyncend;
- m_priv->m_DefaultVidMode.htotal = VM.htotal;
- m_priv->m_DefaultVidMode.hskew = VM.hskew;
- m_priv->m_DefaultVidMode.vdisplay = VM.vdisplay;
- m_priv->m_DefaultVidMode.vsyncstart = VM.vsyncstart;
- m_priv->m_DefaultVidMode.vsyncend = VM.vsyncend;
- m_priv->m_DefaultVidMode.vtotal = VM.vtotal;
- m_priv->m_DefaultVidMode.flags = VM.flags;
- m_priv->m_DefaultVidMode.privsize = VM.privsize;
- m_priv->m_DefaultVidMode.c_private = VM.c_private;
}
wxDisplay::~wxDisplay()
return wxEmptyString;
}
+
+#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+
//
// See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more
// info about xf86 video mode extensions
//
-#define wxCVM(v) wxVideoMode(v.hdisplay, v.vdisplay, v.dotclock /*BPP in X? */,((v.hsyncstart + v.vsyncstart) / 2) )
-#define wxCVM2(v) wxVideoMode(v.hdisplay, v.vdisplay, 0 /*BPP in X? */,((v.hsyncstart + v.vsyncstart) / 2) )
+//free private data common to x (usually s3) servers
+#define wxClearXVM(vm) if(vm.privsize) XFree(vm.c_private)
+
+//Correct res rate from GLFW, which probably has the perfect license :)
+#define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f)
+#define wxCRR(v) wxCRR2(v,v.dotclock)
+#define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc))
+#define wxCVM(v) wxCVM2(v, v.dotclock)
wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
{
for (int i = 0; i < nNumModes; ++i)
{
if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode...
- mode.Matches(wxCVM2((*ppXModes[i]))) ) //...?
+ mode.Matches(wxCVM((*ppXModes[i]))) ) //...?
{
- Modes.Add(wxCVM2((*ppXModes[i])));
+ Modes.Add(wxCVM((*ppXModes[i])));
}
wxClearXVM((*ppXModes[i]));
// XFree(ppXModes[i]); //supposed to free?
}
else //OOPS!
{
- wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::GetModes()!");
+ wxLogSysError(_("Failed to enumerate video modes"));
}
return Modes;
wxVideoMode wxDisplay::GetCurrentMode() const
{
- return wxCVM2(m_priv->m_DefaultVidMode);
+ XF86VidModeModeLine VM;
+ int nDotClock;
+ XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
+ &nDotClock, &VM);
+ wxClearXVM(VM);
+ return wxCVM2(VM, nDotClock);
}
bool wxDisplay::ChangeMode(const wxVideoMode& mode)
{
- if (mode == wxDefaultVideoMode)
- {
- return XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
- &m_priv->m_DefaultVidMode) == TRUE;
- }
- else //This gets kind of tricky AND complicated :) :\ :( :)
+ //This gets kind of tricky AND complicated :) :\ :( :)
{
bool bRet = false;
//Some variables..
if(XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) == TRUE)
{
+ if (mode == wxDefaultVideoMode)
+ {
+ bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
+ ppXModes[0]) == TRUE;
+
+ for (int i = 0; i < nNumModes; ++i)
+ {
+ wxClearXVM((*ppXModes[i]));
+ // XFree(ppXModes[i]); //supposed to free?
+ }
+ XFree(ppXModes);
+
+ return bRet;
+ }
for (int i = 0; i < nNumModes; ++i)
{
if (!bRet &&
ppXModes[i]->hdisplay == mode.w &&
ppXModes[i]->vdisplay == mode.h &&
- ((ppXModes[i]->hsyncstart + ppXModes[i]->vsyncstart) / 2) == mode.refresh)
+ wxCRR((*ppXModes[i])) == mode.refresh)
{
//switch!
bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
}
else //OOPS!
{
- wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::ChangeMode()!");
+ wxLogSysError(_("Failed to change video mode"));
return false;
}
}
}
-#endif /* wxUSE_DISPLAY */
+#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const
+{
+ Display *disp = (Display*)wxGetDisplay();
+ int count_return;
+ int* depths = XListDepths(disp, 0, &count_return);
+ wxArrayVideoModes modes;
+ if (depths)
+ {
+ int x;
+ for (x = 0; x < count_return; ++x)
+ {
+ modes.Add(wxVideoMode(m_priv->m_rect.GetWidth(), m_priv->m_rect.GetHeight(), depths[x]));
+ }
+ }
+ return modes;
+}
+
+wxVideoMode wxDisplay::GetCurrentMode() const
+{
+ // Not implemented
+ return wxVideoMode();
+}
+
+bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+{
+ // Not implemented
+ return false;
+}
+
+#endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+#endif /* wxUSE_DISPLAY */
projects / wxWidgets.git / blobdiff