workaround to get things compiling properly under CW 8.3 Mach-O

[wxWidgets.git] / src / unix / displayx11.cpp

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index ae0a57d1399b662b2fa6cb30ab8bc661caaa43ec..08cf56f9f0742b404346dae439c44b04c6abe450 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -21,6 +21,8 @@
 #endif
 
 #include "wx/display.h"
 #endif
 
 #include "wx/display.h"

+#include "wx/intl.h"
+#include "wx/log.h"

 
 #ifndef WX_PRECOMP
   #include "wx/dynarray.h"
 
 #ifndef WX_PRECOMP
   #include "wx/dynarray.h"


@@ -37,6 +39,9 @@ extern "C" {
   #include <X11/Xlib.h>
   #include <X11/Xlibint.h>
   #include <X11/extensions/Xinerama.h>
   #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

 }
 
 class wxDisplayUnixPriv
 }
 
 class wxDisplayUnixPriv


@@ -79,9 +84,9 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
     for (i = 0; i < numscreens; ++i)
     {
       if (p.x >= screenarr[i].x_org &&
     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 &&

-          p.y <= screenarr[i].y_org + screenarr[i].height)
+          p.y < screenarr[i].y_org + screenarr[i].height)

       {
         which_screen = i;
       }
       {
         which_screen = i;
       }


@@ -94,9 +99,9 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p)
   {
     wxSize size = wxGetDisplaySize();
     if (p.x >= 0 &&
   {
     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 0;
     }


@@ -114,6 +119,7 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp
     XineramaScreenInfo *screenarr;
     int numscreens;
     screenarr = XineramaQueryScreens(disp, &numscreens);
     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(screenarr[index].x_org, screenarr[index].y_org,
                             screenarr[index].width, screenarr[index].height);
     m_priv->m_depth = DefaultDepth(disp, DefaultScreen(disp));


@@ -147,11 +153,136 @@ wxString wxDisplay::GetName() const
   return wxEmptyString;
 }
 
   return wxEmptyString;
 }
 

- wxArrayVideoModes
-    wxDisplay::GetModes(const wxVideoMode& mode) const
+
+#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
+//
+
+//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

 {
 {

-    // Not implemented
-    return wxArrayVideoModes();
+    //Convenience...
+    Display* pDisplay = (Display*) wxGetDisplay(); //default display
+    int nScreen = DefaultScreen(pDisplay); //default screen of (default) display...
+
+    //Some variables..
+    XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
+    int nNumModes; //Number of modes enumerated....
+
+    wxArrayVideoModes Modes; //modes to return...
+
+    if (XF86VidModeGetAllModeLines(pDisplay, nScreen, &nNumModes, &ppXModes) == TRUE)
+    {
+        for (int i = 0; i < nNumModes; ++i)
+        {
+            if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode...
+                mode.Matches(wxCVM((*ppXModes[i]))) ) //...?
+            {
+                Modes.Add(wxCVM((*ppXModes[i])));
+            }
+            wxClearXVM((*ppXModes[i]));
+        //  XFree(ppXModes[i]); //supposed to free?
+        }
+        XFree(ppXModes);
+    }
+    else //OOPS!
+    {
+        wxLogSysError(_("Failed to enumerate video modes"));
+    }
+
+    return Modes;
+}
+
+wxVideoMode wxDisplay::GetCurrentMode() const
+{
+  XF86VidModeModeLine VM;
+  int nDotClock;
+  XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
+                         &nDotClock, &VM);
+  wxClearXVM(VM);
+  return wxCVM2(VM, nDotClock);
+}
+
+bool wxDisplay::ChangeMode(const wxVideoMode& mode)
+{
+    //This gets kind of tricky AND complicated :) :\ :( :)
+    {
+        bool bRet = false;
+        //Some variables..
+        XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
+        int nNumModes; //Number of modes enumerated....
+
+        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 &&
+                    wxCRR((*ppXModes[i])) == mode.refresh)
+                {
+                    //switch!
+                    bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
+                             ppXModes[i]) == TRUE;
+                }
+                wxClearXVM((*ppXModes[i]));
+            //  XFree(ppXModes[i]); //supposed to free?
+            }
+            XFree(ppXModes);
+
+            return bRet;
+        }
+        else //OOPS!
+        {
+            wxLogSysError(_("Failed to change video mode"));
+            return false;
+        }
+    }
+}
+
+
+#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
 }
 
 wxVideoMode wxDisplay::GetCurrentMode() const


@@ -165,5 +296,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
     // Not implemented
     return false;
 }
     // Not implemented
     return false;
 }

-#endif /* wxUSE_DISPLAY */

 
 

+#endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+#endif /* wxUSE_DISPLAY */