X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cc4e6b81a9f2a0275d7fa0c6171658b24a2af8a..d223107206e4dfa6768e0bc2455325dd49e4d2bb:/src/html/m_image.cpp diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 9fb42a9500..58aaa45e23 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 @@ -34,6 +34,8 @@ #include "wx/image.h" #include "wx/gifdecod.h" #include "wx/dynarray.h" +#include "wx/log.h" +#include "wx/artprov.h" #include #include @@ -48,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 { @@ -65,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) }; @@ -237,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) }; @@ -276,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); @@ -302,6 +318,8 @@ private: double m_scale; wxHtmlImageMapCell *m_imageMap; wxString m_mapName; + + DECLARE_NO_COPY_CLASS(wxHtmlImageCell) }; #if wxUSE_GIF && wxUSE_TIMER @@ -316,58 +334,19 @@ class wxGIFTimer : public wxTimer private: wxHtmlImageCell *m_cell; + + DECLARE_NO_COPY_CLASS(wxGIFTimer) }; #endif -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- // wxHtmlImageCell -//-------------------------------------------------------------------------------- +//---------------------------------------------------------------------------- + -/* XPM */ -static const char * broken_image_xpm[] = { -"29 31 7 1", -" c None", -". c #808080", -"+ c #FFFFFF", -"@ c #C0C0C0", -"# c #000000", -"$ c #333366", -"% c #B2B2B2", -"..................... ", -".+++++++++++++++++++.. ", -".+++++++++++++++++++.@. ", -".++@@@@@@@@@@@@@@@@@.+@. ", -".++@@@@@@@@@@@@@@@@@.++@. ", -".++@@@@@.@@@@.@@@@@@.+++@. ", -".++@@@@@@@@@@@@@@@@@.++++@. ", -".++@@@@@@@@@@@@@@@@@.+++++@. ", -".++@@.@@@@@@@@@@.@@@######## ", -".++@@@@@@@@@@@@@@@@@@$$$$$$#.", -".######@@@@@@@@@@@@@@@.....#.", -" ###@@@@@@@@@@@@@@@++#.", -" #####@@@@@@@@@@++#.", -" #@.@@@@@@@@++#.", -".. ###@@@@@@@++#.", -".+.... #@@@@@@++#.", -".++@@@... ####@@++#.", -".++@@@@@@.. #####.", -".++@@@@@@@@... ", -".++@@@@@@%%%%@. ", -".++@@@@@@%%%%@@.... ", -".++@@@@@@%%%%@@@@@@.... ", -".++@@@@@@%%%%@@@@@@@@@@.... ", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++@@@@@@@@@@@@@@@@@@@@@@++#.", -".++++++++++++++++++++++++++#.", -".++++++++++++++++++++++++++#.", -"############################."}; - -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 = window ? wxStaticCast(window, wxScrolledWindow) : NULL; @@ -385,64 +364,72 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, m_physX = m_physY = -1; #endif - if ( input ) + if ( m_bmpW && m_bmpH ) { - wxInputStream *s = input->GetStream(); - - if ( s ) + if ( input ) { - bool readImg = TRUE; + wxInputStream *s = input->GetStream(); -#if wxUSE_GIF && wxUSE_TIMER - if ( (input->GetLocation().Matches(wxT("*.gif")) || - input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) + if ( s ) { - m_gifDecoder = new wxGIFDecoder(s, TRUE); - if ( m_gifDecoder->ReadGIF() == wxGIF_OK ) + bool readImg = TRUE; + +#if wxUSE_GIF && wxUSE_TIMER + if ( (input->GetLocation().Matches(wxT("*.gif")) || + input->GetLocation().Matches(wxT("*.GIF"))) && m_window ) { - wxImage img; - if ( m_gifDecoder->ConvertToImage(&img) ) - SetImage(img); + m_gifDecoder = new wxGIFDecoder(s, TRUE); + if ( m_gifDecoder->ReadGIF() == wxGIF_OK ) + { + wxImage img; + if ( m_gifDecoder->ConvertToImage(&img) ) + SetImage(img); - readImg = FALSE; + readImg = FALSE; - if ( m_gifDecoder->IsAnimation() ) - { - m_gifTimer = new wxGIFTimer(this); - m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE); + 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); } } - - if ( readImg ) -#endif - { - SetImage(wxImage(*s, wxBITMAP_TYPE_ANY)); - } - } - } - else // input==NULL, use "broken image" bitmap - { - if ( m_bmpW == -1 && m_bmpH == -1 ) - { - m_bmpW == 29, m_bmpH = 31; } - else + else // input==NULL, use "broken image" bitmap { - m_showFrame = TRUE; - if ( m_bmpW == -1 ) m_bmpW = 31; - if ( m_bmpH == -1 ) m_bmpH = 33; + if ( m_bmpW == -1 && m_bmpH == -1 ) + { + 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_bitmap = + new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE)); } - m_bitmap = new wxBitmap(broken_image_xpm); } + //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); @@ -477,12 +464,16 @@ void wxHtmlImageCell::SetImage(const wxImage& img) if ( m_bmpH == -1 ) m_bmpH = hh; + // Only scale the bitmap at the rendering stage, + // so we don't lose quality twice +/* if ((m_bmpW != ww) || (m_bmpH != hh)) { wxImage img2 = img.Scale(m_bmpW, m_bmpH); m_bitmap = new wxBitmap(img2); } else +*/ m_bitmap = new wxBitmap(img); } } @@ -508,7 +499,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 || @@ -518,7 +509,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); @@ -546,7 +538,9 @@ 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_showFrame ) { @@ -557,12 +551,21 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WX } if ( m_bitmap ) { + // We add in the scaling from the desired bitmap width + // 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(); + double us_x, us_y; dc.GetUserScale(&us_x, &us_y); - dc.SetUserScale(us_x * m_scale, us_y * m_scale); + dc.SetUserScale(us_x * m_scale * imageScaleX, us_y * m_scale * imageScaleY); - dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / m_scale), - (int) ((y + m_PosY) / m_scale), TRUE); + dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (m_scale*imageScaleX)), + (int) ((y + m_PosY) / (m_scale*imageScaleY)), TRUE); dc.SetUserScale(us_x, us_y); } } @@ -581,7 +584,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) { @@ -604,6 +607,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const //-------------------------------------------------------------------------------- TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") + TAG_HANDLER_CONSTR(IMG) { } TAG_HANDLER_PROC(tag) { @@ -616,9 +620,9 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") wxFSFile *str; wxString tmp = tag.GetParam(wxT("SRC")); wxString mn = wxEmptyString; - + str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp); - + if (tag.HasParam(wxT("WIDTH"))) tag.GetParamAsInt(wxT("WIDTH"), &w); if (tag.HasParam(wxT("HEIGHT"))) @@ -643,8 +647,8 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") } wxHtmlImageCell *cel = new wxHtmlImageCell( m_WParser->GetWindow(), - str, w, h, - m_WParser->GetPixelScale(), + str, w, h, + m_WParser->GetPixelScale(), al, mn); cel->SetLink(m_WParser->GetLink()); cel->SetId(tag.GetParam(wxT("id"))); // may be empty