#endif
#ifndef WXPRECOMP
-#include "wx/wx.h"
+ #include "wx/dc.h"
#endif
#include "wx/html/forcelnk.h"
#include "wx/html/m_templ.h"
-
#include "wx/image.h"
#include "wx/dynarray.h"
wxString x = incoords, y;
type = t;
- while ((i = x.Find( ',' )) != -1)
+ while ((i = x.Find( ',' )) != -1)
{
coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );
x = x.Mid( i + 1 );
wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
{
- switch (type)
+ switch (type)
{
case RECT:
{
t = coords[ 1 ];
r = coords[ 2 ];
b = coords[ 3 ];
- if (x >= l && x <= r && y >= t && y <= b)
- {
+ if (x >= l && x <= r && y >= t && y <= b)
+ {
return m_Link;
}
break;
t = coords[ 1 ];
r = coords[ 2 ];
d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );
- if (d < (double)r)
- {
+ if (d < (double)r)
+ {
return m_Link;
}
}
break;
case POLY:
{
- if (coords.GetCount() >= 6)
- {
+ if (coords.GetCount() >= 6)
+ {
int intersects = 0;
int wherex = x;
int wherey = y;
int end = totalc;
int pointer = 1;
- if ((yval >= wherey) != (coords[pointer] >= wherey))
- {
- if ((xval >= wherex) == (coords[0] >= wherex))
- {
+ if ((yval >= wherey) != (coords[pointer] >= wherey))
+ {
+ if ((xval >= wherex) == (coords[0] >= wherex))
+ {
intersects += (xval >= wherex) ? 1 : 0;
- }
- else
- {
+ }
+ else
+ {
intersects += ((xval - (yval - wherey) *
(coords[0] - xval) /
(coords[pointer] - yval)) >= wherex) ? 1 : 0;
}
}
- while (pointer < end)
- {
+ while (pointer < end)
+ {
yval = coords[pointer];
pointer += 2;
- if (yval >= wherey)
- {
- while ((pointer < end) && (coords[pointer] >= wherey))
- {
+ if (yval >= wherey)
+ {
+ while ((pointer < end) && (coords[pointer] >= wherey))
+ {
pointer += 2;
}
- if (pointer >= end)
- {
+ if (pointer >= end)
+ {
break;
}
if ((coords[pointer - 3] >= wherex) ==
(coords[pointer - 1] >= wherex)) {
intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
- }
- else
- {
+ }
+ 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))
- {
+ }
+ else
+ {
+ while ((pointer < end) && (coords[pointer] < wherey))
+ {
pointer += 2;
}
- if (pointer >= end)
- {
+ if (pointer >= end)
+ {
break;
}
if ((coords[pointer - 3] >= wherex) ==
- (coords[pointer - 1] >= wherex))
- {
+ (coords[pointer - 1] >= wherex))
+ {
intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
- }
- else
- {
+ }
+ else
+ {
intersects +=
((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
(coords[pointer - 1] - coords[pointer - 3]) /
}
}
}
- if ((intersects & 1) != 0)
- {
+ if ((intersects & 1) != 0)
+ {
return m_Link;
}
}
break;
}
- if (m_Next)
+ if (m_Next)
{
wxHtmlImageMapAreaCell *a = (wxHtmlImageMapAreaCell*)m_Next;
return a->GetLink( x, y );
const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
{
- if (cond == wxHTML_COND_ISIMAGEMAP)
+ if (cond == wxHTML_COND_ISIMAGEMAP)
{
if (m_Name == *((wxString*)(param)))
return this;
{
public:
wxBitmap *m_Image;
+ double m_Scale;
wxHtmlImageMapCell *m_ImageMap;
wxString m_MapName;
wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, double scale, int align, wxString mapname) : wxHtmlCell()
{
wxImage *img;
- int ww, hh;
+ 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()))
+ 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 (w != -1) bw = w; else bw = ww;
+ if (h != -1) bh = h; else bh = hh;
- m_Width = (int)(scale * (double)m_Width);
- m_Height = (int)(scale * (double)m_Height);
+ m_Width = (int)(scale * (double)bw);
+ m_Height = (int)(scale * (double)bh);
- if ((m_Width != ww) || (m_Height != hh))
- {
- wxImage img2 = img->Scale(m_Width, m_Height);
+ if ((bw != ww) || (bh != hh))
+ {
+ wxImage img2 = img->Scale(bw, bh);
m_Image = new wxBitmap(img2.ConvertToBitmap());
- }
- else
+ }
+ else
m_Image = new wxBitmap(img->ConvertToBitmap());
delete img;
}
- switch (align)
+ switch (align)
{
case wxHTML_ALIGN_TOP :
m_Descent = m_Height;
-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))
{
if (m_Image)
-// dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
- dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE);
- wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
+ {
+ double us_x, us_y;
+ dc.GetUserScale(&us_x, &us_y);
+ dc.SetUserScale(us_x * m_Scale, us_y * m_Scale);
+
+// 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.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)
+ if (!m_ImageMap)
{
wxHtmlContainerCell *p, *op;
op = p = GetParent();
- while (p)
- {
+ while (p)
+ {
op = p;
p = p->GetParent();
}
p = op;
wxHtmlCell *cell = (wxHtmlCell*)p->Find( wxHTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));
- if (!cell)
- {
+ if (!cell)
+ {
((wxString&)m_MapName).Clear();
return wxHtmlCell::GetLink( x, y );
}
TAG_HANDLER_PROC(tag)
{
- if (tag.GetName() == wxT("IMG"))
- {
- if (tag.HasParam(wxT("SRC")))
- {
+ if (tag.GetName() == wxT("IMG"))
+ {
+ if (tag.HasParam(wxT("SRC")))
+ {
int w = -1, h = -1;
int al;
wxFSFile *str;
wxString mn = wxEmptyString;
str = m_WParser->GetFS()->OpenFile(tmp);
- if (tag.HasParam(wxT("WIDTH"))) tag.ScanParam(wxT("WIDTH"), wxT("%i"), &w);
- if (tag.HasParam(wxT("HEIGHT"))) tag.ScanParam(wxT("HEIGHT"), wxT("%i"), &h);
+ 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")))
- {
+ 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 (alstr == wxT("TEXTTOP"))
+ al = wxHTML_ALIGN_TOP;
+ else if ((alstr == wxT("CENTER")) || (alstr == wxT("ABSCENTER")))
+ al = wxHTML_ALIGN_CENTER;
}
- if (tag.HasParam(wxT("USEMAP")))
- {
+ if (tag.HasParam(wxT("USEMAP")))
+ {
mn = tag.GetParam( wxT("USEMAP") );
- if (mn[ (unsigned int) 0 ] == wxT('#'))
- {
+ if (mn.GetChar(0) == wxT('#'))
+ {
mn = mn.Mid( 1 );
}
}
wxHtmlImageCell *cel = NULL;
- if (str)
- {
+ if (str)
+ {
cel = new wxHtmlImageCell(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"))
- {
+ if (tag.GetName() == wxT("MAP"))
+ {
m_WParser->CloseContainer();
m_WParser->OpenContainer();
- if (tag.HasParam(wxT("NAME")))
- {
+ if (tag.HasParam(wxT("NAME")))
+ {
wxString tmp = tag.GetParam(wxT("NAME"));
wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
m_WParser->GetContainer()->InsertCell( cel );
m_WParser->CloseContainer();
m_WParser->OpenContainer();
}
- if (tag.GetName() == wxT("AREA"))
- {
- if (tag.HasParam(wxT("SHAPE")))
- {
+ 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")))
- {
+ if (tag.HasParam(wxT("COORDS")))
+ {
coords = tag.GetParam(wxT("COORDS"));
}
- if (tmp == wxT("POLY"))
- {
+ if (tmp == wxT("POLY"))
+ {
cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::POLY, coords, m_WParser->GetPixelScale() );
- }
- else if (tmp == wxT("CIRCLE"))
- {
+ }
+ else if (tmp == wxT("CIRCLE"))
+ {
cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::CIRCLE, coords, m_WParser->GetPixelScale() );
- }
- else if (tmp == wxT("RECT"))
- {
+ }
+ else if (tmp == wxT("RECT"))
+ {
cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser->GetPixelScale() );
}
- if (cel != NULL && tag.HasParam(wxT("HREF")))
- {
+ 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"));
projects / wxWidgets.git / blobdiff