#endif
#include "wx/html/htmlwin.h"
-
#include "wx/html/forcelnk.h"
-
+#include "wx/log.h"
//-----------------------------------------------------------------------------
wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
+ long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL | wxHSCROLL, name)
{
m_tmpMouseMoved = FALSE;
- m_tmpLastLink = wxEmptyString;
- m_tmpCanDraw = TRUE;
+ m_tmpLastLink = NULL;
+ m_tmpCanDrawLocks = 0;
m_FS = new wxFileSystem();
m_RelatedStatusBar = -1;
m_RelatedFrame = NULL;
m_TitleFormat = "%s";
- m_OpenedPage = m_OpenedAnchor = wxEmptyString;
+ m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_Cell = NULL;
m_Parser = new wxHtmlWinParser(this);
m_Parser -> SetFS(m_FS);
if (m_Cell) delete m_Cell;
- wxList *parser_data = m_Parser -> GetTempData();
- if (parser_data) delete parser_data;
-
delete m_Parser;
delete m_FS;
}
-void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes)
+void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
{
- m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
- if (!m_OpenedPage.IsEmpty()) LoadPage(m_OpenedPage);
+ wxString op = m_OpenedPage;
+
+ m_Parser -> SetFonts(normal_face, fixed_face, sizes);
+ SetPage(wxT("<html><body></body></html>")); // fonts changed => contents invalid
+ if (!op.IsEmpty()) LoadPage(op);
}
dc -> SetMapMode(wxMM_TEXT);
SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF));
- m_OpenedPage = m_OpenedAnchor = wxEmptyString;
+ m_OpenedPage = m_OpenedAnchor = m_OpenedPageTitle = wxEmptyString;
m_Parser -> SetDC(dc);
if (m_Cell) {
- delete m_Cell;
- m_Cell = NULL;
+ delete m_Cell;
+ m_Cell = NULL;
}
m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source);
delete dc;
m_Cell -> SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
m_Cell -> SetAlignHor(wxHTML_ALIGN_CENTER);
CreateLayout();
- Refresh();
+ if (m_tmpCanDrawLocks == 0) Refresh();
return TRUE;
}
{
wxFSFile *f;
bool rt_val;
- wxBusyCursor b;
+ bool needs_refresh = FALSE;
+
+ SetCursor(*wxHOURGLASS_CURSOR);
+ wxYield(); Refresh(FALSE);
- m_tmpCanDraw = FALSE;
+ m_tmpCanDrawLocks++;
if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
int x, y;
ViewStart(&x, &y);
m_History[m_HistoryPos].SetPos(y);
}
- if (location[0] == '#') { // local anchor
+ if (location[0] == wxT('#')) { // local anchor
wxString anch = location.Mid(1) /*1 to end*/;
- m_tmpCanDraw = TRUE;
+ m_tmpCanDrawLocks--;
+ rt_val = ScrollToAnchor(anch);
+ m_tmpCanDrawLocks++;
+ }
+ else if (location.Find(wxT('#')) != wxNOT_FOUND && location.BeforeFirst(wxT('#')) == m_OpenedPage) {
+ wxString anch = location.AfterFirst(wxT('#'));
+ m_tmpCanDrawLocks--;
rt_val = ScrollToAnchor(anch);
+ m_tmpCanDrawLocks++;
+ }
+ else if (location.Find(wxT('#')) != wxNOT_FOUND &&
+ (m_FS -> GetPath() + location.BeforeFirst(wxT('#'))) == m_OpenedPage) {
+ wxString anch = location.AfterFirst(wxT('#'));
+ m_tmpCanDrawLocks--;
+ rt_val = ScrollToAnchor(anch);
+ m_tmpCanDrawLocks++;
}
else {
+ needs_refresh = TRUE;
// load&display it:
if (m_RelatedStatusBar != -1) {
m_RelatedFrame -> SetStatusText(_("Connecting..."), m_RelatedStatusBar);
- Refresh();
+ Refresh(FALSE);
}
f = m_FS -> OpenFile(location);
+
if (f == NULL) {
wxString err;
- err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location);
- m_tmpCanDraw = TRUE;
- Refresh();
- wxMessageBox(err, "Error");
+ wxLogError(_("Unable to open requested HTML document: %s"), location.mb_str());
+ m_tmpCanDrawLocks--;
+
+ SetCursor(*wxSTANDARD_CURSOR);
return FALSE;
}
if (m_RelatedStatusBar != -1) {
wxString msg = _("Loading : ") + location;
m_RelatedFrame -> SetStatusText(msg, m_RelatedStatusBar);
- Refresh();
+ Refresh(FALSE);
}
node = m_Filters.GetFirst();
node = node -> GetNext();
}
if (src == wxEmptyString) {
- if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
- src = m_DefaultFilter -> ReadFile(*f);
- }
+ if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
+ src = m_DefaultFilter -> ReadFile(*f);
+ }
m_FS -> ChangePathTo(f -> GetLocation());
rt_val = SetPage(src);
m_OpenedPage = f -> GetLocation();
if (f -> GetAnchor() != wxEmptyString) {
- m_tmpCanDraw = TRUE;
+ wxYield();
ScrollToAnchor(f -> GetAnchor());
- m_tmpCanDraw = FALSE;
}
delete f;
m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
}
- m_tmpCanDraw = TRUE;
- Refresh();
+ if (m_OpenedPageTitle == wxEmptyString)
+ OnSetTitle(wxFileNameFromPath(m_OpenedPage));
+ SetCursor(*wxSTANDARD_CURSOR);
+
+ if (needs_refresh) {
+ wxYield();
+ m_tmpCanDrawLocks--;
+ Refresh();
+ }
+ else
+ m_tmpCanDrawLocks--;
+
return rt_val;
}
bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
{
const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
- if (!c) return FALSE;
+ if (!c)
+ {
+ wxLogWarning(_("HTML anchor %s does not exist."), anchor.mb_str());
+ return FALSE;
+ }
else {
int y;
}
-void wxHtmlWindow::SetTitle(const wxString& title)
+void wxHtmlWindow::OnSetTitle(const wxString& title)
{
if (m_RelatedFrame) {
wxString tit;
tit.Printf(m_TitleFormat, title.c_str());
m_RelatedFrame -> SetTitle(tit);
}
+ m_OpenedPageTitle = title;
}
if (!m_Cell) return;
if (m_Style == wxHW_SCROLLBAR_NEVER) {
- SetScrollbars(1, 1, 0, 0); // always off
+ SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // always off
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth);
}
else {
GetClientSize(&ClientWidth, &ClientHeight);
-#ifndef __WXMSW__
- // VS : this looks extremely ugly under windoze, better fix needed!
- SetScrollbars(1, 1, 0, ClientHeight * 2); // always on
-#endif
- GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth);
- if (ClientHeight < m_Cell -> GetHeight()) {
- SetScrollbars(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
- m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
- m_Cell -> GetHeight() / wxHTML_SCROLL_STEP
- /*cheat: top-level frag is always container*/);
+ if (ClientHeight < m_Cell -> GetHeight() + GetCharHeight()) {
+ SetScrollbars(
+ wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
+ m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
+ (m_Cell -> GetHeight() + GetCharHeight()) / wxHTML_SCROLL_STEP
+ /*cheat: top-level frag is always container*/);
+ }
+ else { /* we fit into window, no need for scrollbars */
+ SetScrollbars(wxHTML_SCROLL_STEP, 1, m_Cell -> GetWidth() / wxHTML_SCROLL_STEP, 0); // disable...
+ GetClientSize(&ClientWidth, &ClientHeight);
+ m_Cell -> Layout(ClientWidth); // ...and relayout
}
- else { /* we fit into window, no need for scrollbars */
- SetScrollbars(1, 1, 0, 0); // disable...
- GetClientSize(&ClientWidth, &ClientHeight);
- m_Cell -> Layout(ClientWidth); // ...and relayout
- }
}
}
{
wxString oldpath;
wxString tmp;
+ int p_fontsizes[7];
+ wxString p_fff, p_ffn;
if (path != wxEmptyString) {
oldpath = cfg -> GetPath();
}
m_Borders = cfg -> Read("wxHtmlWindow/Borders", m_Borders);
- m_Parser -> m_FontFaceFixed = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed);
- m_Parser -> m_FontFaceNormal = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal);
- m_Parser -> m_ItalicModeFixed = cfg -> Read("wxHtmlWindow/ItalicModeFixed", m_Parser -> m_ItalicModeFixed);
- m_Parser -> m_ItalicModeNormal = cfg -> Read("wxHtmlWindow/ItalicModeNormal", m_Parser -> m_ItalicModeNormal);
+ p_fff = cfg -> Read("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed);
+ p_ffn = cfg -> Read("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal);
for (int i = 0; i < 7; i++) {
tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
- m_Parser -> m_FontsSizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
+ p_fontsizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
}
+ SetFonts(p_ffn, p_fff, p_fontsizes);
if (path != wxEmptyString)
cfg -> SetPath(oldpath);
cfg -> Write("wxHtmlWindow/Borders", (long) m_Borders);
cfg -> Write("wxHtmlWindow/FontFaceFixed", m_Parser -> m_FontFaceFixed);
cfg -> Write("wxHtmlWindow/FontFaceNormal", m_Parser -> m_FontFaceNormal);
- cfg -> Write("wxHtmlWindow/ItalicModeFixed", (long) m_Parser -> m_ItalicModeFixed);
- cfg -> Write("wxHtmlWindow/ItalicModeNormal", (long) m_Parser -> m_ItalicModeNormal);
for (int i = 0; i < 7; i++) {
tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]);
l = m_History[m_HistoryPos].GetPage();
a = m_History[m_HistoryPos].GetAnchor();
m_HistoryOn = FALSE;
+ m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
- else LoadPage(l + "#" + a);
+ else LoadPage(l + wxT("#") + a);
m_HistoryOn = TRUE;
+ wxYield();
+ m_tmpCanDrawLocks--;
Scroll(0, m_History[m_HistoryPos].GetPos());
Refresh();
return TRUE;
l = m_History[m_HistoryPos].GetPage();
a = m_History[m_HistoryPos].GetAnchor();
m_HistoryOn = FALSE;
+ m_tmpCanDrawLocks++;
if (a == wxEmptyString) LoadPage(l);
- else LoadPage(l + "#" + a);
+ else LoadPage(l + wxT("#") + a);
m_HistoryOn = TRUE;
+ wxYield();
+ m_tmpCanDrawLocks--;
Scroll(0, m_History[m_HistoryPos].GetPos());
Refresh();
return TRUE;
wxList wxHtmlWindow::m_Filters;
wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
+wxCursor *wxHtmlWindow::s_cur_hand = NULL;
+wxCursor *wxHtmlWindow::s_cur_arrow = NULL;
void wxHtmlWindow::CleanUpStatics()
{
m_DefaultFilter = NULL;
m_Filters.DeleteContents(TRUE);
m_Filters.Clear();
-
+ if (s_cur_hand) delete s_cur_hand;
+ if (s_cur_arrow) delete s_cur_arrow;
}
-void wxHtmlWindow::OnLinkClicked(const wxString& link)
+void wxHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
{
- LoadPage(link);
+ LoadPage(link.GetHref());
}
wxRegionIterator upd(GetUpdateRegion()); // get the update rect list
int v_y, v_h;
- if (!m_tmpCanDraw) return;
+ if (m_tmpCanDrawLocks > 0) return;
+
dc.SetMapMode(wxMM_TEXT);
+#if 0
+/* VS - I don't think this is neccessary any longer
+ MSC_VER 1200 means MSVC 6.0 and it works fine */
#if defined(_MSC_VER) && (_MSC_VER == 1200)
::SetMapMode((HDC)dc.GetHDC(), MM_TEXT);
+#endif
#endif
dc.SetBackgroundMode(wxTRANSPARENT);
ViewStart(&x, &y);
}
-
-void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
-{
- int dummy;
- int sty, szy, cliy;
-
- ViewStart(&dummy, &sty);
- GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP;
- GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP;
-
- switch (event.KeyCode()) {
- case WXK_PAGEUP :
- case WXK_PRIOR :
- Scroll(-1, sty - cliy);
- break;
- case WXK_PAGEDOWN :
- case WXK_NEXT :
- Scroll(-1, sty + cliy);
- break;
- case WXK_HOME :
- Scroll(-1, 0);
- break;
- case WXK_END :
- Scroll(-1, szy - cliy);
- break;
- case WXK_UP :
- Scroll(-1, sty - 1);
- break;
- case WXK_DOWN :
- Scroll(-1, sty + 1);
- break;
- }
-}
-
-
-
void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
{
m_tmpMouseMoved = TRUE;
pos = event.GetPosition();
if (m_Cell)
- m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event.ButtonDown(1), event.ButtonDown(2), event.ButtonDown(3));
+ m_Cell -> OnMouseClick(this, sx + pos.x, sy + pos.y, event);
}
}
void wxHtmlWindow::OnIdle(wxIdleEvent& event)
{
- static wxCursor cur_hand(wxCURSOR_HAND), cur_arrow(wxCURSOR_ARROW);
+ if (s_cur_hand == NULL)
+ {
+ s_cur_hand = new wxCursor(wxCURSOR_HAND);
+ s_cur_arrow = new wxCursor(wxCURSOR_ARROW);
+ }
if (m_tmpMouseMoved && (m_Cell != NULL)) {
int sx, sy;
int x, y;
- wxString lnk;
+ wxHtmlLinkInfo *lnk;
ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
wxGetMousePosition(&x, &y);
lnk = m_Cell -> GetLink(sx + x, sy + y);
if (lnk != m_tmpLastLink) {
- if (lnk == wxEmptyString) {
- SetCursor(cur_arrow);
+ if (lnk == NULL) {
+ SetCursor(*s_cur_arrow);
if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(wxEmptyString, m_RelatedStatusBar);
}
else {
- SetCursor(cur_hand);
- if (m_RelatedStatusBar != -1) m_RelatedFrame -> SetStatusText(lnk, m_RelatedStatusBar);
+ SetCursor(*s_cur_hand);
+ if (m_RelatedStatusBar != -1)
+ m_RelatedFrame -> SetStatusText(lnk -> GetHref(), m_RelatedStatusBar);
}
m_tmpLastLink = lnk;
}
EVT_LEFT_DOWN(wxHtmlWindow::OnMouseEvent)
EVT_MOTION(wxHtmlWindow::OnMouseEvent)
EVT_IDLE(wxHtmlWindow::OnIdle)
- EVT_KEY_DOWN(wxHtmlWindow::OnKeyDown)
END_EVENT_TABLE()
///// default mod handlers are forced there:
-FORCE_LINK(mod_layout)
-FORCE_LINK(mod_fonts)
-FORCE_LINK(mod_image)
-FORCE_LINK(mod_list)
-FORCE_LINK(mod_pre)
-FORCE_LINK(mod_hline)
-FORCE_LINK(mod_links)
-FORCE_LINK(mod_tables)
+FORCE_LINK(m_layout)
+FORCE_LINK(m_fonts)
+FORCE_LINK(m_image)
+FORCE_LINK(m_list)
+FORCE_LINK(m_dflist)
+FORCE_LINK(m_pre)
+FORCE_LINK(m_hline)
+FORCE_LINK(m_links)
+FORCE_LINK(m_tables)
+FORCE_LINK(m_meta)
#endif
projects / wxWidgets.git / blobdiff