X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d963ba2cb9833ba0d3210a12f3c396d0853b1fd..a328684392b1a97623ff02cb4bb174d25f376900:/src/html/m_image.cpp diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 3f479801f6..a142580cd4 100644 --- a/src/html/m_image.cpp +++ b/src/html/m_image.cpp @@ -7,7 +7,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation #endif @@ -16,7 +16,7 @@ #include "wx/defs.h" #if wxUSE_HTML && wxUSE_STREAMS -#ifdef __BORDLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop #endif @@ -29,10 +29,13 @@ #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 @@ -47,11 +50,11 @@ WX_DECLARE_OBJARRAY(int, CoordArray); WX_DEFINE_OBJARRAY(CoordArray); -//-------------------------------------------------------------------------------- +// --------------------------------------------------------------------------- // wxHtmlImageMapAreaCell -// 0-width, 0-height cell that represents single area in imagemap -// (it's GetLink is called from wxHtmlImageCell's) -//-------------------------------------------------------------------------------- +// 0-width, 0-height cell that represents single area in +// imagemap (it's GetLink is called from wxHtmlImageCell's) +// --------------------------------------------------------------------------- class wxHtmlImageMapAreaCell : public wxHtmlCell { @@ -64,6 +67,13 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell public: wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0); virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) {} + + + DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell) }; @@ -236,6 +246,12 @@ class wxHtmlImageMapCell : public wxHtmlCell public: virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; virtual const wxHtmlCell *Find( int cond, const void *param ) const; + void Draw(wxDC& WXUNUSED(dc), + int WXUNUSED(x), int WXUNUSED(y), + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) {} + + DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell) }; @@ -275,11 +291,12 @@ class wxHtmlImageCell : public wxHtmlCell { public: wxHtmlImageCell(wxWindow *window, - wxFSFile *input, int w = -1, int h = -1, - double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, + wxFSFile *input, int w = -1, int h = -1, + double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, const wxString& mapname = wxEmptyString); ~wxHtmlImageCell(); - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); + 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; void SetImage(const wxImage& img); @@ -291,6 +308,7 @@ public: private: wxBitmap *m_bitmap; int m_bmpW, m_bmpH; + bool m_showFrame:1; wxScrolledWindow *m_window; #if wxUSE_GIF && wxUSE_TIMER wxGIFDecoder *m_gifDecoder; @@ -300,6 +318,8 @@ private: double m_scale; wxHtmlImageMapCell *m_imageMap; wxString m_mapName; + + DECLARE_NO_COPY_CLASS(wxHtmlImageCell) }; #if wxUSE_GIF && wxUSE_TIMER @@ -314,20 +334,24 @@ class wxGIFTimer : public wxTimer private: wxHtmlImageCell *m_cell; + + DECLARE_NO_COPY_CLASS(wxGIFTimer) }; #endif -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxHtmlImageCell -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- + -wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, - int w, int h, double scale, int align, +wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, + int w, int h, double scale, int align, const wxString& mapname) : wxHtmlCell() { - m_window = wxStaticCast(window, wxScrolledWindow); + m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL; m_scale = scale; + m_showFrame = FALSE; m_bitmap = NULL; m_bmpW = w; m_bmpH = h; @@ -340,47 +364,72 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, m_physX = m_physY = -1; #endif - wxInputStream *s = input->GetStream(); - - if ( s ) + if ( m_bmpW && m_bmpH ) { - bool readImg = TRUE; - -#if wxUSE_GIF && wxUSE_TIMER - if ( (input->GetLocation().Matches(wxT("*.gif")) || - input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) + if ( input ) { - m_gifDecoder = new wxGIFDecoder(s, TRUE); - if ( m_gifDecoder->ReadGIF() == wxGIF_OK ) - { - wxImage img; - if ( m_gifDecoder->ConvertToImage(&img) ) - SetImage(img); + wxInputStream *s = input->GetStream(); - readImg = FALSE; + if ( s ) + { + bool readImg = TRUE; - if ( m_gifDecoder->IsAnimation() ) +#if wxUSE_GIF && wxUSE_TIMER + if ( (input->GetLocation().Matches(wxT("*.gif")) || + input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) { - m_gifTimer = new wxGIFTimer(this); - m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE); + m_gifDecoder = new wxGIFDecoder(s, TRUE); + if ( m_gifDecoder->ReadGIF() == wxGIF_OK ) + { + wxImage img; + if ( m_gifDecoder->ConvertToImage(&img) ) + SetImage(img); + + readImg = FALSE; + + if ( m_gifDecoder->IsAnimation() ) + { + m_gifTimer = new wxGIFTimer(this); + m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE); + } + else + { + wxDELETE(m_gifDecoder); + } + } + else + { + wxDELETE(m_gifDecoder); + } } - else + + if ( readImg ) +#endif // wxUSE_GIF && wxUSE_TIMER { - wxDELETE(m_gifDecoder); + wxImage image(*s, wxBITMAP_TYPE_ANY); + if ( image.Ok() ) + SetImage(image); } } + } + else // input==NULL, use "broken image" bitmap + { + if ( m_bmpW == -1 && m_bmpH == -1 ) + { + m_bmpW = 29; + m_bmpH = 31; + } else { - wxDELETE(m_gifDecoder); + m_showFrame = TRUE; + if ( m_bmpW == -1 ) m_bmpW = 31; + if ( m_bmpH == -1 ) m_bmpH = 33; } - } - - if ( readImg ) -#endif - { - SetImage(wxImage(*s, wxBITMAP_TYPE_ANY)); + 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); @@ -446,7 +495,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer) m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y); wxRect rect(x, y, m_Width, m_Height); - if ( m_window->GetClientRect().Intersects(rect) && + if ( m_window->GetClientRect().Intersects(rect) && m_gifDecoder->ConvertToImage(&img) ) { if ( (int)m_gifDecoder->GetWidth() != m_Width || @@ -456,7 +505,8 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer) wxBitmap bmp(img); wxMemoryDC dc; dc.SelectObject(*m_bitmap); - dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop()); + dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(), + TRUE /* use mask */); } else SetImage(img); @@ -484,9 +534,18 @@ wxHtmlImageCell::~wxHtmlImageCell() } -void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2)) +void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, + int WXUNUSED(view_y1), int WXUNUSED(view_y2), + wxHtmlRenderingInfo& WXUNUSED(info)) { - if (m_bitmap) + if ( m_showFrame ) + { + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.SetPen(*wxBLACK_PEN); + dc.DrawRectangle(x + m_PosX, y + m_PosY, m_Width, m_Height); + x++, y++; + } + if ( m_bitmap ) { double us_x, us_y; dc.GetUserScale(&us_x, &us_y); @@ -512,7 +571,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const p = p->GetParent(); } p = op; - wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, + wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, (const void*)(&m_mapName)); if (!cell) { @@ -535,6 +594,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const //-------------------------------------------------------------------------------- TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") + TAG_HANDLER_CONSTR(IMG) { } TAG_HANDLER_PROC(tag) { @@ -548,7 +608,8 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") wxString tmp = tag.GetParam(wxT("SRC")); wxString mn = wxEmptyString; - str = m_WParser->GetFS()->OpenFile(tmp); + str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp); + if (tag.HasParam(wxT("WIDTH"))) tag.GetParamAsInt(wxT("WIDTH"), &w); if (tag.HasParam(wxT("HEIGHT"))) @@ -571,18 +632,16 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") mn = mn.Mid( 1 ); } } - wxHtmlImageCell *cel = NULL; + wxHtmlImageCell *cel = new wxHtmlImageCell( + m_WParser->GetWindow(), + str, w, h, + m_WParser->GetPixelScale(), + al, mn); + cel->SetLink(m_WParser->GetLink()); + cel->SetId(tag.GetParam(wxT("id"))); // may be empty + m_WParser->GetContainer()->InsertCell(cel); if (str) - { - cel = new wxHtmlImageCell(m_WParser->GetWindow(), - str, w, h, - m_WParser->GetPixelScale(), - al, mn); - cel->SetLink(m_WParser->GetLink()); - cel->SetId(tag.GetParam(wxT("id"))); // may be empty - m_WParser->GetContainer()->InsertCell(cel); delete str; - } } } if (tag.GetName() == wxT("MAP"))