X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20671963efabd70a208b415c4734ee813b9eb439..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/dfb/wrapdfb.h?ds=sidebyside diff --git a/include/wx/dfb/wrapdfb.h b/include/wx/dfb/wrapdfb.h index bed40a9124..292b83d39e 100644 --- a/include/wx/dfb/wrapdfb.h +++ b/include/wx/dfb/wrapdfb.h @@ -12,11 +12,14 @@ #define _WX_DFB_WRAPDFB_H_ #include "wx/dfb/dfbptr.h" +#include "wx/gdicmn.h" +#include "wx/vidmode.h" #include wxDFB_DECLARE_INTERFACE(IDirectFB); wxDFB_DECLARE_INTERFACE(IDirectFBDisplayLayer); +wxDFB_DECLARE_INTERFACE(IDirectFBFont); wxDFB_DECLARE_INTERFACE(IDirectFBWindow); wxDFB_DECLARE_INTERFACE(IDirectFBSurface); wxDFB_DECLARE_INTERFACE(IDirectFBPalette); @@ -204,13 +207,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) @@ -274,6 +280,13 @@ struct wxIDirectFBSurface : public wxDfbWrapper int x, int y) { return Check(m_ptr->Blit(m_ptr, source, source_rect, x, y)); } + bool StretchBlit(const wxIDirectFBSurfacePtr& source, + const DFBRectangle *source_rect, + const DFBRectangle *dest_rect) + { + return Check(m_ptr->StretchBlit(m_ptr, source->GetRaw(), + source_rect, dest_rect)); + } /// Returns bit depth used by the surface or -1 on error int GetDepth(); @@ -286,14 +299,53 @@ struct wxIDirectFBSurface : public wxDfbWrapper */ wxIDirectFBSurfacePtr Clone(); + /// Flags for CreateCompatible() + enum CreateCompatibleFlags + { + /// Don't create double-buffered surface + CreateCompatible_NoBackBuffer = 1 + }; + /** Creates a surface compatible with this one, i.e. surface with the same capabilities and pixel format, but with different and size. - @param size Size of the surface to create. If wxDefaultSize, use the - size of this surface. + @param size Size of the surface to create. If wxDefaultSize, use the + size of this surface. + @param flags Or-combination of CreateCompatibleFlags values */ - wxIDirectFBSurfacePtr CreateCompatible(const wxSize& size = wxDefaultSize); + 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() @@ -369,7 +421,7 @@ 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) @@ -389,6 +441,9 @@ struct wxIDirectFBWindow : public wxDfbWrapper bool RequestFocus() { return Check(m_ptr->RequestFocus(m_ptr)); } + + bool Destroy() + { return Check(m_ptr->Destroy(m_ptr)); } }; @@ -409,14 +464,10 @@ struct wxIDirectFBDisplayLayer : public wxDfbWrapper return NULL; } - wxIDirectFBSurfacePtr GetSurface() - { - IDirectFBSurface *s; - if ( Check(m_ptr->GetSurface(m_ptr, &s)) ) - return new wxIDirectFBSurface(s); - else - return NULL; - } + bool GetConfiguration(DFBDisplayLayerConfig *config) + { return Check(m_ptr->GetConfiguration(m_ptr, config)); } + + wxVideoMode GetVideoMode(); bool GetCursorPosition(int *x, int *y) { return Check(m_ptr->GetCursorPosition(m_ptr, x, y)); }