mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Only pass on url to server side image map when we end up with a valid url

This commit is contained in:
kipp%netscape.com 1999-07-08 19:44:42 +00:00
Родитель 24c8b64d1e
Коммит 835a8e5d69
4 изменённых файлов: 84 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

76
layout/generic/nsImageFrame.cpp
Просмотреть файл

@ -632,9 +632,10 @@ nsImageFrame::TranslateEventCoords(nsIPresContext& aPresContext,
aResult.y = NSTwipsToIntPixels(y, t2p); aResult.y = NSTwipsToIntPixels(y, t2p);
} }
void PRBool
nsImageFrame::GetAnchorHREF(nsString& aResult) nsImageFrame::GetAnchorHREF(nsString& aResult)
{ {
PRBool status = PR_FALSE;
aResult.Truncate(); aResult.Truncate();
// Walk up the content tree, looking for an nsIDOMAnchorElement // Walk up the content tree, looking for an nsIDOMAnchorElement
@ -644,12 +645,16 @@ nsImageFrame::GetAnchorHREF(nsString& aResult)
nsCOMPtr<nsIDOMHTMLAnchorElement> anchor(do_QueryInterface(content)); nsCOMPtr<nsIDOMHTMLAnchorElement> anchor(do_QueryInterface(content));
if (anchor) { if (anchor) {
anchor->GetHref(aResult); anchor->GetHref(aResult);
if (aResult.Length() > 0) {
status = PR_TRUE;
}
break; break;
} }
nsCOMPtr<nsIContent> parent; nsCOMPtr<nsIContent> parent;
content->GetParent(*getter_AddRefs(parent)); content->GetParent(*getter_AddRefs(parent));
content = parent; content = parent;
} }
return status;
} }
// XXX what should clicks on transparent pixels do? // XXX what should clicks on transparent pixels do?
@ -715,47 +720,48 @@ nsImageFrame::HandleEvent(nsIPresContext& aPresContext,
// Server side image maps use the href in a containing anchor // Server side image maps use the href in a containing anchor
// element to provide the basis for the destination url. // element to provide the basis for the destination url.
nsAutoString src; nsAutoString src;
GetAnchorHREF(src); if (GetAnchorHREF(src)) {
#ifndef NECKO #ifndef NECKO
nsString empty; nsString empty;
NS_MakeAbsoluteURL(baseURL, empty, src, absURL); NS_MakeAbsoluteURL(baseURL, empty, src, absURL);
#else #else
// XXX Should be a component local subroutine.... // XXX Should be a component local subroutine....
nsresult rv; nsresult rv;
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsIURI *baseUri = nsnull; nsIURI *baseUri = nsnull;
rv = baseURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri); rv = baseURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
char *absUrlStr = nsnull; char *absUrlStr = nsnull;
char *baseSpec = src.ToNewCString(); char *baseSpec = src.ToNewCString();
if (!baseSpec) return NS_ERROR_OUT_OF_MEMORY; if (!baseSpec) return NS_ERROR_OUT_OF_MEMORY;
rv = service->MakeAbsolute(baseSpec, baseUri, &absUrlStr); rv = service->MakeAbsolute(baseSpec, baseUri, &absUrlStr);
NS_RELEASE(baseUri); NS_RELEASE(baseUri);
absURL = absUrlStr; absURL = absUrlStr;
nsCRT::free(baseSpec); nsCRT::free(baseSpec);
delete [] absUrlStr; delete [] absUrlStr;
#endif // NECKO #endif // NECKO
NS_IF_RELEASE(baseURL); NS_IF_RELEASE(baseURL);
// XXX if the mouse is over/clicked in the border/padding area // XXX if the mouse is over/clicked in the border/padding area
// we should probably just pretend nothing happened. Nav4 // we should probably just pretend nothing happened. Nav4
// keeps the x,y coordinates positive as we do; IE doesn't // keeps the x,y coordinates positive as we do; IE doesn't
// bother. Both of them send the click through even when the // bother. Both of them send the click through even when the
// mouse is over the border. // mouse is over the border.
if (p.x < 0) p.x = 0; if (p.x < 0) p.x = 0;
if (p.y < 0) p.y = 0; if (p.y < 0) p.y = 0;
char cbuf[50]; char cbuf[50];
PR_snprintf(cbuf, sizeof(cbuf), "?%d,%d", p.x, p.y); PR_snprintf(cbuf, sizeof(cbuf), "?%d,%d", p.x, p.y);
absURL.Append(cbuf); absURL.Append(cbuf);
PRBool clicked = PR_FALSE; PRBool clicked = PR_FALSE;
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) { if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) {
aEventStatus = nsEventStatus_eConsumeDoDefault; aEventStatus = nsEventStatus_eConsumeDoDefault;
clicked = PR_TRUE; clicked = PR_TRUE;
}
TriggerLink(aPresContext, absURL, target, clicked);
} }
TriggerLink(aPresContext, absURL, target, clicked);
} }
break; break;
} }

2
layout/generic/nsImageFrame.h
Просмотреть файл

@ -82,7 +82,7 @@ protected:
const nsPoint& aPoint, const nsPoint& aPoint,
nsPoint& aResult); nsPoint& aResult);
void GetAnchorHREF(nsString& aResult); PRBool GetAnchorHREF(nsString& aResult);
PRIntn GetSuppress(); PRIntn GetSuppress();

