wxlayout bug

[wxWidgets.git] / user / wxLayout / wxlwindow.cpp

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index 5fa7a63325c5fade7cbbe6ff947dad66a79de2f1..a64e4286ae5f0841bbcbf4b4b4cdf9793aa8039b 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -10,8 +10,13 @@
 #   pragma implementation "wxlwindow.h"
 #endif
 
 #   pragma implementation "wxlwindow.h"
 #endif
 

-//#include "Mpch.h"
+#include "wx/wxprec.h"
+#ifdef __BORLANDC__
+#  pragma hdrstop
+#endif
+

 
 

+#include "Mpch.h"

 #ifdef M_BASEDIR
 #   ifndef USE_PCH
 #     include "Mcommon.h"
 #ifdef M_BASEDIR
 #   ifndef USE_PCH
 #     include "Mcommon.h"


@@ -19,6 +24,7 @@
 #     include "gui/wxMApp.h"
 #   endif // USE_PCH
 #   include "gui/wxlwindow.h"
 #     include "gui/wxMApp.h"
 #   endif // USE_PCH
 #   include "gui/wxlwindow.h"

+#   include "gui/wxlparser.h"

 #else
 #   ifdef   __WXMSW__
 #       include <windows.h>
 #else
 #   ifdef   __WXMSW__
 #       include <windows.h>


@@ -26,21 +32,39 @@
 #       undef GetCharWidth
 #       undef StartDoc
 #   endif
 #       undef GetCharWidth
 #       undef StartDoc
 #   endif

+

 #   include "wxlwindow.h"
 #   include "wxlwindow.h"

+#   include "wxlparser.h"

 #endif
 
 #endif
 

+#include <wx/clipbrd.h>
+#include <wx/textctrl.h>
+#include <wx/dataobj.h>
+

 #include <ctype.h>
 
 #include <ctype.h>
 

+#ifdef WXLAYOUT_DEBUG
+#  define   WXLO_DEBUG(x)      wxLogDebug x
+#else
+#  define WXLO_DEBUG(x)
+#endif

 
 

+/// offsets to put a nice frame around text

 #define WXLO_XOFFSET   4
 #define WXLO_YOFFSET   4
 
 #define WXLO_XOFFSET   4
 #define WXLO_YOFFSET   4
 

+/// offset to the right and bottom for when to redraw scrollbars
+#define   WXLO_ROFFSET   20
+#define   WXLO_BOFFSET   20
+

 BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
    EVT_PAINT    (wxLayoutWindow::OnPaint)
    EVT_CHAR     (wxLayoutWindow::OnChar)
 BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
    EVT_PAINT    (wxLayoutWindow::OnPaint)
    EVT_CHAR     (wxLayoutWindow::OnChar)

+   EVT_KEY_UP   (wxLayoutWindow::OnKeyUp)

    EVT_LEFT_DOWN(wxLayoutWindow::OnLeftMouseClick)
    EVT_RIGHT_DOWN(wxLayoutWindow::OnRightMouseClick)
    EVT_LEFT_DCLICK(wxLayoutWindow::OnMouseDblClick)
    EVT_LEFT_DOWN(wxLayoutWindow::OnLeftMouseClick)
    EVT_RIGHT_DOWN(wxLayoutWindow::OnRightMouseClick)
    EVT_LEFT_DCLICK(wxLayoutWindow::OnMouseDblClick)

+   EVT_MOTION    (wxLayoutWindow::OnMouseMove)

    EVT_MENU_RANGE(WXLOWIN_MENU_FIRST, WXLOWIN_MENU_LAST, wxLayoutWindow::OnMenu)
    EVT_SET_FOCUS(wxLayoutWindow::OnSetFocus)
    EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)
    EVT_MENU_RANGE(WXLOWIN_MENU_FIRST, WXLOWIN_MENU_LAST, wxLayoutWindow::OnMenu)
    EVT_SET_FOCUS(wxLayoutWindow::OnSetFocus)
    EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)


@@ -60,11 +84,14 @@ wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
    m_bitmap = new wxBitmap(4,4);
    m_bitmapSize = wxPoint(4,4);
    m_llist = new wxLayoutList();
    m_bitmap = new wxBitmap(4,4);
    m_bitmapSize = wxPoint(4,4);
    m_llist = new wxLayoutList();

