X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2034f1b6e04a39f6d882cf6cdd53c11bf39f5d7..85b43fbf7a512ea49cf491320c458bec705762ed:/src/html/htmlcell.cpp?ds=sidebyside

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 7881b478f0..ad79eb042f 100644
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -29,6 +29,7 @@
 
 #include "wx/html/htmlcell.h"
 #include "wx/html/htmlwin.h"
+#include "wx/settings.h"
 #include <stdlib.h>
 
 
@@ -115,12 +116,36 @@ const wxHtmlCell* wxHtmlCell::Find(int WXUNUSED(condition), const void* WXUNUSED
 }
 
 
-wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y) const
+wxHtmlCell *wxHtmlCell::FindCellByPos(wxCoord x, wxCoord y,
+                                      unsigned flags) const
 {
     if ( x >= 0 && x < m_Width && y >= 0 && y < m_Height )
+    {
         return wxConstCast(this, wxHtmlCell);
+    }
+    else
+    {
+        if ((flags & wxHTML_FIND_NEAREST_AFTER) &&
+                (y < 0 || (y == 0 && x <= 0)))
+            return wxConstCast(this, wxHtmlCell);
+        else if ((flags & wxHTML_FIND_NEAREST_BEFORE) &&
+                (y > m_Height-1 || (y == m_Height-1 && x >= m_Width)))
+            return wxConstCast(this, wxHtmlCell);
+        else
+            return NULL;
+    }
+}
 
-    return NULL;
+
+wxPoint wxHtmlCell::GetAbsPos() const
+{
+    wxPoint p(m_PosX, m_PosY);
+    for (wxHtmlCell *parent = m_Parent; parent; parent = parent->m_Parent)
+    {
+        p.x += parent->m_PosX;
+        p.y += parent->m_PosY;
+    }
+    return p;
 }
 
 
@@ -137,8 +162,27 @@ wxHtmlWordCell::wxHtmlWordCell(const wxString& word, wxDC& dc) : wxHtmlCell()
 
 
 
-void wxHtmlWordCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
+                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                          wxHtmlRenderingState& state)
 {
+    if (state.GetSelectionState() != wxHTML_SEL_OUT &&
+        dc.GetBackgroundMode() != wxSOLID)
+    {
+        dc.SetBackgroundMode(wxSOLID);
+        dc.SetTextBackground(
+                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
+        dc.SetTextForeground(
+                wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+    }
+    else if (state.GetSelectionState() == wxHTML_SEL_OUT &&
+             dc.GetBackgroundMode() == wxSOLID)
+    {
+        dc.SetBackgroundMode(wxTRANSPARENT);
+        dc.SetTextForeground(state.GetFgColour());
+        dc.SetTextBackground(state.GetBgColour());
+    }
+
     dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
 }
 
@@ -401,11 +445,33 @@ void wxHtmlContainerCell::Layout(int w)
     m_LastLayout = w;
 }
 
+void wxHtmlContainerCell::UpdateRenderingStatePre(wxHtmlRenderingState& state,
+                                                  wxHtmlCell *cell) const
+{
+    wxHtmlSelection *s = state.GetSelection();
+    if (!s) return;
+    if (s->GetFromCell() == cell || s->GetToCell() == cell)
+    {
+        state.SetSelectionState(wxHTML_SEL_CHANGING);
+    }
+}
+
+void wxHtmlContainerCell::UpdateRenderingStatePost(wxHtmlRenderingState& state,
+                                                   wxHtmlCell *cell) const
+{
+    wxHtmlSelection *s = state.GetSelection();
+    if (!s) return;
+    if (s->GetToCell() == cell)
+        state.SetSelectionState(wxHTML_SEL_OUT);
+    else if (s->GetFromCell() == cell)
+        state.SetSelectionState(wxHTML_SEL_IN);
+}
 
 #define mMin(a, b) (((a) < (b)) ? (a) : (b))
 #define mMax(a, b) (((a) < (b)) ? (b) : (a))
 
-void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
+void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
+                               wxHtmlRenderingState& state)
 {
     // container visible, draw it:
     if ((y + m_PosY <= view_y2) && (y + m_PosY + m_Height > view_y1))
@@ -437,29 +503,37 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
 
         if (m_Cells)
         {
+            // draw container's contents:
             for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-                cell->Draw(dc, x + m_PosX, y + m_PosY, view_y1, view_y2);
+            {
+                UpdateRenderingStatePre(state, cell);
+                cell->Draw(dc,
+                           x + m_PosX, y + m_PosY, view_y1, view_y2,
+                           state);
+                UpdateRenderingStatePost(state, cell);
+            }
         }
     }
     // container invisible, just proceed font+color changing:
     else
     {
-        if (m_Cells)
-        {
-            for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-                cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
-        }
+        DrawInvisible(dc, x, y, state);
     }
 }
 
 
 
-void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y)
+void wxHtmlContainerCell::DrawInvisible(wxDC& dc, int x, int y,
+                                        wxHtmlRenderingState& state)
 {
     if (m_Cells)
     {
         for (wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext())
-            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY);
+        {
+            UpdateRenderingStatePre(state, cell);
+            cell->DrawInvisible(dc, x + m_PosX, y + m_PosY, state);
+            UpdateRenderingStatePost(state, cell);
+        }
     }
 }
 
@@ -560,17 +634,48 @@ const wxHtmlCell* wxHtmlContainerCell::Find(int condition, const void* param) co
 }
 
 
-wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y) const
+wxHtmlCell *wxHtmlContainerCell::FindCellByPos(wxCoord x, wxCoord y,
+                                               unsigned flags) const
 {
-    for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+    if ( flags & wxHTML_FIND_EXACT )
     {
-        int cx = cell->GetPosX(),
-            cy = cell->GetPosY();
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+        {
+            int cx = cell->GetPosX(),
+                cy = cell->GetPosY();
 
-        if ( (cx <= x) && (cx + cell->GetWidth() > x) &&
-             (cy <= y) && (cy + cell->GetHeight() > y) )
+            if ( (cx <= x) && (cx + cell->GetWidth() > x) &&
+                 (cy <= y) && (cy + cell->GetHeight() > y) )
+            {
+                return cell->FindCellByPos(x - cx, y - cy, flags);
+            }
+        }
+    }
+    else if ( flags & wxHTML_FIND_NEAREST_AFTER )
+    {
+        wxHtmlCell *c;
+        int y2;
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
         {
-            return cell->FindCellByPos(x - cx, y - cy);
+            y2 = cell->GetPosY() + cell->GetHeight() - 1;
+            if (y2 < y || (y2 == y && cell->GetPosX()+cell->GetWidth()-1 < x))
+                continue;
+            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
+                                    flags);
+            if (c) return c;
+        }
+    }
+    else if ( flags & wxHTML_FIND_NEAREST_BEFORE )
+    {
+        wxHtmlCell *c;
+        for ( const wxHtmlCell *cell = m_Cells; cell; cell = cell->GetNext() )
+        {
+            if (cell->GetPosY() > y || 
+                    (cell->GetPosY() == y && cell->GetPosX() > x))
+                break;
+            c = cell->FindCellByPos(x - cell->GetPosX(), y - cell->GetPosY(),
+                                    flags);
+            if (c) return c;
         }
     }
 
@@ -610,49 +715,78 @@ void wxHtmlContainerCell::GetHorizontalConstraints(int *left, int *right) const
         *right = cright;
 }
 
+    
+wxHtmlCell *wxHtmlContainerCell::GetFirstTerminal() const
+{
+    if (m_Cells)
+        return m_Cells->GetFirstTerminal();
+    else
+        return NULL;
+}
+
+wxHtmlCell *wxHtmlContainerCell::GetLastTerminal() const
+{
+    if (m_Cells)
+    {
+        wxHtmlCell *c;
+        for (c = m_Cells; c->GetNext(); c = c->GetNext()) {}
+        return c;
+    }
+    else
+        return NULL;
+}
 
 
 
 
-//--------------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 // wxHtmlColourCell
-//--------------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 
-void wxHtmlColourCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlColourCell::Draw(wxDC& dc,
+                            int x, int y,
+                            int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                            wxHtmlRenderingState& state)
 {
-    if (m_Flags & wxHTML_CLR_FOREGROUND)
-        dc.SetTextForeground(m_Colour);
-    if (m_Flags & wxHTML_CLR_BACKGROUND)
-    {
-        dc.SetBackground(wxBrush(m_Colour, wxSOLID));
-        dc.SetTextBackground(m_Colour);
-    }
+    DrawInvisible(dc, x, y, state);
 }
 
-void wxHtmlColourCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlColourCell::DrawInvisible(wxDC& dc,
+                                     int WXUNUSED(x), int WXUNUSED(y),
+                                     wxHtmlRenderingState& state)
 {
     if (m_Flags & wxHTML_CLR_FOREGROUND)
-        dc.SetTextForeground(m_Colour);
+    {
+        state.SetFgColour(m_Colour);
+        if (state.GetSelectionState() != wxHTML_SEL_IN)
+            dc.SetTextForeground(m_Colour);        
+    }
     if (m_Flags & wxHTML_CLR_BACKGROUND)
     {
+        state.SetBgColour(m_Colour);
+        if (state.GetSelectionState() != wxHTML_SEL_IN)
+            dc.SetTextBackground(m_Colour);
         dc.SetBackground(wxBrush(m_Colour, wxSOLID));
-        dc.SetTextBackground(m_Colour);
     }
 }
 
 
 
 
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // wxHtmlFontCell
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
-void wxHtmlFontCell::Draw(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlFontCell::Draw(wxDC& dc,
+                          int WXUNUSED(x), int WXUNUSED(y),
+                          int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                          wxHtmlRenderingState& WXUNUSED(state))
 {
     dc.SetFont(m_Font);
 }
 
-void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y),
+                                   wxHtmlRenderingState& WXUNUSED(state))
 {
     dc.SetFont(m_Font);
 }
@@ -664,9 +798,9 @@ void wxHtmlFontCell::DrawInvisible(wxDC& dc, int WXUNUSED(x), int WXUNUSED(y))
 
 
 
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // wxHtmlWidgetCell
-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
 wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 {
@@ -678,7 +812,10 @@ wxHtmlWidgetCell::wxHtmlWidgetCell(wxWindow *wnd, int w)
 }
 
 
-void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc),
+                            int WXUNUSED(x), int WXUNUSED(y),
+                            int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                            wxHtmlRenderingState& WXUNUSED(state))
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;
@@ -696,7 +833,9 @@ void wxHtmlWidgetCell::Draw(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y)
 
 
 
-void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc), int WXUNUSED(x), int WXUNUSED(y))
+void wxHtmlWidgetCell::DrawInvisible(wxDC& WXUNUSED(dc),
+                                     int WXUNUSED(x), int WXUNUSED(y),
+                                     wxHtmlRenderingState& WXUNUSED(state))
 {
     int absx = 0, absy = 0, stx, sty;
     wxHtmlCell *c = this;