/////////////////////////////////////////////////////////////////////////////
-// Name: m_image.cpp
+// Name: src/html/m_image.cpp
// Purpose: wxHtml module for displaying images
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Copyright: (c) 1999 Vaclav Slavik, Joel Lucsy
-// Licence: wxWindows Licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "wx/wxprec.h"
-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
+#if wxUSE_HTML && wxUSE_STREAMS
+
#ifndef WXPRECOMP
+ #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"
#endif
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
+#include "wx/html/htmlwin.h"
-#include "wx/image.h"
-#include "wx/dynarray.h"
+#include "wx/gifdecod.h"
+#include "wx/artprov.h"
-#include <math.h>
#include <float.h>
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)
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
// 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
{
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)
};
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 );
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)
};
class wxHtmlImageCell : public wxHtmlCell
{
- public:
- wxBitmap *m_Image;
- double m_Scale;
- wxHtmlImageMapCell *m_ImageMap;
- wxString m_MapName;
-
- wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);
- ~wxHtmlImageCell() {if (m_Image) delete m_Image; }
- void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
- virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
+public:
+ wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
+ wxFSFile *input, int w = wxDefaultCoord, int h = wxDefaultCoord,
+ double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
+ const wxString& mapname = wxEmptyString);
+ 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;
+
+ void SetImage(const wxImage& img);
+#if wxUSE_GIF && wxUSE_TIMER
+ void AdvanceAnimation(wxTimer *timer);
+ virtual void Layout(int w);
+#endif
+
+private:
+ wxBitmap *m_bitmap;
+ int m_bmpW, m_bmpH;
+ bool m_showFrame:1;
+ wxHtmlWindowInterface *m_windowIface;
+#if wxUSE_GIF && wxUSE_TIMER
+ wxGIFDecoder *m_gifDecoder;
+ wxTimer *m_gifTimer;
+ int m_physX, m_physY;
+#endif
+ double m_scale;
+ wxHtmlImageMapCell *m_imageMap;
+ wxString m_mapName;
+
+ DECLARE_NO_COPY_CLASS(wxHtmlImageCell)
};
+#if wxUSE_GIF && wxUSE_TIMER
+class wxGIFTimer : public wxTimer
+{
+ public:
+ wxGIFTimer(wxHtmlImageCell *cell) : m_cell(cell) {}
+ virtual void Notify()
+ {
+ m_cell->AdvanceAnimation(this);
+ }
+
+ private:
+ wxHtmlImageCell *m_cell;
+ DECLARE_NO_COPY_CLASS(wxGIFTimer)
+};
+#endif
-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
// wxHtmlImageCell
-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+
-wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, int align, wxString mapname) : wxHtmlCell()
+wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
+ wxFSFile *input,
+ int w, int h, double scale, int align,
+ const wxString& mapname) : wxHtmlCell()
{
- wxImage *img;
- int ww, hh, bw, bh;
- wxInputStream *s = input->GetStream();
-
- m_Scale = scale;
- img = new wxImage(*s, wxBITMAP_TYPE_ANY);
- m_Image = NULL;
- if (img && (img->Ok()))
+ m_windowIface = windowIface;
+ m_scale = scale;
+ m_showFrame = false;
+ m_bitmap = NULL;
+ m_bmpW = w;
+ m_bmpH = h;
+ m_imageMap = NULL;
+ m_mapName = mapname;
+ SetCanLiveOnPagebreak(false);
+#if wxUSE_GIF && wxUSE_TIMER
+ m_gifDecoder = NULL;
+ m_gifTimer = NULL;
+ m_physX = m_physY = wxDefaultCoord;
+#endif
+
+ if ( m_bmpW && m_bmpH )
{
- ww = img->GetWidth();
- hh = img->GetHeight();
- if (w != -1) bw = w; else bw = ww;
- if (h != -1) bh = h; else bh = hh;
+ if ( input )
+ {
+ wxInputStream *s = input->GetStream();
+
+ if ( s )
+ {
+#if wxUSE_GIF && wxUSE_TIMER
+ 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 )
+ {
+ wxImage img;
+ if ( m_gifDecoder->ConvertToImage(&img) )
+ SetImage(img);
- m_Width = (int)(scale * (double)bw);
- m_Height = (int)(scale * (double)bh);
+ 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);
+ }
+ }
- if ((bw != ww) || (bh != hh))
+ if ( readImg )
+#endif // wxUSE_GIF && wxUSE_TIMER
+ {
+ wxImage image(*s, wxBITMAP_TYPE_ANY);
+ if ( image.Ok() )
+ SetImage(image);
+ }
+ }
+ }
+ else // input==NULL, use "broken image" bitmap
{
- wxImage img2 = img->Scale(bw, bh);
- m_Image = new wxBitmap(img2.ConvertToBitmap());
+ if ( m_bmpW == wxDefaultCoord && m_bmpH == wxDefaultCoord )
+ {
+ m_bmpW = 29;
+ m_bmpH = 31;
+ }
+ else
+ {
+ m_showFrame = true;
+ if ( m_bmpW == wxDefaultCoord ) m_bmpW = 31;
+ if ( m_bmpH == wxDefaultCoord ) m_bmpH = 33;
+ }
+ m_bitmap =
+ new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
}
- else
- m_Image = new wxBitmap(img->ConvertToBitmap());
- delete img;
}
+ //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 = 0;
break;
}
+ }
+
+void wxHtmlImageCell::SetImage(const wxImage& img)
+{
+#if !defined(__WXMSW__) || wxUSE_WXDIB
+ if ( img.Ok() )
+ {
+ delete m_bitmap;
+
+ int ww, hh;
+ ww = img.GetWidth();
+ hh = img.GetHeight();
+
+ if ( m_bmpW == wxDefaultCoord )
+ m_bmpW = ww;
+ if ( m_bmpH == wxDefaultCoord )
+ 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);
+ }
+#endif
+}
+
+#if wxUSE_GIF && wxUSE_TIMER
+void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
+{
+ wxImage img;
+
+ m_gifDecoder->GoNextFrame(true);
+
+ if ( m_physX == wxDefaultCoord )
+ {
+ m_physX = m_physY = 0;
+ for (wxHtmlCell *cell = this; cell; cell = cell->GetParent())
+ {
+ m_physX += cell->GetPosX();
+ m_physY += cell->GetPosY();
+ }
+ }
+
+ 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 ( win->GetClientRect().Intersects(rect) &&
+ m_gifDecoder->ConvertToImage(&img) )
+ {
+#if !defined(__WXMSW__) || wxUSE_WXDIB
+ if ( (int)m_gifDecoder->GetWidth() != m_Width ||
+ (int)m_gifDecoder->GetHeight() != m_Height ||
+ m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )
+ {
+ wxBitmap bmp(img);
+ wxMemoryDC dc;
+ dc.SelectObject(*m_bitmap);
+ dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(),
+ true /* use mask */);
+ }
+ else
+#endif
+ SetImage(img);
+ win->Refresh(img.HasMask(), &rect);
+ }
+
+ timer->Start(m_gifDecoder->GetDelay(), true);
+}
- m_ImageMap = NULL;
- m_MapName = mapname;
- SetCanLiveOnPagebreak(FALSE);
+void wxHtmlImageCell::Layout(int w)
+{
+ wxHtmlCell::Layout(w);
+ m_physX = m_physY = wxDefaultCoord;
}
+#endif
+
+wxHtmlImageCell::~wxHtmlImageCell()
+{
+ delete m_bitmap;
+#if wxUSE_GIF && wxUSE_TIMER
+ delete m_gifTimer;
+ delete m_gifDecoder;
+#endif
+}
-void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
+ int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+ wxHtmlRenderingInfo& WXUNUSED(info))
{
- if (m_Image)
+ 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 )
+ {
+ // 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_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
- dc.DrawBitmap(*m_Image, (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);
}
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
}
wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
{
- if (m_MapName.IsEmpty())
+ if (m_mapName.empty())
return wxHtmlCell::GetLink( x, y );
- if (!m_ImageMap)
+ if (!m_imageMap)
{
wxHtmlContainerCell *p, *op;
op = p = GetParent();
p = p->GetParent();
}
p = op;
- wxHtmlCell *cell = (wxHtmlCell*)p->Find( wxHTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));
+ wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP,
+ (const void*)(&m_mapName));
if (!cell)
{
- ((wxString&)m_MapName).Clear();
+ ((wxString&)m_mapName).Clear();
return wxHtmlCell::GetLink( x, y );
}
{ // dirty hack, ask Joel why he fills m_ImageMap in this place
// THE problem is that we're in const method and we can't modify m_ImageMap
- wxHtmlImageMapCell **cx = (wxHtmlImageMapCell**)(&m_ImageMap);
+ wxHtmlImageMapCell **cx = (wxHtmlImageMapCell**)(&m_imageMap);
*cx = (wxHtmlImageMapCell*)cell;
}
}
- return m_ImageMap->GetLink( x, y );
+ return m_imageMap->GetLink(x, y);
}
//--------------------------------------------------------------------------------
TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
+ TAG_HANDLER_CONSTR(IMG) { }
TAG_HANDLER_PROC(tag)
{
{
if (tag.HasParam(wxT("SRC")))
{
- int w = -1, h = -1;
+ int w = wxDefaultCoord, h = wxDefaultCoord;
int al;
wxFSFile *str;
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")))
mn = mn.Mid( 1 );
}
}
- wxHtmlImageCell *cel = NULL;
+ wxHtmlImageCell *cel = new wxHtmlImageCell(
+ m_WParser->GetWindowInterface(),
+ str, w, h,
+ m_WParser->GetPixelScale(),
+ al, mn);
+ m_WParser->ApplyStateToCell(cel);
+ cel->SetId(tag.GetParam(wxT("id"))); // may be empty
+ m_WParser->GetContainer()->InsertCell(cel);
if (str)
- {
- cel = new wxHtmlImageCell(str, w, h, m_WParser->GetPixelScale(), al, mn);
- cel->SetLink(m_WParser->GetLink());
- m_WParser->GetContainer()->InsertCell(cel);
delete str;
- }
}
}
if (tag.GetName() == wxT("MAP"))
}
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)
projects / wxWidgets.git / blobdiff