+   m_BGbitmap = NULL;
+   m_ScrollToCursor = false;

    SetWrapMargin(0);
    wxPoint max = m_llist->GetSize();
    SetScrollbars(10, 20 /*lineHeight*/, max.x/10+1, max.y/20+1);
    EnableScrolling(true,true);
    m_maxx = max.x; m_maxy = max.y;
    SetWrapMargin(0);
    wxPoint max = m_llist->GetSize();
    SetScrollbars(10, 20 /*lineHeight*/, max.x/10+1, max.y/20+1);
    EnableScrolling(true,true);
    m_maxx = max.x; m_maxy = max.y;

+   m_Selecting = false;

    SetCursor(wxCURSOR_IBEAM);
    SetDirty();
 }
    SetCursor(wxCURSOR_IBEAM);
    SetDirty();
 }


@@ -74,7 +101,8 @@ wxLayoutWindow::~wxLayoutWindow()
    delete m_memDC; // deletes bitmap automatically (?)
    delete m_bitmap;
    delete m_llist;
    delete m_memDC; // deletes bitmap automatically (?)
    delete m_bitmap;
    delete m_llist;

-   delete m_PopupMenu; 
+   delete m_PopupMenu;
+   SetBackgroundBitmap(NULL);

 }
 
 #ifdef __WXMSW__
 }
 
 #ifdef __WXMSW__


@@ -92,7 +120,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    wxPaintDC dc( this );
    PrepareDC( dc );     
    SetFocus();
    wxPaintDC dc( this );
    PrepareDC( dc );     
    SetFocus();

-   
+

    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());
    findPos.y = dc.DeviceToLogicalY(event.GetY());
    wxPoint findPos;
    findPos.x = dc.DeviceToLogicalX(event.GetX());
    findPos.y = dc.DeviceToLogicalY(event.GetY());


@@ -102,29 +130,40 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 
    if(findPos.x < 0) findPos.x = 0;
    if(findPos.y < 0) findPos.y = 0;
 
    if(findPos.x < 0) findPos.x = 0;
    if(findPos.y < 0) findPos.y = 0;

-   
-#ifdef WXLAYOUT_DEBUG
-   wxLogDebug("wxLayoutWindow::OnMouse: (%d, %d) -> (%d, %d)",
-              event.GetX(), event.GetY(), findPos.x, findPos.y);
-#endif

 
 

-   m_ClickPosition = findPos;
+   m_ClickPosition = wxPoint(event.GetX(), event.GetY());
+

    wxPoint cursorPos;
    wxPoint cursorPos;

-   wxLayoutObject *obj = m_llist->FindObjectScreen(dc, findPos, &cursorPos);
+   bool found;
+   wxLayoutObject *obj = m_llist->FindObjectScreen(dc, findPos,
+                                                   &cursorPos, &found);

 
 

-#ifdef WXLAYOUT_DEBUG
-   if(obj)
-      wxLogDebug("wxLayoutWindow::OnMouse: Found object of type %d.",
-                 obj->GetType());
-   else
-      wxLogDebug("wxLayoutWindow::OnMouse: Found no object.");
-#endif
+   //has the mouse only been moved?
+   if(eventId == WXLOWIN_MENU_MOUSEMOVE)
+   {
+      // found is only true if we are really over an object, not just
+      // behind it
+      if(found && obj && obj->GetUserData() != NULL)
+      {
+         if(!m_HandCursor)
+            SetCursor(wxCURSOR_HAND);
+         m_HandCursor = TRUE;
+      }
+      else
+      {
+         if(m_HandCursor)
+            SetCursor(wxCURSOR_IBEAM);
+         m_HandCursor = FALSE;
+      }
+      return;
+   }

 
    // always move cursor to mouse click:
    if(obj && eventId == WXLOWIN_MENU_LCLICK)
    {
       m_llist->MoveCursorTo(cursorPos);
 
    // always move cursor to mouse click:
    if(obj && eventId == WXLOWIN_MENU_LCLICK)
    {
       m_llist->MoveCursorTo(cursorPos);

-      DoPaint(false); 
+      ScrollToCursor();
+      Refresh(FALSE); // DoPaint suppresses flicker under GTK

    }
    if(!m_doSendEvents) // nothing to do
       return;
    }
    if(!m_doSendEvents) // nothing to do
       return;


