since DoScreenToClient and ClientToScreen in toplvlcmn are implemented by calling...

[wxWidgets.git] / src / html / m_image.cpp

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 020c60230ee946c780492671edd7a98ba1073537..4ab735e28ae4b6cf57a84c36e506b5bfdece81dc 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mod_image.cpp
+// Name:        m_image.cpp

 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -14,33 +14,36 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP

-#include "wx/wx.h"
+    #include "wx/dc.h"
+    #include "wx/scrolwin.h"
+    #include "wx/timer.h"
+    #include "wx/dcmemory.h"

 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 

-

 #include "wx/image.h"
 #include "wx/image.h"

+#include "wx/gifdecod.h"

 #include "wx/dynarray.h"
 
 #include <math.h>
 #include <float.h>
 
 #include "wx/dynarray.h"
 
 #include <math.h>
 #include <float.h>
 

-FORCE_LINK_ME(mod_image)
+FORCE_LINK_ME(m_image)

 
 
 
 
 WX_DECLARE_OBJARRAY(int, CoordArray);
 
 
 
 
 WX_DECLARE_OBJARRAY(int, CoordArray);

-#include <wx/arrimpl.cpp> // this is a magic incantation which must be done!
+#include "wx/arrimpl.cpp" // this is a magic incantation which must be done!

 WX_DEFINE_OBJARRAY(CoordArray);
 
 
 WX_DEFINE_OBJARRAY(CoordArray);
 
 


@@ -52,161 +55,161 @@ WX_DEFINE_OBJARRAY(CoordArray);
 
 class wxHtmlImageMapAreaCell : public wxHtmlCell
 {
 
 class wxHtmlImageMapAreaCell : public wxHtmlCell
 {

-public:
-       enum celltype{ CIRCLE, RECT, POLY };
-protected:
-       CoordArray coords;
-       celltype type;
-       int     radius;
-public:
-       wxHtmlImageMapAreaCell( celltype t, wxString &coords );
-       virtual wxString GetLink( int x = 0, int y = 0 ) const;
+    public:
+        enum celltype { CIRCLE, RECT, POLY };
+    protected:
+        CoordArray coords;
+        celltype type;
+        int radius;
+    public:
+        wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;

 };
 
 
 
 
 
 };
 
 
 
 
 

-wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords )
+wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype t, wxString &incoords, double pixel_scale )

 {
 {

-       int     i;
-       wxString x = incoords, y;
-
-       type = t;
-       while ((i = x.Find( ',' )) != -1)
-       {
-               coords.Add( atoi( x.Left( i ).c_str() ) );
-               x = x.Mid( i + 1 );
-       }
-       coords.Add( atoi( x.c_str() ) );
+    int i;
+    wxString x = incoords, y;
+
+    type = t;
+    while ((i = x.Find( ',' )) != -1)
+    {
+        coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );
+        x = x.Mid( i + 1 );
+    }
+    coords.Add( (int)(pixel_scale * (double)wxAtoi( x.c_str())) );

 }
 
 }
 

-wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const

 {
 {

-       switch (type)
-       {
-               case RECT:
-               {
-                       int     l, t, r, b;
-
-                       l = coords[ 0 ];
-                       t = coords[ 1 ];
-                       r = coords[ 2 ];
-                       b = coords[ 3 ];
-                       if (x >= l && x <= r && y >= t && y <= b)
-                       {
-                               return m_Link;
-                       }
-                       break;
-               }
-               case CIRCLE:
-               {
-                       int     l, t, r;
-                       double  d;
-
-                       l = coords[ 0 ];
-                       t = coords[ 1 ];
-                       r = coords[ 2 ];
-                       d = sqrt( ((x - l) * (x - l)) + ((y - t) * (y - t)) );
-                       if (d < (double)r)
-                       {
-                               return m_Link;
-                       }
-               }
-                       break;
-               case POLY:
-               {
-                       if (coords.GetCount() >= 6)
-                       {
-                               int     intersects = 0;
-                               int     wherex = x;
-                               int     wherey = y;
-                               int     totalv = coords.GetCount() / 2;
-                               int     totalc = totalv * 2;
-                               int     xval = coords[totalc - 2];
-                               int     yval = coords[totalc - 1];
-                               int     end = totalc;
-                               int     pointer = 1;
-
-                               if ((yval >= wherey) != (coords[pointer] >= wherey))
-                               {
-                                       if ((xval >= wherex) == (coords[0] >= wherex))
-                                       {
-                                               intersects += (xval >= wherex) ? 1 : 0;
-                                       }
-                                       else
-                                       {
-                                               intersects += ((xval - (yval - wherey) *
-                                               (coords[0] - xval) /
-                                               (coords[pointer] - yval)) >= wherex) ? 1 : 0;
-                                       }
-                               }
-
-                               while (pointer < end)
-                               {
-                                       yval = coords[pointer];
-                                       pointer += 2;
-                                       if (yval >= wherey)
-                                       {
-                                               while((pointer < end) && (coords[pointer] >= wherey))
-                                               {
-                                                       pointer+=2;
-                                               }
-                                               if (pointer >= end)
-                                               {
-                                                       break;
-                                               }
-                                               if ((coords[pointer-3] >= wherex) ==
-                                                       (coords[pointer-1] >= wherex))
-                                               {
-                                                       intersects += (coords[pointer-3] >= wherex) ? 1 : 0;
-                                               }
-                                               else
-                                               {
-                                                       intersects +=
-                                                               ((coords[pointer-3] - (coords[pointer-2] - wherey) *
-                                                               (coords[pointer-1] - coords[pointer-3]) /
-                                                               (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1:0;
-                                               }
-                                       }
-                                       else
-                                       {
-                                               while((pointer < end) && (coords[pointer] < wherey))
-                                               {
-                                                       pointer+=2;
-                                               }
-                                               if (pointer >= end)
-                                               {
-                                                       break;
-                                               }
-                                               if ((coords[pointer-3] >= wherex) ==
-                                                       (coords[pointer-1] >= wherex))
-                                               {
-                                                       intersects += (coords[pointer-3] >= wherex) ? 1:0;
-                                               }
-                                               else
-                                               {
-                                                       intersects +=
-                                                               ((coords[pointer-3] - (coords[pointer-2] - wherey) *
-                                                               (coords[pointer-1] - coords[pointer-3]) /
-                                                               (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1:0;
-                                               }
-                                       }
-                               }
-                               if ((intersects & 1) != 0)
-                               {
-                                       return m_Link;
-                               }
-                       }
-               }
-                       break;
-       }
-       if (m_Next)
-       {
-               wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;
-               return a->GetLink( x, y );
-       }
-       return wxEmptyString;
+    switch (type)
+    {
+        case RECT:
+            {
+                int l, t, r, b;
+
+                l = coords[ 0 ];
+                t = coords[ 1 ];
+                r = coords[ 2 ];
+                b = coords[ 3 ];
+                if (x >= l && x <= r && y >= t && y <= b)
+                {
+                    return m_Link;
+                }
+                break;
+            }
+        case CIRCLE:
+            {
+                int l, t, r;
+                double  d;
+
+                l = coords[ 0 ];
+                t = coords[ 1 ];
+                r = coords[ 2 ];
+                d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );
+                if (d < (double)r)
+                {
+                    return m_Link;
+                }
+            }
+            break;
+        case POLY:
+            {
+                if (coords.GetCount() >= 6)
+                {
+                    int intersects = 0;
+                    int wherex = x;
+                    int wherey = y;
+                    int totalv = coords.GetCount() / 2;
+                    int totalc = totalv * 2;
+                    int xval = coords[totalc - 2];
+                    int yval = coords[totalc - 1];
+                    int end = totalc;
+                    int pointer = 1;
+
+                    if ((yval >= wherey) != (coords[pointer] >= wherey))
+                    {
+                        if ((xval >= wherex) == (coords[0] >= wherex))
+                        {
+                            intersects += (xval >= wherex) ? 1 : 0;
+                        }
+                        else
+                        {
+                            intersects += ((xval - (yval - wherey) *
+                                            (coords[0] - xval) /
+                                            (coords[pointer] - yval)) >= wherex) ? 1 : 0;
+                        }
+                    }
+
+                    while (pointer < end)
+                    {
+                        yval = coords[pointer];
+                        pointer += 2;
+                        if (yval >= wherey)
+                        {
+                            while ((pointer < end) && (coords[pointer] >= wherey))
+                            {
+                                pointer += 2;
+                            }
+                            if (pointer >= end)
+                            {
+                                break;
+                            }
+                            if ((coords[pointer - 3] >= wherex) ==
+                                    (coords[pointer - 1] >= wherex)) {
+                                intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
+                            }
+                            else
+                            {
+                                intersects +=
+                                    ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
+                                      (coords[pointer - 1] - coords[pointer - 3]) /
+                                      (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
+                            }
+                        }
+                        else
+                        {
+                            while ((pointer < end) && (coords[pointer] < wherey))
+                            {
+                                pointer += 2;
+                            }
+                            if (pointer >= end)
+                            {
+                                break;
+                            }
+                            if ((coords[pointer - 3] >= wherex) ==
+                                    (coords[pointer - 1] >= wherex))
+                            {
+                                intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
+                            }
+                            else
+                            {
+                                intersects +=
+                                    ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
+                                      (coords[pointer - 1] - coords[pointer - 3]) /
+                                      (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
+                            }
+                        }
+                    }
+                    if ((intersects & 1) != 0)
+                    {
+                        return m_Link;
+                    }
+                }
+            }
+            break;
+    }
+
+    if (m_Next)
+    {
+        wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;
+        return a->GetLink( x, y );
+    }
+    return NULL;

 }
 
 
 }
 
 


@@ -220,43 +223,43 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
 // wxHtmlImageMapCell
 //                  0-width, 0-height cell that represents map from imagemaps
 //                  it is always placed before wxHtmlImageMapAreaCells
 // wxHtmlImageMapCell
 //                  0-width, 0-height cell that represents map from imagemaps
 //                  it is always placed before wxHtmlImageMapAreaCells

-//                  It responds to Find(HTML_COND_ISIMAGEMAP)
+//                  It responds to Find(wxHTML_COND_ISIMAGEMAP)

 //--------------------------------------------------------------------------------
 
 
 class wxHtmlImageMapCell : public wxHtmlCell
 {
 //--------------------------------------------------------------------------------
 
 
 class wxHtmlImageMapCell : public wxHtmlCell
 {

-public:
-       wxHtmlImageMapCell( wxString &name );
-protected:
-       wxString m_Name;
-public:
-       virtual wxString GetLink( int x = 0, int y = 0 ) const;
-       virtual const wxHtmlCell *Find( int cond, const void *param ) const;
+    public:
+        wxHtmlImageMapCell( wxString &name );
+    protected:
+        wxString m_Name;
+    public:
+        virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
+        virtual const wxHtmlCell *Find( int cond, const void *param ) const;

 };
 
 
 wxHtmlImageMapCell::wxHtmlImageMapCell( wxString &name )
 {
 };
 
 
 wxHtmlImageMapCell::wxHtmlImageMapCell( wxString &name )
 {

-       m_Name = name ;
+    m_Name = name ;

 }
 
 }
 

-wxString wxHtmlImageMapCell::GetLink( int x, int y ) const
+wxHtmlLinkInfo *wxHtmlImageMapCell::GetLink( int x, int y ) const

 {
 {

-       wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;
-       if (a)
-               return a->GetLink( x, y );
-       return wxHtmlCell::GetLink( x, y );
+    wxHtmlImageMapAreaCell  *a = (wxHtmlImageMapAreaCell*)m_Next;
+    if (a)
+        return a->GetLink( x, y );
+    return wxHtmlCell::GetLink( x, y );

 }
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {
 }
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {

-       if (cond == HTML_COND_ISIMAGEMAP)
-       {
-               if (m_Name == *((wxString*)(param)))
-                       return this;
-       }
-       return wxHtmlCell::Find(cond, param);
+    if (cond == wxHTML_COND_ISIMAGEMAP)
+    {
+        if (m_Name == *((wxString*)(param)))
+            return this;
+    }
+    return wxHtmlCell::Find(cond, param);

 }
 
 
 }
 
 


@@ -270,95 +273,259 @@ const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 
 class wxHtmlImageCell : public wxHtmlCell
 {
 
 class wxHtmlImageCell : public wxHtmlCell
 {

-    public:
-        wxBitmap *m_Image;
-       wxHtmlImageMapCell *m_ImageMap;
-       wxString m_MapName;
-
-        wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = HTML_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 wxString GetLink( int x = 0, int y = 0 ) const;
+public:
+    wxHtmlImageCell(wxWindow *window,
+                    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);
+    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;
+    wxScrolledWindow   *m_window;
+#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;

 };
 
 };
 

+#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;
+};
+#endif

 
 
 //--------------------------------------------------------------------------------
 // wxHtmlImageCell
 //--------------------------------------------------------------------------------
 
 
 
 //--------------------------------------------------------------------------------
 // wxHtmlImageCell
 //--------------------------------------------------------------------------------
 

-wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxString mapname) : wxHtmlCell()
+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;
+    m_scale = scale;
+    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 = -1;
+#endif
+
+    wxInputStream *s = input->GetStream();
+    
+    if ( s )
+    {
+        bool readImg = TRUE;
+        
+#if wxUSE_GIF && wxUSE_TIMER
+        if ( (input->GetLocation().Matches(wxT("*.gif")) ||
+              input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
+        {
+            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);
+            }
+        }
+
+        if ( readImg )
+#endif
+        {
+            SetImage(wxImage(*s, wxBITMAP_TYPE_ANY));
+        }
+    }
+
+    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)

 {
 {

-    wxImage *img;
-    int ww, hh;
-    wxInputStream *s = input -> GetStream();
-
-    img = new wxImage(*s, wxBITMAP_TYPE_ANY);
-
-    m_Image = NULL;
-    if (img && (img -> Ok())) {
-        ww = img -> GetWidth();
-        hh = img -> GetHeight();
-        if (w != -1) m_Width = w; else m_Width = ww;
-        if (h != -1) m_Height = h; else m_Height = hh;
-        if ((m_Width != ww) || (m_Height != hh)) {
-            wxImage img2 = img -> Scale(m_Width, m_Height);
-            m_Image = new wxBitmap(img2.ConvertToBitmap());
+    if ( img.Ok() )
+    {
+        delete m_bitmap;
+
+        int ww, hh;
+        ww = img.GetWidth();
+        hh = img.GetHeight();
+
+        if ( m_bmpW == -1 )
+            m_bmpW = ww;
+        if ( m_bmpH == -1 )
+            m_bmpH = hh;
+
+        if ((m_bmpW != ww) || (m_bmpH != hh))
+        {
+            wxImage img2 = img.Scale(m_bmpW, m_bmpH);
+            m_bitmap = new wxBitmap(img2);

         }
         else
         }
         else

-            m_Image = new wxBitmap(img -> ConvertToBitmap());
-        delete img;
+            m_bitmap = new wxBitmap(img);

     }
     }

-    switch (align) {
-        case HTML_ALIGN_TOP :
-                        m_Descent = m_Height; break;
-        case HTML_ALIGN_CENTER :
-                        m_Descent = m_Height / 2; break;
-        case HTML_ALIGN_BOTTOM : default :
-                        m_Descent = 0; break;
+}
+
+#if wxUSE_GIF && wxUSE_TIMER
+void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
+{
+    wxImage img;
+
+    m_gifDecoder->GoNextFrame(TRUE);
+
+    if ( m_physX == -1 )
+    {
+        m_physX = m_physY = 0;
+        for (wxHtmlCell *cell = this; cell; cell = cell->GetParent())
+        {
+            m_physX += cell->GetPosX();
+            m_physY += cell->GetPosY();
+        }

     }
 
     }
 

-    m_ImageMap = NULL;
-    m_MapName = mapname;
+    int x, y;
+    m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y);
+    wxRect rect(x, y, m_Width, m_Height);
+
+    if ( m_window->GetClientRect().Intersects(rect) && 
+         m_gifDecoder->ConvertToImage(&img) )
+    {
+        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());
+        }
+        else
+            SetImage(img);
+        m_window->Refresh(img.HasMask(), &rect);
+    }
+
+    timer->Start(m_gifDecoder->GetDelay(), TRUE);

 }
 
 }
 

+void wxHtmlImageCell::Layout(int w)
+{
+    wxHtmlCell::Layout(w);
+    m_physX = m_physY = -1;
+}

 
 

+#endif

 
 

-void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+wxHtmlImageCell::~wxHtmlImageCell()

 {
 {

-    if (m_Image)
-        dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE);
-    wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
+    delete m_bitmap;
+#if wxUSE_GIF && wxUSE_TIMER
+    delete m_gifTimer;
+    delete m_gifDecoder;
+#endif

 }
 
 }
 

