Checked for stream validity in wxImage::GetImageCount.

[wxWidgets.git] / src / stc / ScintillaWX.cpp

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index ec2297af18a9f9cc95ac7703d3787a8b04b579b4..e389534c80a56a3c2b7911ae0d06125c194e970a 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -19,13 +19,6 @@
 #include "wx/stc/stc.h"
 #include "PlatWX.h"
 
 #include "wx/stc/stc.h"
 #include "PlatWX.h"
 

-
-//----------------------------------------------------------------------
-
-const int H_SCROLL_MAX  = 4000;
-const int H_SCROLL_STEP = 20;
-const int H_SCROLL_PAGE = 200;
-

 //----------------------------------------------------------------------
 // Helper classes
 
 //----------------------------------------------------------------------
 // Helper classes
 


@@ -63,6 +56,11 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
 #endif
 
 

+#ifdef __WXGTK__
+#undef wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0
+#endif
+

 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow


@@ -80,6 +78,10 @@ public:
             m_ct = ct;
         }
 
             m_ct = ct;
         }
 

+    ~wxSTCCallTip() {
+        if (HasCapture()) ReleaseMouse();
+    }
+

     void OnPaint(wxPaintEvent& evt) {
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
     void OnPaint(wxPaintEvent& evt) {
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();


@@ -106,12 +108,10 @@ public:
 
     virtual bool Show( bool show = TRUE ) {
         bool retval = wxSTCCallTipBase::Show(show);
 
     virtual bool Show( bool show = TRUE ) {
         bool retval = wxSTCCallTipBase::Show(show);

-        if (show) {
+        if (show)

             CaptureMouse();
             CaptureMouse();

-        }
-        else {
-            ReleaseMouse();
-        }
+        else
+            if (HasCapture()) ReleaseMouse();

         return retval;
     }
 
         return retval;
     }
 


@@ -258,16 +258,18 @@ void ScintillaWX::SetHorizontalScrollPos() {
     }
 }
 
     }
 }
 

+const int H_SCROLL_STEP = 20;

 
 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 
 
 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 

+    // Check the vertical scrollbar

     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
         int  sbMax    = stc->GetScrollRange(wxVERTICAL);
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {
     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
         int  sbMax    = stc->GetScrollRange(wxVERTICAL);
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
         if (sbMax != nMax || sbThumb != nPage) {

-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax);
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1);

             modified = true;
         }
     }
             modified = true;
         }
     }


@@ -276,30 +278,46 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
         if (sbMax != nMax || sbPage != nPage) {

-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, nPage);
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage);

             modified = true;
         }
     }
 
 
             modified = true;
         }
     }
 
 

-    if (horizontalScrollBarVisible) {
-        if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
-            int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
-            int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
-            if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) {
-                stc->SetScrollbar(wxHORIZONTAL, 0, H_SCROLL_STEP, H_SCROLL_MAX);
-                modified = true;
+    // Check the horizontal scrollbar
+    PRectangle rcText = GetTextRectangle();
+    int horizEnd = scrollWidth;
+    if (horizEnd < 0)
+        horizEnd = 0;
+    if (!horizontalScrollBarVisible || (wrapState != eWrapNone))
+        horizEnd = 0;
+    int pageWidth = rcText.Width();
+
+    if (stc->m_hScrollBar == NULL) {  // Use built-in scrollbar
+        int sbMax    = stc->GetScrollRange(wxHORIZONTAL);
+        int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
+        int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+            stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd);
+            modified = true;
+            if (scrollWidth < pageWidth) {
+                HorizontalScrollTo(0);

             }
         }
             }
         }

-        else { // otherwise use the one that's been given to us
-            int  sbMax    = stc->m_hScrollBar->GetRange();
-            int  sbPage   = stc->m_hScrollBar->GetPageSize();
-            if ((sbMax != H_SCROLL_MAX) || (sbPage != H_SCROLL_STEP)) {
-                stc->m_hScrollBar->SetScrollbar(0, H_SCROLL_STEP, H_SCROLL_MAX, H_SCROLL_STEP);
-                modified = true;
+    }
+    else { // otherwise use the one that's been given to us
+        int sbMax    = stc->m_hScrollBar->GetRange();
+        int sbThumb  = stc->m_hScrollBar->GetPageSize();
+        int sbPos    = stc->m_hScrollBar->GetThumbPosition();
+        if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
+            stc->m_hScrollBar->SetScrollbar(0, pageWidth, horizEnd, pageWidth);
+            modified = true;
+            if (scrollWidth < pageWidth) {
+                HorizontalScrollTo(0);

             }
         }
     }
             }
         }
     }