@@ -135,7 +174,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
       && (! obj || (obj && obj->GetUserData() == NULL))
       )
    {
       && (! obj || (obj && obj->GetUserData() == NULL))
       )
    {

-      PopupMenu(m_PopupMenu, event.GetX(), event.GetY());
+      PopupMenu(m_PopupMenu, m_ClickPosition.x, m_ClickPosition.y);

       return;
    }
    // find the object at this position
       return;
    }
    // find the object at this position


@@ -154,123 +193,232 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 void
 wxLayoutWindow::OnChar(wxKeyEvent& event)
 {
 void
 wxLayoutWindow::OnChar(wxKeyEvent& event)
 {

-   if(!IsEditable()) // do nothing
+#ifdef WXLAYOUT_DEBUG
+   if(event.KeyCode() == WXK_F1)

    {
    {

-      event.Skip();
+      m_llist->Debug();

       return;
    }
       return;
    }

+#endif

    
    long keyCode = event.KeyCode();
    
    long keyCode = event.KeyCode();

-
-   /* First, handle control keys */
-   if(event.ControlDown() && ! event.AltDown())
+   if(m_Selecting && ! event.ShiftDown())

    {
    {

-      switch(event.KeyCode())
-      {
-      case WXK_DELETE :
-      case 'd':
-         m_llist->Delete(1);
-         break;
-      case 'y':
-         m_llist->DeleteLines(1);
-         break;
-      case 'h': // like backspace
-         if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
-         break;
-      case 'u':
-         m_llist->DeleteToBeginOfLine();
-         break;
-      case 'k':
-         m_llist->DeleteToEndOfLine();
-         break;
-#ifdef WXLAYOUT_DEBUG
-      case WXK_F1:
-         m_llist->SetFont(-1,-1,-1,-1,true);  // underlined
-         break;
-#endif
-      default:
-         ;
-      }
+      m_llist->EndSelection();
+      m_Selecting = false;

    }
    }

-   // ALT only:
-   else if( event.AltDown() && ! event.ControlDown() )
-   {
-      switch(event.KeyCode())
+   else
+      if(! m_Selecting && event.ShiftDown())

       {
       {

-      case WXK_DELETE:
-      case 'd':
-         m_llist->DeleteWord();
-         break;
-      default:
-         ;
+         switch(keyCode)
+         {
+         case WXK_UP:
+         case WXK_DOWN:
+         case WXK_RIGHT:
+         case WXK_LEFT:
+         case WXK_PRIOR:
+         case WXK_NEXT:
+         case WXK_HOME:
+         case WXK_END:
+            m_Selecting = true;
+            m_llist->StartSelection();
+            break;
+         default:
+            ;
+         }

       }
       }

-   }
-   // no control keys:
-   else if ( ! event.AltDown() && ! event.ControlDown())
+
+   /* These two nested switches work like this:
+      The first one processes all non-editing keycodes, to move the
+      cursor, etc. It's default will process all keycodes causing
+      modifications to the buffer, but only if editing is allowed.
+   */
+   switch(keyCode)

    {
    {

-      switch(event.KeyCode())
+   case WXK_RIGHT:
+      m_llist->MoveCursorHorizontally(1);
+      break;
+   case WXK_LEFT:
+      m_llist->MoveCursorHorizontally(-1);
+      break;
+   case WXK_UP:
+      m_llist->MoveCursorVertically(-1);
+      break;
+   case WXK_DOWN:
+      m_llist->MoveCursorVertically(1);
+      break;
+   case WXK_PRIOR:
+      m_llist->MoveCursorVertically(-20);
+      break;
+   case WXK_NEXT:
+      m_llist->MoveCursorVertically(20);
+      break;
+   case WXK_HOME:
+      m_llist->MoveCursorToBeginOfLine();
+      break;
+   case WXK_END:
+      m_llist->MoveCursorToEndOfLine();
+      break;
+   default:
+      if(keyCode == 'c' && event.ControlDown())
+         Copy();
+      if( IsEditable() )

       {
       {

-      case WXK_RIGHT:
-         m_llist->MoveCursorHorizontally(1);
-         break;
-      case WXK_LEFT:
-         m_llist->MoveCursorHorizontally(-1);
-         break;
-      case WXK_UP:
-         m_llist->MoveCursorVertically(-1);
-         break;
-      case WXK_DOWN:
-         m_llist->MoveCursorVertically(1);
-         break;
-      case WXK_PRIOR:
-         m_llist->MoveCursorVertically(-20);
-         break;
-      case WXK_NEXT:
-         m_llist->MoveCursorVertically(20);
-         break;
-      case WXK_HOME:
-         m_llist->MoveCursorToBeginOfLine();
-         break;
-      case WXK_END:
-         m_llist->MoveCursorToEndOfLine();
-         break;
-      case WXK_DELETE :
-         m_llist->Delete(1);
-         break;
-      case WXK_BACK: // backspace
-         if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
-         break;
-      case WXK_RETURN:
-         if(m_WrapMargin > 0)
-            m_llist->WrapLine(m_WrapMargin);
-         m_llist->LineBreak();
-         break;
-      default:
-         if((!(event.ControlDown() || event.AltDown() || event.MetaDown()))
-            && (keyCode < 256 && keyCode >= 32)
-            )
+         /* First, handle control keys */
+         if(event.ControlDown() && ! event.AltDown())
+         {
+            switch(keyCode)
+            {
+            case WXK_DELETE :
+            case 'd':
+               m_llist->Delete(1);
+               break;
+            case 'y':
+               m_llist->DeleteLines(1);
+               break;
+            case 'h': // like backspace
+               if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
+               break;
+            case 'u':
+               m_llist->DeleteToBeginOfLine();
+               break;
+            case 'k':
+               m_llist->DeleteToEndOfLine();
+               break;
+            case 'v':
+               Paste();
+               break;
+#ifdef WXLAYOUT_DEBUG
+            case WXK_F1:
+               m_llist->SetFont(-1,-1,-1,-1,true);  // underlined
+               break;
+#endif
+            default:
+               ;
+            }
+         }
+         // ALT only:
+         else if( event.AltDown() && ! event.ControlDown() )

          {
          {

-            wxString tmp;
-            tmp += keyCode;
-            if(m_WrapMargin > 0 && isspace(keyCode))
-                m_llist->WrapLine(m_WrapMargin);
-            m_llist->Insert(tmp);
+            switch(keyCode)
+            {
+            case WXK_DELETE:
+            case 'd':
+               m_llist->DeleteWord();
+               break;
+            default:
+               ;
+            }

          }
          }

-         break;
-      }
+         // no control keys:
+         else if ( ! event.AltDown() && ! event.ControlDown())
+         {
+            switch(keyCode)
+            {
+            case WXK_INSERT:
+               if(event.ShiftDown())
+                  Paste();
+               break;
+            case WXK_DELETE :
+               m_llist->Delete(1);
+               break;
+            case WXK_BACK: // backspace
+               if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
+               break;
+            case WXK_RETURN:
+               if(m_WrapMargin > 0)
+                  m_llist->WrapLine(m_WrapMargin);
+               m_llist->LineBreak();
+               break;
+            default:
+               if((!(event.ControlDown() || event.AltDown() || event.MetaDown()))
+                  && (keyCode < 256 && keyCode >= 32)
+                  )
+               {
+                  wxString tmp;
+                  tmp += keyCode;
+                  if(m_WrapMargin > 0 && isspace(keyCode))
+                     m_llist->WrapLine(m_WrapMargin);
+                  m_llist->Insert(tmp);
+               }
+               break;
+            }
+         }
+         SetDirty();
+         SetModified();
+      }// if(IsEditable()) 
+   }// first switch()
+   ScrollToCursor();
+   wxRect r = *m_llist->GetUpdateRect();
+   DoPaint(&r);
+}
+
+void
+wxLayoutWindow::OnKeyUp(wxKeyEvent& event)
+{
+   if(event.KeyCode() == WXK_SHIFT && m_llist->IsSelecting())
+      m_llist->EndSelection();
+   event.Skip();
+}
+
+
+void
+wxLayoutWindow::ScrollToCursor(void)
+{
+   wxClientDC dc( this );
+   PrepareDC( dc );
+
+   int x0,y0,x1,y1, dx, dy;
+
+   // Calculate where the top of the visible area is:
+   ViewStart(&x0,&y0);
+   GetScrollPixelsPerUnit(&dx, &dy);
+   x0 *= dx; y0 *= dy;
+
+   // Get the size of the visible window:
+   GetClientSize(&x1,&y1);
+   wxASSERT(x1 > 0);
+   wxASSERT(y1 > 0);
+   // As we have the values anyway, use them to avoid unnecessary
+   // scrollbar updates.
+   if(x1 > m_maxx) m_maxx = x1;  
+   if(y1 > m_maxy) m_maxy = y1;
+   /* Make sure that the scrollbars are at a position so that the
+      cursor is visible if we are editing. */
+      /** Scroll so that cursor is visible! */
+   WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor));
+   wxPoint cc = m_llist->GetCursorScreenPos(*m_memDC);
+   if(cc.x < x0 || cc.y < y0
+      || cc.x >= x0+(9*x1)/10 || cc.y >= y0+(9*y1/10))  // (9*x)/10 ==  90%
+   {
+      int nx, ny;
+      nx = cc.x - x1/2; if(nx < 0) nx = 0;
+      ny = cc.y - y1/2; if(ny < 0) ny = 0;
+      Scroll(nx/dx,ny/dy); // new view start
+      x0 = nx; y0 = ny;
+      m_ScrollToCursor = false; // avoid recursion

    }
    }

