X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01325161d50f20b8c894397a6a70f9d788576343..9d9b77552eeb78e0c7ee903aa265dc187651ff57:/src/html/m_image.cpp diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp index 3d1f375088..4c32fbe5e9 100644 --- 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$ @@ -34,7 +34,7 @@ #include #include -FORCE_LINK_ME(mod_image) +FORCE_LINK_ME(m_image) @@ -57,35 +57,35 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell protected: CoordArray coords; celltype type; - int radius; + int radius; public: - wxHtmlImageMapAreaCell( celltype t, wxString &coords ); - virtual wxString GetLink( int x = 0, int y = 0 ) const; + 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; + int i; wxString x = incoords, y; type = t; while ((i = x.Find( ',' )) != -1) { - coords.Add( wxAtoi( x.Left( i ).c_str() ) ); + coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) ); x = x.Mid( i + 1 ); } - coords.Add( wxAtoi( x.c_str() ) ); + 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; + int l, t, r, b; l = coords[ 0 ]; t = coords[ 1 ]; @@ -98,8 +98,8 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const } case CIRCLE: { - int l, t, r; - double d; + int l, t, r; + double d; l = coords[ 0 ]; t = coords[ 1 ]; @@ -113,15 +113,15 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const 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; + 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)) { @@ -178,10 +178,10 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const break; } if (m_Next) { - wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next; + wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next; return a->GetLink( x, y ); } - return wxEmptyString; + return NULL; } @@ -206,7 +206,7 @@ class wxHtmlImageMapCell : public wxHtmlCell protected: wxString m_Name; public: - virtual wxString GetLink( int x = 0, int y = 0 ) const; + virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; virtual const wxHtmlCell *Find( int cond, const void *param ) const; }; @@ -216,9 +216,9 @@ wxHtmlImageMapCell::wxHtmlImageMapCell( wxString &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; + wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next; if (a) return a->GetLink( x, y ); return wxHtmlCell::GetLink( x, y ); @@ -252,7 +252,7 @@ class wxHtmlImageCell : public wxHtmlCell wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, 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 wxString GetLink( int x = 0, int y = 0 ) const; + virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const; }; @@ -310,12 +310,12 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); } -wxString wxHtmlImageCell::GetLink( int x, int y ) const +wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const { if (m_MapName.IsEmpty()) return wxHtmlCell::GetLink( x, y ); if (!m_ImageMap) { - wxHtmlContainerCell *p, *op; + wxHtmlContainerCell *p, *op; op = p = GetParent(); while (p) { op = p; @@ -366,13 +366,16 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") } if (tag.HasParam("USEMAP")) { mn = tag.GetParam( "USEMAP" ); - if (mn[ 0 ] == '#') { + if (mn[ (unsigned int) 0 ] == '#') { mn = mn.Mid( 1 ); } } wxHtmlImageCell *cel = NULL; if (str) { - cel = new wxHtmlImageCell(str, w, h, al, mn); + cel = new wxHtmlImageCell(str, + (int)(m_WParser -> GetPixelScale() * (double)w), + (int)(m_WParser -> GetPixelScale() * (double)h), + al, mn); cel -> SetLink(m_WParser -> GetLink()); m_WParser -> GetContainer() -> InsertCell(cel); delete str; @@ -394,22 +397,24 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA") if (tag.GetName() == "AREA") { if (tag.HasParam("SHAPE")) { wxString tmp = tag.GetParam("SHAPE"); - wxString coords; + wxString coords = wxEmptyString; tmp.MakeUpper(); wxHtmlImageMapAreaCell *cel = NULL; if (tag.HasParam("COORDS")) { coords = tag.GetParam("COORDS"); } if (tmp == "POLY") { - cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords ); + cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser -> GetPixelScale() ); } else if (tmp == "CIRCLE") { - cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords ); + cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser -> GetPixelScale() ); } else if (tmp == "RECT") { - cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords ); + cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser -> GetPixelScale() ); } if (cel != NULL && tag.HasParam("HREF")) { wxString tmp = tag.GetParam("HREF"); - cel->SetLink( tmp ); + wxString target = wxEmptyString; + if (tag.HasParam("TARGET")) target = tag.GetParam("TARGET"); + cel->SetLink( wxHtmlLinkInfo(tmp, target)); } if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel ); }