+

     return modified;
 }
 
     return modified;
 }
 


@@ -319,10 +337,12 @@ void ScintillaWX::Copy() {
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);
     if (currentPos != anchor) {
         SelectionText st;
         CopySelectionRange(&st);

-        wxTheClipboard->Open();
-        wxString text = stc2wx(st.s, st.len);
-        wxTheClipboard->SetData(new wxTextDataObject(text));
-        wxTheClipboard->Close();
+        if (wxTheClipboard->Open()) {
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            wxString text = stc2wx(st.s, st.len);
+            wxTheClipboard->SetData(new wxTextDataObject(text));
+            wxTheClipboard->Close();
+        }

     }
 }
 
     }
 }
 


@@ -332,11 +352,13 @@ void ScintillaWX::Paste() {
     ClearSelection();
 
     wxTextDataObject data;
     ClearSelection();
 
     wxTextDataObject data;

-    bool gotData;
+    bool gotData = FALSE;

 
 

-    wxTheClipboard->Open();
-    gotData = wxTheClipboard->GetData(data);
-    wxTheClipboard->Close();
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->UsePrimarySelection(FALSE);
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->Close();
+    }

     if (gotData) {
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);
     if (gotData) {
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
         int        len = strlen(buf);


@@ -351,12 +373,18 @@ void ScintillaWX::Paste() {
 
 
 bool ScintillaWX::CanPaste() {
 
 
 bool ScintillaWX::CanPaste() {

-    bool canPaste;
+    bool canPaste = FALSE;
+    bool didOpen;

 
 

-    wxTheClipboard->Open();
-    canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-    wxTheClipboard->Close();
+    if ( (didOpen = !wxTheClipboard->IsOpened()) )
+        wxTheClipboard->Open();

 
 

+    if (wxTheClipboard->IsOpened()) {
+        wxTheClipboard->UsePrimarySelection(FALSE);
+        canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+        if (didOpen)
+            wxTheClipboard->Close();
+    }

     return canPaste;
 }
 
     return canPaste;
 }
 


@@ -377,8 +405,22 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) {
 }
 
 
 }
 
 

+// This is called by the Editor base class whenever something is selected

 void ScintillaWX::ClaimSelection() {
 void ScintillaWX::ClaimSelection() {

-
+#ifdef __WXGTK__
+    // Put the selected text in the PRIMARY selection
+    if (currentPos != anchor) {
+        SelectionText st;
+        CopySelectionRange(&st);
+        if (wxTheClipboard->Open()) {
+            wxTheClipboard->UsePrimarySelection(TRUE);
+            wxString text = stc2wx(st.s, st.len);
+            wxTheClipboard->SetData(new wxTextDataObject(text));
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            wxTheClipboard->Close();
+        }
+    }
+#endif

 }
 
 
 }
 
 


@@ -426,18 +468,24 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;
 
 void ScintillaWX::DoHScroll(int type, int pos) {
     int xPos = xOffset;

+    PRectangle rcText = GetTextRectangle();
+    int pageWidth = rcText.Width() * 2 / 3;

     if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
         xPos -= H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
         xPos += H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)
     if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP)
         xPos -= H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN)
         xPos += H_SCROLL_STEP;
     else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP)

-        xPos -= H_SCROLL_PAGE;
-    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN)
-        xPos += H_SCROLL_PAGE;
+        xPos -= pageWidth;
+    else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) {
+        xPos += pageWidth;
+        if (xPos > scrollWidth - rcText.Width()) {
+            xPos = scrollWidth - rcText.Width();
+        }
+    }

     else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
         xPos = 0;
     else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)
     else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP)
         xPos = 0;
     else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM)