-   SetDirty();
-   DoPaint(true); // paint and scroll to cursor

 }
 
 void
 wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))  // or: OnDraw(wxDC& dc)
 {
 }
 
 void
 wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))  // or: OnDraw(wxDC& dc)
 {

-   DoPaint();
+   wxRect region = GetUpdateRegion().GetBox();
+   InternalPaint(& region);

 }
 
 void
 }
 
 void

-wxLayoutWindow::DoPaint(bool scrollToCursor)
+wxLayoutWindow::DoPaint(const wxRect *updateRect)
+{
+#ifdef __WXGTK__
+   InternalPaint(updateRect);
+#else
+   Refresh(FALSE, updateRect); // Causes bad flicker under wxGTK!!!
+#endif
+}
+
+void
+wxLayoutWindow::InternalPaint(const wxRect *updateRect)

 {
    wxPaintDC dc( this );
    PrepareDC( dc );
 {
    wxPaintDC dc( this );
    PrepareDC( dc );


@@ -285,36 +433,20 @@ wxLayoutWindow::DoPaint(bool scrollToCursor)
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);
    wxASSERT(x1 > 0);
    // Get the size of the visible window:
    GetClientSize(&x1,&y1);
    wxASSERT(x1 > 0);

-

    wxASSERT(y1 > 0);
    wxASSERT(y1 > 0);

+   // As we have the values anyway, use them to avoid unnecessary
+   // scrollbar updates.
+   if(x1 > m_maxx) m_maxx = x1;  
+   if(y1 > m_maxy) m_maxy = y1;
+
+   WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
+               updateRect->x, updateRect->y,
+               updateRect->x+updateRect->width,
+               updateRect->y+updateRect->height));

 
 

