X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..b99450eecb344b39cb8dc31e56d458e582a8eeba:/src/html/m_image.cpp diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index e8d63f818f..423ecf7bf5 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: m_image.cpp +// Name: src/html/m_image.cpp // Purpose: wxHtml module for displaying images // Author: Vaclav Slavik // RCS-ID: $Id$ @@ -7,37 +7,33 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WXPRECOMP +#if wxUSE_HTML && wxUSE_STREAMS + +#ifndef WX_PRECOMP + #include "wx/dynarray.h" #include "wx/dc.h" #include "wx/scrolwin.h" #include "wx/timer.h" #include "wx/dcmemory.h" + #include "wx/log.h" + #include "wx/math.h" + #include "wx/image.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/html/forcelnk.h" #include "wx/html/m_templ.h" #include "wx/html/htmlwin.h" -#include "wx/image.h" #include "wx/gifdecod.h" -#include "wx/dynarray.h" -#include "wx/log.h" #include "wx/artprov.h" -#include #include FORCE_LINK_ME(m_image) @@ -47,7 +43,7 @@ FORCE_LINK_ME(m_image) WX_DECLARE_OBJARRAY(int, CoordArray); #include "wx/arrimpl.cpp" // this is a magic incantation which must be done! -WX_DEFINE_OBJARRAY(CoordArray); +WX_DEFINE_OBJARRAY(CoordArray) // --------------------------------------------------------------------------- @@ -73,7 +69,7 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell wxHtmlRenderingInfo& WXUNUSED(info)) {} - DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell); }; @@ -86,7 +82,7 @@ wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype wxString x = incoords, y; type = t; - while ((i = x.Find( ',' )) != -1) + while ((i = x.Find( ',' )) != wxNOT_FOUND) { coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) ); x = x.Mid( i + 1 ); @@ -251,7 +247,7 @@ class wxHtmlImageMapCell : public wxHtmlCell int WXUNUSED(view_y1), int WXUNUSED(view_y2), wxHtmlRenderingInfo& WXUNUSED(info)) {} - DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell); }; @@ -290,11 +286,13 @@ const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const class wxHtmlImageCell : public wxHtmlCell { public: - wxHtmlImageCell(wxWindow *window, - wxFSFile *input, int w = -1, int h = -1, + wxHtmlImageCell(wxHtmlWindowInterface *windowIface, + wxFSFile *input, + int w = wxDefaultCoord, bool wpercent = false, + int h = wxDefaultCoord, bool hpresent = false, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, const wxString& mapname = wxEmptyString); - ~wxHtmlImageCell(); + virtual ~wxHtmlImageCell(); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, wxHtmlRenderingInfo& info); virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const; @@ -307,19 +305,23 @@ public: private: wxBitmap *m_bitmap; + int m_align; int m_bmpW, m_bmpH; + bool m_bmpWpercent:1; + bool m_bmpHpresent:1; bool m_showFrame:1; - wxScrolledWindow *m_window; + wxHtmlWindowInterface *m_windowIface; #if wxUSE_GIF && wxUSE_TIMER wxGIFDecoder *m_gifDecoder; wxTimer *m_gifTimer; int m_physX, m_physY; + size_t m_nCurrFrame; #endif double m_scale; wxHtmlImageMapCell *m_imageMap; wxString m_mapName; - DECLARE_NO_COPY_CLASS(wxHtmlImageCell) + wxDECLARE_NO_COPY_CLASS(wxHtmlImageCell); }; #if wxUSE_GIF && wxUSE_TIMER @@ -335,7 +337,7 @@ class wxGIFTimer : public wxTimer private: wxHtmlImageCell *m_cell; - DECLARE_NO_COPY_CLASS(wxGIFTimer) + wxDECLARE_NO_COPY_CLASS(wxGIFTimer); }; #endif @@ -345,23 +347,28 @@ class wxGIFTimer : public wxTimer //---------------------------------------------------------------------------- -wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, - int w, int h, double scale, int align, +wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface, + wxFSFile *input, + int w, bool wpercent, int h, bool hpresent, double scale, int align, const wxString& mapname) : wxHtmlCell() { - m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL; + m_windowIface = windowIface; m_scale = scale; - m_showFrame = FALSE; + m_showFrame = false; m_bitmap = NULL; - m_bmpW = w; - m_bmpH = h; + m_bmpW = w; + m_bmpH = h; + m_align = align; + m_bmpWpercent = wpercent; + m_bmpHpresent = hpresent; m_imageMap = NULL; m_mapName = mapname; - SetCanLiveOnPagebreak(FALSE); + SetCanLiveOnPagebreak(false); #if wxUSE_GIF && wxUSE_TIMER m_gifDecoder = NULL; m_gifTimer = NULL; - m_physX = m_physY = -1; + m_physX = m_physY = wxDefaultCoord; + m_nCurrFrame = 0; #endif if ( m_bmpW && m_bmpH ) @@ -372,25 +379,28 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, if ( s ) { - bool readImg = TRUE; - #if wxUSE_GIF && wxUSE_TIMER - if ( (input->GetLocation().Matches(wxT("*.gif")) || - input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) + bool readImg = true; + if ( m_windowIface && + (input->GetLocation().Matches(wxT("*.gif")) || + input->GetLocation().Matches(wxT("*.GIF"))) ) { - m_gifDecoder = new wxGIFDecoder(s, TRUE); - if ( m_gifDecoder->ReadGIF() == wxGIF_OK ) + m_gifDecoder = new wxGIFDecoder(); + if ( m_gifDecoder->LoadGIF(*s) == wxGIF_OK ) { wxImage img; - if ( m_gifDecoder->ConvertToImage(&img) ) + if ( m_gifDecoder->ConvertToImage(0, &img) ) SetImage(img); - readImg = FALSE; + readImg = false; if ( m_gifDecoder->IsAnimation() ) { m_gifTimer = new wxGIFTimer(this); - m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE); + long delay = m_gifDecoder->GetDelay(0); + if ( delay == 0 ) + delay = 1; + m_gifTimer->Start(delay, true); } else { @@ -414,43 +424,28 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, } else // input==NULL, use "broken image" bitmap { - if ( m_bmpW == -1 && m_bmpH == -1 ) + if ( m_bmpW == wxDefaultCoord && m_bmpH == wxDefaultCoord ) { m_bmpW = 29; m_bmpH = 31; } else { - m_showFrame = TRUE; - if ( m_bmpW == -1 ) m_bmpW = 31; - if ( m_bmpH == -1 ) m_bmpH = 33; + m_showFrame = true; + if ( m_bmpW == wxDefaultCoord ) m_bmpW = 31; + if ( m_bmpH == wxDefaultCoord ) m_bmpH = 33; } - m_bitmap = + m_bitmap = new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); } } //else: ignore the 0-sized images used sometimes on the Web pages - m_Width = (int)(scale * (double)m_bmpW); - m_Height = (int)(scale * (double)m_bmpH); - - switch (align) - { - case wxHTML_ALIGN_TOP : - m_Descent = m_Height; - break; - case wxHTML_ALIGN_CENTER : - m_Descent = m_Height / 2; - break; - case wxHTML_ALIGN_BOTTOM : - default : - m_Descent = 0; - break; - } } void wxHtmlImageCell::SetImage(const wxImage& img) { +#if !defined(__WXMSW__) || wxUSE_WXDIB if ( img.Ok() ) { delete m_bitmap; @@ -459,9 +454,9 @@ void wxHtmlImageCell::SetImage(const wxImage& img) ww = img.GetWidth(); hh = img.GetHeight(); - if ( m_bmpW == -1 ) + if ( m_bmpW == wxDefaultCoord) m_bmpW = ww; - if ( m_bmpH == -1 ) + if ( m_bmpH == wxDefaultCoord) m_bmpH = hh; // Only scale the bitmap at the rendering stage, @@ -476,6 +471,7 @@ void wxHtmlImageCell::SetImage(const wxImage& img) */ m_bitmap = new wxBitmap(img); } +#endif } #if wxUSE_GIF && wxUSE_TIMER @@ -483,9 +479,12 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer) { wxImage img; - m_gifDecoder->GoNextFrame(TRUE); + // advance current frame + m_nCurrFrame++; + if (m_nCurrFrame == m_gifDecoder->GetFrameCount()) + m_nCurrFrame = 0; - if ( m_physX == -1 ) + if ( m_physX == wxDefaultCoord ) { m_physX = m_physY = 0; for (wxHtmlCell *cell = this; cell; cell = cell->GetParent()) @@ -495,35 +494,69 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer) } } - int x, y; - m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y); - wxRect rect(x, y, m_Width, m_Height); + wxWindow *win = m_windowIface->GetHTMLWindow(); + wxPoint pos = + m_windowIface->HTMLCoordsToWindow(this, wxPoint(m_physX, m_physY)); + wxRect rect(pos, wxSize(m_Width, m_Height)); - if ( m_window->GetClientRect().Intersects(rect) && - m_gifDecoder->ConvertToImage(&img) ) + if ( win->GetClientRect().Intersects(rect) && + m_gifDecoder->ConvertToImage(m_nCurrFrame, &img) ) { - if ( (int)m_gifDecoder->GetWidth() != m_Width || - (int)m_gifDecoder->GetHeight() != m_Height || - m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 ) +#if !defined(__WXMSW__) || wxUSE_WXDIB + if ( m_gifDecoder->GetFrameSize(m_nCurrFrame) != wxSize(m_Width, m_Height) || + m_gifDecoder->GetFramePosition(m_nCurrFrame) != wxPoint(0, 0) ) { wxBitmap bmp(img); wxMemoryDC dc; dc.SelectObject(*m_bitmap); - dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(), - TRUE /* use mask */); + dc.DrawBitmap(bmp, m_gifDecoder->GetFramePosition(m_nCurrFrame), + true /* use mask */); } else +#endif SetImage(img); - m_window->Refresh(img.HasMask(), &rect); + win->Refresh(img.HasMask(), &rect); } - timer->Start(m_gifDecoder->GetDelay(), TRUE); + long delay = m_gifDecoder->GetDelay(m_nCurrFrame); + if ( delay == 0 ) + delay = 1; + timer->Start(delay, true); } void wxHtmlImageCell::Layout(int w) { + if (m_bmpWpercent) + { + + m_Width = w*m_bmpW/100; + + if (!m_bmpHpresent && m_bitmap != NULL) + m_Height = m_bitmap->GetHeight()*m_Width/m_bitmap->GetWidth(); + else + m_Height = static_cast(m_scale*m_bmpH); + } else + { + m_Width = static_cast(m_scale*m_bmpW); + m_Height = static_cast(m_scale*m_bmpH); + } + + switch (m_align) + { + case wxHTML_ALIGN_TOP : + m_Descent = m_Height; + break; + case wxHTML_ALIGN_CENTER : + m_Descent = m_Height / 2; + break; + case wxHTML_ALIGN_BOTTOM : + default : + m_Descent = 0; + break; + } + wxHtmlCell::Layout(w); - m_physX = m_physY = -1; + m_physX = m_physY = wxDefaultCoord; } #endif @@ -555,24 +588,24 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, // and height, so we only do the scaling once. double imageScaleX = 1.0; double imageScaleY = 1.0; - if (m_bmpW != m_bitmap->GetWidth()) - imageScaleX = (double) m_bmpW / (double) m_bitmap->GetWidth(); - if (m_bmpH != m_bitmap->GetHeight()) - imageScaleY = (double) m_bmpH / (double) m_bitmap->GetHeight(); - + if (m_Width != m_bitmap->GetWidth()) + imageScaleX = (double) m_Width / (double) m_bitmap->GetWidth(); + if (m_Height != m_bitmap->GetHeight()) + imageScaleY = (double) m_Height / (double) m_bitmap->GetHeight(); + double us_x, us_y; dc.GetUserScale(&us_x, &us_y); - dc.SetUserScale(us_x * m_scale * imageScaleX, us_y * m_scale * imageScaleY); + dc.SetUserScale(us_x * imageScaleX, us_y * imageScaleY); - dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (m_scale*imageScaleX)), - (int) ((y + m_PosY) / (m_scale*imageScaleY)), TRUE); + dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (imageScaleX)), + (int) ((y + m_PosY) / (imageScaleY)), true); dc.SetUserScale(us_x, us_y); } } wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const { - if (m_mapName.IsEmpty()) + if (m_mapName.empty()) return wxHtmlCell::GetLink( x, y ); if (!m_imageMap) { @@ -615,7 +648,9 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") { if (tag.HasParam(wxT("SRC"))) { - int w = -1, h = -1; + int w = wxDefaultCoord, h = wxDefaultCoord; + bool wpercent = false; + bool hpresent = false; int al; wxFSFile *str; wxString tmp = tag.GetParam(wxT("SRC")); @@ -624,9 +659,25 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp); if (tag.HasParam(wxT("WIDTH"))) - tag.GetParamAsInt(wxT("WIDTH"), &w); + { + wxString param = tag.GetParam(wxT("WIDTH")); + wxSscanf(param.c_str(), wxT("%i"), &w); + if (param.EndsWith(wxT("%"))) { + if (w < 0) + w = 0; + else if (w > 100) + w = 100; + wpercent = true; + } + + } + if (tag.HasParam(wxT("HEIGHT"))) + { tag.GetParamAsInt(wxT("HEIGHT"), &h); + hpresent = true; + } + al = wxHTML_ALIGN_BOTTOM; if (tag.HasParam(wxT("ALIGN"))) { @@ -640,17 +691,17 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") if (tag.HasParam(wxT("USEMAP"))) { mn = tag.GetParam( wxT("USEMAP") ); - if (mn.GetChar(0) == wxT('#')) + if ( !mn.empty() && *mn.begin() == '#' ) { mn = mn.Mid( 1 ); } } wxHtmlImageCell *cel = new wxHtmlImageCell( - m_WParser->GetWindow(), - str, w, h, + m_WParser->GetWindowInterface(), + str, w, wpercent, h, hpresent, m_WParser->GetPixelScale(), al, mn); - cel->SetLink(m_WParser->GetLink()); + m_WParser->ApplyStateToCell(cel); cel->SetId(tag.GetParam(wxT("id"))); // may be empty m_WParser->GetContainer()->InsertCell(cel); if (str) @@ -697,16 +748,17 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") } if (cel != NULL && tag.HasParam(wxT("HREF"))) { - wxString tmp = tag.GetParam(wxT("HREF")); - wxString target = wxEmptyString; - if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET")); - cel->SetLink( wxHtmlLinkInfo(tmp, target)); + wxString target; + if (tag.HasParam(wxT("TARGET"))) + target = tag.GetParam(wxT("TARGET")); + cel->SetLink(wxHtmlLinkInfo(tag.GetParam(wxT("HREF")), target)); } - if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel ); + if (cel != NULL) + m_WParser->GetContainer()->InsertCell( cel ); } } - return FALSE; + return false; } TAG_HANDLER_END(IMG)