-wxString wxHtmlImageCell::GetLink( int x, int y ) const
+
+void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))

 {
 {

-       if (m_MapName.IsEmpty())
-               return wxHtmlCell::GetLink( x, y );
-       if (!m_ImageMap)
-       {
-               wxHtmlContainerCell     *p, *op;
-               op = p = GetParent();
-               while (p)
-               {
-                       op = p;
-                       p = p->GetParent();
-               }
-               p = op;
-               wxHtmlCell *cell = (wxHtmlCell*)p->Find( HTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));
-               if (!cell)
-               {
-                       ((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);
-               *cx = (wxHtmlImageMapCell*)cell;
+    if (m_bitmap)
+    {
+        double us_x, us_y;
+        dc.GetUserScale(&us_x, &us_y);
+        dc.SetUserScale(us_x * m_scale, us_y * m_scale);
+
+        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / m_scale),
+                                 (int) ((y + m_PosY) / m_scale), TRUE);
+        dc.SetUserScale(us_x, us_y);
+    }
+}
+
+wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
+{
+    if (m_mapName.IsEmpty())
+        return wxHtmlCell::GetLink( x, y );
+    if (!m_imageMap)
+    {
+        wxHtmlContainerCell *p, *op;
+        op = p = GetParent();
+        while (p)
+        {
+            op = p;
+            p = p->GetParent();
+        }
+        p = op;
+        wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, 
+                                                (const void*)(&m_mapName));
+        if (!cell)
+        {
+            ((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);
+            *cx = (wxHtmlImageMapCell*)cell;

         }
         }

-       }
-       return m_ImageMap->GetLink( x, y );
+    }
+    return m_imageMap->GetLink(x, y);

 }
 
 
 }
 
 