-   // Maybe we need to change the scrollbar sizes or positions,
-   // so layout the list and check:
-   if(IsDirty())
-      m_llist->Layout(dc);
-   // this is needed even when only the cursor moved
-   m_llist->Layout(dc,y0+y1);
-   

    if(IsDirty())
       ResizeScrollbars();
    
    if(IsDirty())
       ResizeScrollbars();
    

-   /* Make sure that the scrollbars are at a position so that the
-      cursor is visible if we are editing. */
-      /** Scroll so that cursor is visible! */
-   if(IsEditable() && scrollToCursor)
-   {
-      wxPoint cc = m_llist->GetCursorScreenPos();
-      if(cc.x < x0 || cc.y < y0
-         || cc.x >= x0+(9*x1)/10 || cc.y >= y0+(9*y1/10))  // (9*x)/10 ==  90%
-      {
-         int nx, ny;
-         nx = cc.x - x1/2; if(nx < 0) nx = 0;
-         ny = cc.y - y1/2; if(ny < 0) ny = 0;
-         Scroll(nx/dx,ny/dy); // new view start
-         x0 = nx; y0 = ny;
-      }
-   }
-   

    /* Check whether the window has grown, if so, we need to reallocate 
       the bitmap to be larger. */
    if(x1 > m_bitmapSize.x || y1 > m_bitmapSize.y)
    /* Check whether the window has grown, if so, we need to reallocate 
       the bitmap to be larger. */
    if(x1 > m_bitmapSize.x || y1 > m_bitmapSize.y)