76
layout/html/base/src/nsImageFrame.cpp
Просмотреть файл

@ -632,9 +632,10 @@ nsImageFrame::TranslateEventCoords(nsIPresContext& aPresContext,
aResult.y = NSTwipsToIntPixels(y, t2p); aResult.y = NSTwipsToIntPixels(y, t2p);
} }
void PRBool
nsImageFrame::GetAnchorHREF(nsString& aResult) nsImageFrame::GetAnchorHREF(nsString& aResult)
{ {
PRBool status = PR_FALSE;
aResult.Truncate(); aResult.Truncate();
// Walk up the content tree, looking for an nsIDOMAnchorElement // Walk up the content tree, looking for an nsIDOMAnchorElement
@ -644,12 +645,16 @@ nsImageFrame::GetAnchorHREF(nsString& aResult)
nsCOMPtr<nsIDOMHTMLAnchorElement> anchor(do_QueryInterface(content)); nsCOMPtr<nsIDOMHTMLAnchorElement> anchor(do_QueryInterface(content));
if (anchor) { if (anchor) {
anchor->GetHref(aResult); anchor->GetHref(aResult);
if (aResult.Length() > 0) {
status = PR_TRUE;
}
break; break;
} }
nsCOMPtr<nsIContent> parent; nsCOMPtr<nsIContent> parent;
content->GetParent(*getter_AddRefs(parent)); content->GetParent(*getter_AddRefs(parent));
content = parent; content = parent;
} }
return status;
} }
// XXX what should clicks on transparent pixels do? // XXX what should clicks on transparent pixels do?
@ -715,47 +720,48 @@ nsImageFrame::HandleEvent(nsIPresContext& aPresContext,
// Server side image maps use the href in a containing anchor // Server side image maps use the href in a containing anchor
// element to provide the basis for the destination url. // element to provide the basis for the destination url.
nsAutoString src; nsAutoString src;
GetAnchorHREF(src); if (GetAnchorHREF(src)) {
#ifndef NECKO #ifndef NECKO
nsString empty; nsString empty;
NS_MakeAbsoluteURL(baseURL, empty, src, absURL); NS_MakeAbsoluteURL(baseURL, empty, src, absURL);
#else #else
// XXX Should be a component local subroutine.... // XXX Should be a component local subroutine....
nsresult rv; nsresult rv;
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsIURI *baseUri = nsnull; nsIURI *baseUri = nsnull;
rv = baseURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri); rv = baseURL->QueryInterface(nsIURI::GetIID(), (void**)&baseUri);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
char *absUrlStr = nsnull; char *absUrlStr = nsnull;
char *baseSpec = src.ToNewCString(); char *baseSpec = src.ToNewCString();
if (!baseSpec) return NS_ERROR_OUT_OF_MEMORY; if (!baseSpec) return NS_ERROR_OUT_OF_MEMORY;
rv = service->MakeAbsolute(baseSpec, baseUri, &absUrlStr); rv = service->MakeAbsolute(baseSpec, baseUri, &absUrlStr);
NS_RELEASE(baseUri); NS_RELEASE(baseUri);
absURL = absUrlStr; absURL = absUrlStr;
nsCRT::free(baseSpec); nsCRT::free(baseSpec);
delete [] absUrlStr; delete [] absUrlStr;
#endif // NECKO #endif // NECKO
NS_IF_RELEASE(baseURL); NS_IF_RELEASE(baseURL);
// XXX if the mouse is over/clicked in the border/padding area // XXX if the mouse is over/clicked in the border/padding area
// we should probably just pretend nothing happened. Nav4 // we should probably just pretend nothing happened. Nav4
// keeps the x,y coordinates positive as we do; IE doesn't // keeps the x,y coordinates positive as we do; IE doesn't
// bother. Both of them send the click through even when the // bother. Both of them send the click through even when the
// mouse is over the border. // mouse is over the border.
if (p.x < 0) p.x = 0; if (p.x < 0) p.x = 0;
if (p.y < 0) p.y = 0; if (p.y < 0) p.y = 0;
char cbuf[50]; char cbuf[50];
PR_snprintf(cbuf, sizeof(cbuf), "?%d,%d", p.x, p.y); PR_snprintf(cbuf, sizeof(cbuf), "?%d,%d", p.x, p.y);
absURL.Append(cbuf); absURL.Append(cbuf);
PRBool clicked = PR_FALSE; PRBool clicked = PR_FALSE;
if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) { if (aEvent->message == NS_MOUSE_LEFT_BUTTON_UP) {
aEventStatus = nsEventStatus_eConsumeDoDefault; aEventStatus = nsEventStatus_eConsumeDoDefault;
clicked = PR_TRUE; clicked = PR_TRUE;
}
TriggerLink(aPresContext, absURL, target, clicked);
} }
TriggerLink(aPresContext, absURL, target, clicked);
} }
break; break;
} }

2
layout/html/base/src/nsImageFrame.h
Просмотреть файл

@ -82,7 +82,7 @@ protected:
const nsPoint& aPoint, const nsPoint& aPoint,
nsPoint& aResult); nsPoint& aResult);
void GetAnchorHREF(nsString& aResult); PRBool GetAnchorHREF(nsString& aResult);
PRIntn GetSuppress(); PRIntn GetSuppress();