@@ -367,97 +534,110 @@ wxString wxHtmlImageCell::GetLink( int x, int y ) const
 // tag handler
 //--------------------------------------------------------------------------------
 
 // tag handler
 //--------------------------------------------------------------------------------
 

-TAG_HANDLER_BEGIN(IMG, "IMG, MAP, AREA")
+TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {

-       if (tag.GetName() == "IMG")
-       {
-               if (tag.HasParam("SRC")) {
-                   int w = -1, h = -1;
-                   int al;
-                   wxFSFile *str;
-                   wxString tmp = tag.GetParam("SRC");
-                   wxString mn = wxEmptyString;
-
-                   str = m_WParser -> GetFS() -> OpenFile(tmp);
-                   if (tag.HasParam("WIDTH")) tag.ScanParam("WIDTH", "%i", &w);
-                   if (tag.HasParam("HEIGHT")) tag.ScanParam("HEIGHT", "%i", &h);
-                   al = HTML_ALIGN_BOTTOM;
-                   if (tag.HasParam("ALIGN")) {
-                       wxString alstr = tag.GetParam("ALIGN");
-                       alstr.MakeUpper(); // for the case alignment was in ".."
-                       if (alstr == "TEXTTOP") al = HTML_ALIGN_TOP;
-                       else if ((alstr == "CENTER") || (alstr == "ABSCENTER")) al = HTML_ALIGN_CENTER;
-                   }
-                   if (tag.HasParam("USEMAP"))
-                   {
-                           mn = tag.GetParam( "USEMAP" );
-                           if (mn[ 0 ] == '#')
-                           {
-                                   mn = mn.Mid( 1 );
-                           }
-                   }
-                   wxHtmlImageCell *cel = NULL;
-                   if (str) {
-                       cel = new wxHtmlImageCell(str, w, h, al, mn);
-                       cel -> SetLink(m_WParser -> GetLink());
-                       m_WParser -> GetContainer() -> InsertCell(cel);
-                       delete str;
-                   }
-               }
-       }
-       if (tag.GetName() == "MAP")
-       {
-               m_WParser->CloseContainer();
-               m_WParser->OpenContainer();
-               if (tag.HasParam("NAME"))
-               {
-                       wxString tmp = tag.GetParam("NAME");
-                       wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
-                       m_WParser->GetContainer()->InsertCell( cel );
-               }
-               ParseInner( tag );
-               m_WParser->CloseContainer();
-               m_WParser->OpenContainer();
-       }
-       if (tag.GetName() == "AREA")
-       {
-               if (tag.HasParam("SHAPE"))
-               {
-                       wxString tmp = tag.GetParam("SHAPE");
-                       wxString coords;
-                       tmp.MakeUpper();
-                       wxHtmlImageMapAreaCell *cel = NULL;
-                       if (tag.HasParam("COORDS"))
-                       {
-                               coords = tag.GetParam("COORDS");
-                       }
-                       if (tmp == "POLY")
-                       {
-                               cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords );
-                       }
-                       else if (tmp == "CIRCLE")
-                       {
-                               cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords );
-                       }
-                       else if (tmp == "RECT")
-                       {
-                               cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
-                       }
-                       if (cel && tag.HasParam("HREF"))
-                       {
-                               wxString tmp = tag.GetParam("HREF");
-                               cel->SetLink( tmp );
-                       }
-                       m_WParser->GetContainer()->InsertCell( cel );
-               }
-       }
+        if (tag.GetName() == wxT("IMG"))
+        {
+            if (tag.HasParam(wxT("SRC")))
+            {
+                int w = -1, h = -1;
+                int al;
+                wxFSFile *str;
+                wxString tmp = tag.GetParam(wxT("SRC"));
+                wxString mn = wxEmptyString;
+
+                str = m_WParser->GetFS()->OpenFile(tmp);
+                if (tag.HasParam(wxT("WIDTH")))
+                    tag.GetParamAsInt(wxT("WIDTH"), &w);
+                if (tag.HasParam(wxT("HEIGHT")))
+                    tag.GetParamAsInt(wxT("HEIGHT"), &h);
+                al = wxHTML_ALIGN_BOTTOM;
+                if (tag.HasParam(wxT("ALIGN")))
+                {
+                    wxString alstr = tag.GetParam(wxT("ALIGN"));
+                    alstr.MakeUpper();  // for the case alignment was in ".."
+                    if (alstr == wxT("TEXTTOP"))
+                        al = wxHTML_ALIGN_TOP;
+                    else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER")))
+                        al = wxHTML_ALIGN_CENTER;
+                }
+                if (tag.HasParam(wxT("USEMAP")))
+                {
+                    mn = tag.GetParam( wxT("USEMAP") );
+                    if (mn.GetChar(0) == wxT('#'))
+                    {
+                        mn = mn.Mid( 1 );
+                    }
+                }
+                wxHtmlImageCell *cel = NULL;
+                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"))
+        {
+            m_WParser->CloseContainer();
+            m_WParser->OpenContainer();
+            if (tag.HasParam(wxT("NAME")))
+            {
+                wxString tmp = tag.GetParam(wxT("NAME"));
+                wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
+                m_WParser->GetContainer()->InsertCell( cel );
+            }
+            ParseInner( tag );
+            m_WParser->CloseContainer();
+            m_WParser->OpenContainer();
+        }
+        if (tag.GetName() == wxT("AREA"))
+        {
+            if (tag.HasParam(wxT("SHAPE")))
+            {
+                wxString tmp = tag.GetParam(wxT("SHAPE"));
+                wxString coords = wxEmptyString;
+                tmp.MakeUpper();
+                wxHtmlImageMapAreaCell *cel = NULL;
+                if (tag.HasParam(wxT("COORDS")))
+                {
+                    coords = tag.GetParam(wxT("COORDS"));
+                }
+                if (tmp == wxT("POLY"))
+                {
+                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser->GetPixelScale() );
+                }
+                else if (tmp == wxT("CIRCLE"))
+                {
+                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser->GetPixelScale() );
+                }
+                else if (tmp == wxT("RECT"))
+                {
+                    cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser->GetPixelScale() );
+                }
+                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));
+                }
+                if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
+            }
+        }

 
         return FALSE;
     }
 
 
         return FALSE;
     }
 

-TAG_HANDLER_END(IMAGE)
+TAG_HANDLER_END(IMG)