@@ -328,37 +460,100 @@ wxLayoutWindow::DoPaint(bool scrollToCursor)
       m_bitmap = new wxBitmap(x1,y1);
       m_memDC->SelectObject(*m_bitmap);
    }
       m_bitmap = new wxBitmap(x1,y1);
       m_memDC->SelectObject(*m_bitmap);
    }

-   // Device origins on the memDC are suspect, we translate manually
-   // with the translate parameter of Draw().
+

    m_memDC->SetDeviceOrigin(0,0);
    m_memDC->SetDeviceOrigin(0,0);

-   m_memDC->Clear();
+   m_memDC->SetBrush(wxBrush(m_llist->GetDefaults()->GetBGColour(),wxSOLID));
+   m_memDC->SetPen(wxPen(m_llist->GetDefaults()->GetBGColour(),
+                         0,wxTRANSPARENT));                               
+   m_memDC->SetLogicalFunction(wxCOPY);
+
+   /* Either fill the background with the background bitmap, or clear
+      it. */
+   if(m_BGbitmap)
+   {
+      CoordType
+         y, x,
+         w = m_BGbitmap->GetWidth(),
+         h = m_BGbitmap->GetHeight();
+      for(y = 0; y < y1; y+=h)
+         for(x = 0; x < x1; x+=w)
+            m_memDC->DrawBitmap(*m_BGbitmap, x, y);
+      m_memDC->SetBackgroundMode(wxTRANSPARENT);
+   }
+   else
+   {
+      // clear the background: (must not be done if we use the update rectangle!)
+      m_memDC->SetBackgroundMode(wxSOLID);
+      m_memDC->DrawRectangle(0,0,x1, y1);
+   }

 
 

-   // The offsets give the window a tiny border on the left and top, looks nice.
+   
+   /* This is the important bit: we tell the list to draw itself: */
+   WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
+               updateRect->x, updateRect->y,
+               updateRect->x+updateRect->width,
+               updateRect->y+updateRect->height)); 
+   
+   // Device origins on the memDC are suspect, we translate manually
+   // with the translate parameter of Draw().

    wxPoint offset(-x0+WXLO_XOFFSET,-y0+WXLO_YOFFSET);
    wxPoint offset(-x0+WXLO_XOFFSET,-y0+WXLO_YOFFSET);

-   m_llist->Draw(*m_memDC,offset);
-   if(IsEditable())
-      m_llist->DrawCursor(*m_memDC,m_HaveFocus,offset);
-   // Now copy everything to the screen:
-   dc.Blit(x0,y0,x1,y1,m_memDC,0,0,wxCOPY,FALSE);
+   m_llist->Draw(*m_memDC,offset, y0, y0+y1);
+
+   // We start calculating a new update rect before drawing the
+   // cursor, so that the cursor coordinates get included in the next
+   // update rectangle (although they are drawn on the memDC, this is
+   // needed to erase it):
+   m_llist->InvalidateUpdateRect(); 
+   m_llist->DrawCursor(*m_memDC,
+                       m_HaveFocus && IsEditable(), // draw a thick
+                       // cursor for editable windows with focus
+                       offset);
+
+// Now copy everything to the screen:
+#if 0
+   // This somehow doesn't work, but even the following bit with the
+   // whole rect at once is still a bit broken I think.
+   wxRegionIterator ri ( GetUpdateRegion() );
+   if(ri)
+      while(ri)
+      {
+         WXLO_DEBUG(("UpdateRegion: %ld,%ld, %ld,%ld",
+                     ri.GetX(),ri.GetY(),ri.GetW(),ri.GetH()));
+         dc.Blit(x0+ri.GetX(),y0+ri.GetY(),ri.GetW(),ri.GetH(),
+                 m_memDC,ri.GetX(),ri.GetY(),wxCOPY,FALSE);
+         ri++;
+      }
+   else
+#endif
+   {
+      // FIXME: Trying to copy only the changed parts, but it does not seem
+      // to work:
+//      x0 = updateRect->x; y0 = updateRect->y;
+//      if(updateRect->height < y1)
+//         y1 = updateRect->height;
+//      y1 += WXLO_YOFFSET; //FIXME might not be needed
+      dc.Blit(x0,y0,x1,y1,m_memDC,0,0,wxCOPY,FALSE);
+   }

 
 