-        xPos = H_SCROLL_MAX;
+        xPos = scrollWidth;

     else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
         xPos = pos;
 
     else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK)
         xPos = pos;
 


@@ -464,8 +512,9 @@ void ScintillaWX::DoVScroll(int type, int pos) {
     ScrollTo(topLineNew);
 }
 
     ScrollTo(topLineNew);
 }
 

-
-void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) {
+void ScintillaWX::DoMouseWheel(int rotation, int delta,
+                               int linesPerAction, int ctrlDown,
+                               bool isPageScroll ) {

     int topLineNew = topLine;
     int lines;
 
     int topLineNew = topLine;
     int lines;
 


@@ -482,7 +531,10 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
         if (lines != 0) {
         lines = wheelRotation / delta;
         wheelRotation -= lines * delta;
         if (lines != 0) {

-            lines *= linesPerAction;
+            if (isPageScroll)
+                lines = lines * LinesOnScreen();  // lines is either +1 or -1
+            else
+                lines *= linesPerAction;

             topLineNew -= lines;
             ScrollTo(topLineNew);
         }
             topLineNew -= lines;
             ScrollTo(topLineNew);
         }


@@ -509,23 +561,64 @@ void ScintillaWX::DoSysColourChange() {
     InvalidateStyleData();
 }
 
     InvalidateStyleData();
 }
 

-void ScintillaWX::DoButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {
+void ScintillaWX::DoLeftButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt) {

     ButtonDown(pt, curTime, shift, ctrl, alt);
 }
 
     ButtonDown(pt, curTime, shift, ctrl, alt);
 }
 

-void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) {
+void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {

     ButtonUp(pt, curTime, ctrl);
 }
 
     ButtonUp(pt, curTime, ctrl);
 }
 

-void ScintillaWX::DoButtonMove(Point pt) {
+void ScintillaWX::DoLeftButtonMove(Point pt) {

     ButtonMove(pt);
 }
 
     ButtonMove(pt);
 }
 

+void ScintillaWX::DoMiddleButtonUp(Point pt) {
+#ifdef __WXGTK__
+    // Set the current position to the mouse click point and
+    // then paste in the PRIMARY selection, if any.  wxGTK only.
+    int newPos = PositionFromLocation(pt);
+    MovePositionTo(newPos, 0, 1);
+
+    pdoc->BeginUndoAction();
+    wxTextDataObject data;
+    bool gotData = FALSE;
+    if (wxTheClipboard->Open()) {
+        wxTheClipboard->UsePrimarySelection(TRUE);
+        gotData = wxTheClipboard->GetData(data);
+        wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->Close();
+    }
+    if (gotData) {
+        wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
+        int        len = strlen(buf);
+        pdoc->InsertString(currentPos, buf, len);
+        SetEmptySelection(currentPos + len);
+    }
+    pdoc->EndUndoAction();
+    NotifyChange();
+    Redraw();
+
+    ShowCaretAtCurrentPosition();
+    EnsureCaretVisible();
+#endif
+}
+

 
 void ScintillaWX::DoAddChar(int key) {
 
 void ScintillaWX::DoAddChar(int key) {

+#if wxUSE_UNICODE
+    char ansiChars[3];
+    ansiChars[0] = key;
+    ansiChars[1] = 0;
+    wxString uniChar(ansiChars, wxConvLocal);
+    wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(uniChar);
+    AddCharUTF((char*)buf.data(), strlen(buf));
+#else

     AddChar(key);
     AddChar(key);

+#endif

 }
 
 }
 

+

 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
 #if defined(__WXGTK__) || defined(__WXMAC__)
     // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...
 int  ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) {
 #if defined(__WXGTK__) || defined(__WXMAC__)
     // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK...


@@ -575,7 +668,8 @@ void ScintillaWX::DoCommand(int ID) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {
 
 
 void ScintillaWX::DoContextMenu(Point pt) {

-    ContextMenu(pt);
+    if (displayPopupMenu)
+        ContextMenu(pt);

 }
 
 void ScintillaWX::DoOnListBox() {
 }
 
 void ScintillaWX::DoOnListBox() {