X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23205be83c2a88b1aa7204d2cee52ca8a755e698..6eefca4fb7793a8d6bc02e69694735cb3e5fc230:/include/wx/dfb/wrapdfb.h?ds=sidebyside diff --git a/include/wx/dfb/wrapdfb.h b/include/wx/dfb/wrapdfb.h index 50063faa5a..602dd7c5fb 100644 --- a/include/wx/dfb/wrapdfb.h +++ b/include/wx/dfb/wrapdfb.h @@ -16,6 +16,13 @@ #include "wx/vidmode.h" #include +#include + +// DFB < 1.0 didn't have u8 type, only __u8 +#if DIRECTFB_MAJOR_VERSION == 0 +typedef __u8 u8; +#endif + wxDFB_DECLARE_INTERFACE(IDirectFB); wxDFB_DECLARE_INTERFACE(IDirectFBDisplayLayer); @@ -207,13 +214,16 @@ struct wxIDirectFBSurface : public wxDfbWrapper bool GetPixelFormat(DFBSurfacePixelFormat *caps) { return Check(m_ptr->GetPixelFormat(m_ptr, caps)); } + // convenience version of GetPixelFormat, returns DSPF_UNKNOWN if fails + DFBSurfacePixelFormat GetPixelFormat(); + bool SetClip(const DFBRegion *clip) { return Check(m_ptr->SetClip(m_ptr, clip)); } - bool SetColor(__u8 r, __u8 g, __u8 b, __u8 a) + bool SetColor(u8 r, u8 g, u8 b, u8 a) { return Check(m_ptr->SetColor(m_ptr, r, g, b, a)); } - bool Clear(__u8 r, __u8 g, __u8 b, __u8 a) + bool Clear(u8 r, u8 g, u8 b, u8 a) { return Check(m_ptr->Clear(m_ptr, r, g, b, a)); } bool DrawLine(int x1, int y1, int x2, int y2) @@ -285,7 +295,6 @@ struct wxIDirectFBSurface : public wxDfbWrapper source_rect, dest_rect)); } - /// Returns bit depth used by the surface or -1 on error int GetDepth(); @@ -315,6 +324,36 @@ struct wxIDirectFBSurface : public wxDfbWrapper wxIDirectFBSurfacePtr CreateCompatible(const wxSize& size = wxDefaultSize, int flags = 0); + bool Lock(DFBSurfaceLockFlags flags, void **ret_ptr, int *ret_pitch) + { return Check(m_ptr->Lock(m_ptr, flags, ret_ptr, ret_pitch)); } + + bool Unlock() + { return Check(m_ptr->Unlock(m_ptr)); } + + /// Helper struct for safe locking & unlocking of surfaces + struct Locked + { + Locked(const wxIDirectFBSurfacePtr& surface, DFBSurfaceLockFlags flags) + : m_surface(surface) + { + if ( !surface->Lock(flags, &ptr, &pitch) ) + ptr = NULL; + } + + ~Locked() + { + if ( ptr ) + m_surface->Unlock(); + } + + void *ptr; + int pitch; + + private: + wxIDirectFBSurfacePtr m_surface; + }; + + private: // this is private because we want user code to use FlipToFront() bool Flip(const DFBRegion *region, int flags); @@ -329,39 +368,9 @@ struct wxIDirectFBEventBuffer : public wxDfbWrapper { wxIDirectFBEventBuffer(IDirectFBEventBuffer *s) { Init(s); } - bool WakeUp() + bool CreateFileDescriptor(int *ret_fd) { - return Check(m_ptr->WakeUp(m_ptr)); - } - - bool HasEvent() - { - // returns DFB_OK if there is >=1 event, DFB_BUFFEREMPTY otherwise - DFBResult r = m_ptr->HasEvent(m_ptr); - - // NB: Check() also returns true for DFB_BUFFEREMPTY, so we can't just - // return it's return value: - Check(r); - return (r == DFB_OK); - } - - bool WaitForEventWithTimeout(unsigned secs, unsigned millisecs) - { - DFBResult r = m_ptr->WaitForEventWithTimeout(m_ptr, secs, millisecs); - - // DFB_TIMEOUT is not an error in this function: - if ( r == DFB_TIMEOUT ) - { - m_lastResult = DFB_TIMEOUT; - return true; - } - - return Check(r); - } - - bool GetEvent(wxDFBEvent& event) - { - return Check(m_ptr->GetEvent(m_ptr, &event)); + return Check(m_ptr->CreateFileDescriptor(m_ptr, ret_fd)); } }; @@ -389,12 +398,18 @@ struct wxIDirectFBWindow : public wxDfbWrapper bool Resize(int w, int h) { return Check(m_ptr->Resize(m_ptr, w, h)); } - bool SetOpacity(__u8 opacity) + bool SetOpacity(u8 opacity) { return Check(m_ptr->SetOpacity(m_ptr, opacity)); } bool SetStackingClass(DFBWindowStackingClass klass) { return Check(m_ptr->SetStackingClass(m_ptr, klass)); } + bool RaiseToTop() + { return Check(m_ptr->RaiseToTop(m_ptr)); } + + bool LowerToBottom() + { return Check(m_ptr->LowerToBottom(m_ptr)); } + wxIDirectFBSurfacePtr GetSurface() { IDirectFBSurface *s;