-   

    ResetDirty();
    ResetDirty();

+   m_ScrollToCursor = false;

 }
 
 }
 

-// change the range and position of scroll bars
+// change the range and position of scrollbars

 void
 wxLayoutWindow::ResizeScrollbars(bool exact)
 {
    wxPoint max = m_llist->GetSize();
 void
 wxLayoutWindow::ResizeScrollbars(bool exact)
 {
    wxPoint max = m_llist->GetSize();

-
+   

    if(max.x > m_maxx || max.y > m_maxy
    if(max.x > m_maxx || max.y > m_maxy

-      || max.x < (7*m_maxx)/10 || max.y << (7*m_maxy)/10
+      || max.x > m_maxx-WXLO_ROFFSET || max.y > m_maxy-WXLO_BOFFSET

       || exact)
    {
       || exact)
    {

-      if(! exact)  // add an extra 20% to the sizes to avoid future updates
+      if(! exact) 

       {
       {

-         max.x = (12*max.x)/10;  // 12/20 = 120%
-         max.y = (12*max.y)/10;
+         // add an extra bit to the sizes to avoid future updates
+         max.x = max.x+WXLO_ROFFSET;  
+         max.y = max.y+WXLO_BOFFSET;

       }
       ViewStart(&m_ViewStartX, &m_ViewStartY);
       SetScrollbars(10, 20, max.x/10+1,max.y/20+1,m_ViewStartX,m_ViewStartY,true);
       }
       ViewStart(&m_ViewStartX, &m_ViewStartY);
       SetScrollbars(10, 20, max.x/10+1,max.y/20+1,m_ViewStartX,m_ViewStartY,true);


@@ -366,6 +561,62 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
    }
 }
 
    }
 }
 

+void
+wxLayoutWindow::Paste(void)
+{
+   wxString text;
+   // Read some text
+   if (wxTheClipboard->Open())
+   {
+      wxTextDataObject data;
+      if (wxTheClipboard->IsSupported( data.GetFormat() ))
+      {
+         wxTheClipboard->GetData(&data);
+         text += data.GetText();
+      }  
+      wxTheClipboard->Close();
+   }
+#if 0
+   /* My attempt to get the primary selection, but it does not
+      work. :-( */
+   if(text.Length() == 0)
+   {
+      wxTextCtrl tmp_tctrl(this,-1);
+      tmp_tctrl.Paste();
+      text += tmp_tctrl.GetValue();
+   }
+#endif
+   wxLayoutImportText( m_llist, text);
+}
+
+bool
+wxLayoutWindow::Copy(void)
+{
+   wxLayoutList *llist = m_llist->GetSelection();
+   if(! llist)
+      return FALSE;
+
+   wxString text;
+   wxLayoutExportObject *export;
+   wxLayoutExportStatus status(llist);
+   while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
+   {
+      if(export->type == WXLO_EXPORT_TEXT)
+         text << *(export->content.text);
+      delete export;
+   }
+   delete llist;
+   
+   // Read some text
+   if (wxTheClipboard->Open())
+   {
+      wxTextDataObject *data = new wxTextDataObject( text );
+      bool  rc = wxTheClipboard->SetData( data );
+      wxTheClipboard->Close();
+      return rc;
+   }
+   return FALSE;
+}

 
 wxMenu *
 wxLayoutWindow::MakeFormatMenu()
 
 wxMenu *
 wxLayoutWindow::MakeFormatMenu()


@@ -421,12 +672,12 @@ void
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;
 wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;

-   DoPaint(); // to repaint the cursor
+//FIXME: need argument   DoPaint(); // to repaint the cursor

 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;
 }
 
 void
 wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;

-   DoPaint(); // to repaint the cursor
+//FIXME: need argument   DoPaint(); // to repaint the cursor

 }
 }