// 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
/////////////////////////////////////////////////////////////////////////////
switch (type)
{
case RECT:
+ if ( coords.GetCount() == 4 )
{
int l, t, r, b;
{
return m_Link;
}
- break;
}
+ break;
case CIRCLE:
+ if ( coords.GetCount() == 3 )
{
int l, t, r;
double d;
}
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;
- }
- }
+ 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 (tag.GetName() == wxT("IMG"))
{
- if (tag.HasParam(wxT("SRC")))
+ wxString tmp;
+ if (tag.GetParamAsString(wxT("SRC"), &tmp))
{
int w = wxDefaultCoord, h = wxDefaultCoord;
bool wpercent = false;
bool hpresent = false;
int al;
wxFSFile *str;
- wxString tmp = tag.GetParam(wxT("SRC"));
- wxString mn = wxEmptyString;
+ wxString mn;
str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
- if (tag.HasParam(wxT("WIDTH")))
+ if (tag.GetParamAsIntOrPercent(wxT("WIDTH"), &w, wpercent))
{
- wxString param = tag.GetParam(wxT("WIDTH"));
- wxSscanf(param.c_str(), wxT("%i"), &w);
- if (param.EndsWith(wxT("%"))) {
+ if (wpercent)
+ {
if (w < 0)
w = 0;
else if (w > 100)
w = 100;
- wpercent = true;
}
-
}
- if (tag.HasParam(wxT("HEIGHT")))
+ if (tag.GetParamAsInt(wxT("HEIGHT"), &h))
{
- tag.GetParamAsInt(wxT("HEIGHT"), &h);
hpresent = true;
}
al = wxHTML_ALIGN_BOTTOM;
- if (tag.HasParam(wxT("ALIGN")))
+ wxString alstr;
+ if (tag.GetParamAsString(wxT("ALIGN"), &alstr))
{
- 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")))
+ if (tag.GetParamAsString(wxT("USEMAP"), &mn))
{
- mn = tag.GetParam( wxT("USEMAP") );
if ( !mn.empty() && *mn.begin() == '#' )
{
mn = mn.Mid( 1 );
{
m_WParser->CloseContainer();
m_WParser->OpenContainer();
- if (tag.HasParam(wxT("NAME")))
+ wxString tmp;
+ if (tag.GetParamAsString(wxT("NAME"), &tmp))
{
- wxString tmp = tag.GetParam(wxT("NAME"));
wxHtmlImageMapCell *cel = new wxHtmlImageMapCell( tmp );
m_WParser->GetContainer()->InsertCell( cel );
}
}
if (tag.GetName() == wxT("AREA"))
{
- if (tag.HasParam(wxT("SHAPE")))
+ wxString tmp;
+ if (tag.GetParamAsString(wxT("SHAPE"), &tmp))
{
- wxString tmp = tag.GetParam(wxT("SHAPE"));
- wxString coords = wxEmptyString;
+ wxString coords = tag.GetParam(wxT("COORDS"));
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() );
{
cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords, m_WParser->GetPixelScale() );
}
- if (cel != NULL && tag.HasParam(wxT("HREF")))
- {
- wxString target;
- if (tag.HasParam(wxT("TARGET")))
- target = tag.GetParam(wxT("TARGET"));
- cel->SetLink(wxHtmlLinkInfo(tag.GetParam(wxT("HREF")), target));
- }
+ wxString href;
+ if (cel != NULL && tag.GetParamAsString(wxT("HREF"), &href))
+ cel->SetLink(wxHtmlLinkInfo(href, tag.GetParam(wxT("TARGET"))));
if (cel != NULL)
m_WParser->GetContainer()->InsertCell( cel );
}
projects / wxWidgets.git / blobdiff