X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3c2c221081e2a3d65712b36429b4bc7bfc10b91..5f4d35b8045442f97ed74ba2aa633e843adae7ef:/contrib/src/stc/ScintillaWX.cpp diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 103ce92796..97173fd4f7 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////// // Name: ScintillaWX.cxx -// Purpose: A wxWindows implementation of Scintilla. A class derived +// Purpose: A wxWidgets implementation of Scintilla. A class derived // from ScintillaBase that uses the "wx platform" defined in // PlatformWX.cxx This class is one end of a bridge between // the wx world and the Scintilla world. It needs a peer @@ -14,17 +14,21 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include +#include +#include +#include +#include +#include #include "ScintillaWX.h" +#include "ExternalLexer.h" #include "wx/stc/stc.h" +#include "PlatWX.h" - -//---------------------------------------------------------------------- - -const int H_SCROLL_MAX = 2000; -const int H_SCROLL_STEP = 20; -const int H_SCROLL_PAGE = 200; +#ifdef __WXMSW__ + // GetHwndOf() + #include +#endif //---------------------------------------------------------------------- // Helper classes @@ -44,7 +48,7 @@ private: }; - +#if wxUSE_DRAG_AND_DROP bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) { return swx->DoDropText(x, y, data); } @@ -60,47 +64,142 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def void wxSTCDropTarget::OnLeave() { swx->DoDragLeave(); } +#endif + +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP +#include +#define wxSTCCallTipBase wxPopupWindow +#define param2 wxBORDER_NONE // popup's 2nd param is flags +#else +#define wxSTCCallTipBase wxWindow +#define param2 -1 // wxWindow's 2nd param is ID +#endif -class wxSTCCallTip : public wxWindow { +#include + +class wxSTCCallTip : public wxSTCCallTipBase { public: - wxSTCCallTip(wxWindow* parent, int ID, CallTip* ct) - : wxWindow(parent, ID) + wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) + : wxSTCCallTipBase(parent, param2), + m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord) { - m_ct = ct; } - void OnPaint(wxPaintEvent& evt) { - wxPaintDC dc(this); - Surface surfaceWindow; - surfaceWindow.Init(&dc); - m_ct->PaintCT(&surfaceWindow); - surfaceWindow.Release(); + ~wxSTCCallTip() { +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP && defined(__WXGTK__) + wxRect rect = GetRect(); + rect.x = m_cx; + rect.y = m_cy; + GetParent()->Refresh(false, &rect); +#endif + } + + bool AcceptsFocus() const { return false; } + + void OnPaint(wxPaintEvent& WXUNUSED(evt)) { + wxBufferedPaintDC dc(this); + Surface* surfaceWindow = Surface::Allocate(); + surfaceWindow->Init(&dc, m_ct->wDraw.GetID()); + m_ct->PaintCT(surfaceWindow); + surfaceWindow->Release(); + delete surfaceWindow; } - CallTip* m_ct; + void OnFocus(wxFocusEvent& event) { + GetParent()->SetFocus(); + event.Skip(); + } + + void OnLeftDown(wxMouseEvent& event) { + wxPoint pt = event.GetPosition(); + Point p(pt.x, pt.y); + m_ct->MouseClick(p); + m_swx->CallTipClick(); + } + +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO) { + if (x != wxDefaultCoord) { + m_cx = x; + GetParent()->ClientToScreen(&x, NULL); + } + if (y != wxDefaultCoord) { + m_cy = y; + GetParent()->ClientToScreen(NULL, &y); + } + wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags); + } +#endif + + wxPoint GetMyPosition() { + return wxPoint(m_cx, m_cy); + } + +private: + CallTip* m_ct; + ScintillaWX* m_swx; + int m_cx, m_cy; DECLARE_EVENT_TABLE() }; -BEGIN_EVENT_TABLE(wxSTCCallTip, wxWindow) +BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase) EVT_PAINT(wxSTCCallTip::OnPaint) + EVT_SET_FOCUS(wxSTCCallTip::OnFocus) + EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown) END_EVENT_TABLE() + +//---------------------------------------------------------------------- + +static wxTextFileType wxConvertEOLMode(int scintillaMode) +{ + wxTextFileType type; + + switch (scintillaMode) { + case wxSTC_EOL_CRLF: + type = wxTextFileType_Dos; + break; + + case wxSTC_EOL_CR: + type = wxTextFileType_Mac; + break; + + case wxSTC_EOL_LF: + type = wxTextFileType_Unix; + break; + + default: + type = wxTextBuffer::typeDefault; + break; + } + return type; +} + + //---------------------------------------------------------------------- // Constructor/Destructor ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { capturedMouse = false; + focusEvent = false; wMain = win; stc = win; wheelRotation = 0; Initialise(); +#ifdef __WXMSW__ + sysCaretBitmap = 0; + sysCaretWidth = 0; + sysCaretHeight = 0; +#endif } ScintillaWX::~ScintillaWX() { - SetTicking(false); + Finalise(); } //---------------------------------------------------------------------- @@ -109,28 +208,70 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); +#if wxUSE_DRAG_AND_DROP dropTarget = new wxSTCDropTarget; dropTarget->SetScintilla(this); stc->SetDropTarget(dropTarget); +#endif +#ifdef __WXMAC__ + vs.extraFontFlag = false; // UseAntiAliasing +#else + vs.extraFontFlag = true; // UseAntiAliasing +#endif } void ScintillaWX::Finalise() { ScintillaBase::Finalise(); + SetTicking(false); + SetIdle(false); + DestroySystemCaret(); } void ScintillaWX::StartDrag() { - wxDropSource source(wMain.GetID()); - wxTextDataObject data(dragChars); - wxDragResult result; - - source.SetData(data); - result = source.DoDragDrop(TRUE); - if (result == wxDragMove && dropWentOutside) - ClearSelection(); - inDragDrop = FALSE; - SetDragPosition(invalidPosition); +#if wxUSE_DRAG_AND_DROP + wxString dragText = stc2wx(drag.s, drag.len); + + // Send an event to allow the drag text to be changed + wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId()); + evt.SetEventObject(stc); + evt.SetDragText(dragText); + evt.SetDragAllowMove(true); + evt.SetPosition(wxMin(stc->GetSelectionStart(), + stc->GetSelectionEnd())); + stc->GetEventHandler()->ProcessEvent(evt); + dragText = evt.GetDragText(); + + if (dragText.Length()) { + wxDropSource source(stc); + wxTextDataObject data(dragText); + wxDragResult result; + + source.SetData(data); + dropWentOutside = true; + result = source.DoDragDrop(evt.GetDragAllowMove()); + if (result == wxDragMove && dropWentOutside) + ClearSelection(); + inDragDrop = false; + SetDragPosition(invalidPosition); + } +#endif +} + + +bool ScintillaWX::SetIdle(bool on) { + if (idler.state != on) { + // connect or disconnect the EVT_IDLE handler + if (on) + stc->Connect(wxID_ANY, wxEVT_IDLE, + (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle); + else + stc->Disconnect(wxID_ANY, wxEVT_IDLE, + (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle); + idler.state = on; + } + return idler.state; } @@ -141,7 +282,7 @@ void ScintillaWX::SetTicking(bool on) { if (timer.ticking) { steTimer = new wxSTCTimer(this); steTimer->Start(timer.tickSize); - timer.tickerID = (int)steTimer; + timer.tickerID = steTimer; } else { steTimer = (wxSTCTimer*)timer.tickerID; steTimer->Stop(); @@ -154,11 +295,13 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { - if (on && !capturedMouse) - wMain.GetID()->CaptureMouse(); - else if (!on && capturedMouse) - wMain.GetID()->ReleaseMouse(); - capturedMouse = on; + if (mouseDownCaptures) { + if (on && !capturedMouse) + stc->CaptureMouse(); + else if (!on && capturedMouse && stc->HasCapture()) + stc->ReleaseMouse(); + capturedMouse = on; + } } @@ -169,37 +312,93 @@ bool ScintillaWX::HaveMouseCapture() { void ScintillaWX::ScrollText(int linesToMove) { int dy = vs.lineHeight * (linesToMove); - wMain.GetID()->ScrollWindow(0, dy); - wMain.GetID()->Update(); + stc->ScrollWindow(0, dy); + stc->Update(); } void ScintillaWX::SetVerticalScrollPos() { - wMain.GetID()->SetScrollPos(wxVERTICAL, topLine); + if (stc->m_vScrollBar == NULL) { // Use built-in scrollbar + stc->SetScrollPos(wxVERTICAL, topLine); + } + else { // otherwise use the one that's been given to us + stc->m_vScrollBar->SetThumbPosition(topLine); + } } void ScintillaWX::SetHorizontalScrollPos() { - wMain.GetID()->SetScrollPos(wxHORIZONTAL, xOffset); + if (stc->m_hScrollBar == NULL) { // Use built-in scrollbar + stc->SetScrollPos(wxHORIZONTAL, xOffset); + } + else { // otherwise use the one that's been given to us + stc->m_hScrollBar->SetThumbPosition(xOffset); + } } +const int H_SCROLL_STEP = 20; + bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool modified = false; - int sbMax = wMain.GetID()->GetScrollRange(wxVERTICAL); - int sbThumb = wMain.GetID()->GetScrollThumb(wxVERTICAL); - int sbPos = wMain.GetID()->GetScrollPos(wxVERTICAL); - - if (sbMax != nMax || sbThumb != nPage) { - wMain.GetID()->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); - modified = true; + int vertEnd = nMax; + if (!verticalScrollBarVisible) + vertEnd = 0; + + // 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 != vertEnd || sbThumb != nPage) { + stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1); + modified = true; + } + } + else { // otherwise use the one that's been given to us + int sbMax = stc->m_vScrollBar->GetRange(); + int sbPage = stc->m_vScrollBar->GetPageSize(); + int sbPos = stc->m_vScrollBar->GetThumbPosition(); + if (sbMax != vertEnd || sbPage != nPage) { + stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage); + modified = true; + } } - sbMax = wMain.GetID()->GetScrollRange(wxHORIZONTAL); - sbThumb = wMain.GetID()->GetScrollThumb(wxHORIZONTAL); - if ((sbMax != H_SCROLL_MAX) || (sbThumb != H_SCROLL_STEP)) { - wMain.GetID()->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, sbPos, 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 sbThumb = stc->m_hScrollBar->GetPageSize(); + int sbPos = stc->m_hScrollBar->GetThumbPosition(); + if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) { + stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); + } + } } + return modified; } @@ -214,13 +413,24 @@ void ScintillaWX::NotifyParent(SCNotification scn) { } +// This method is overloaded from ScintillaBase in order to prevent the +// AutoComplete window from being destroyed when it gets the focus. There is +// a side effect that the AutoComp will also not be destroyed when switching +// to another window, but I think that is okay. +void ScintillaWX::CancelModes() { + if (! focusEvent) + AutoCompleteCancel(); + ct.CallTipCancel(); + Editor::CancelModes(); +} + + void ScintillaWX::Copy() { if (currentPos != anchor) { - char* text = CopySelectionRange(); - wxTheClipboard->Open(); - wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->Close(); + SelectionText st; + CopySelectionRange(&st); + CopyToClipboard(st); } } @@ -230,15 +440,19 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool canPaste; - - wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); - if (canPaste) { - wxString str = data.GetText(); - int len = str.Length(); - pdoc->InsertString(currentPos, str.c_str(), len); + bool gotData = false; + + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(false); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->Close(); + } + if (gotData) { + wxString text = wxTextBuffer::Translate(data.GetText(), + wxConvertEOLMode(pdoc->eolMode)); + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + int len = strlen(buf); + pdoc->InsertString(currentPos, buf, len); SetEmptySelection(currentPos + len); } @@ -248,51 +462,194 @@ void ScintillaWX::Paste() { } -bool ScintillaWX::CanPaste() { - wxTextDataObject data; - bool canPaste; +void ScintillaWX::CopyToClipboard(const SelectionText& st) { + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(false); + wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1)); + wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->Close(); + } +} - wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); - wxTheClipboard->Close(); +bool ScintillaWX::CanPaste() { + bool canPaste = false; + bool didOpen; + + if (Editor::CanPaste()) { + didOpen = !wxTheClipboard->IsOpened(); + if ( didOpen ) + wxTheClipboard->Open(); + + if (wxTheClipboard->IsOpened()) { + wxTheClipboard->UsePrimarySelection(false); + canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); + if (didOpen) + wxTheClipboard->Close(); + } + } return canPaste; } void ScintillaWX::CreateCallTipWindow(PRectangle) { - ct.wCallTip = new wxSTCCallTip(wMain.GetID(), -1, &ct); - ct.wDraw = ct.wCallTip; + if (! ct.wCallTip.Created() ) { + ct.wCallTip = new wxSTCCallTip(stc, &ct, this); + ct.wDraw = ct.wCallTip; + } } void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { if (!label[0]) - popup.GetID()->AppendSeparator(); + ((wxMenu*)popup.GetID())->AppendSeparator(); else - popup.GetID()->Append(cmd, label); + ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label))); if (!enabled) - popup.GetID()->Enable(cmd, enabled); + ((wxMenu*)popup.GetID())->Enable(cmd, enabled); } +// This is called by the Editor base class whenever something is selected void ScintillaWX::ClaimSelection() { +#if 0 + // Until wxGTK is able to support using both the primary selection and the + // clipboard at the same time I think it causes more problems than it is + // worth to implement this method. Selecting text should not clear the + // clipboard. --Robin +#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 +#endif +} + + +void ScintillaWX::UpdateSystemCaret() { +#ifdef __WXMSW__ + if (hasFocus) { + if (HasCaretSizeChanged()) { + DestroySystemCaret(); + CreateSystemCaret(); + } + Point pos = LocationFromPosition(currentPos); + ::SetCaretPos(pos.x, pos.y); + } +#endif +} + +bool ScintillaWX::HasCaretSizeChanged() { +#ifdef __WXMSW__ + if (( (0 != vs.caretWidth) && (sysCaretWidth != vs.caretWidth) ) + || (0 != vs.lineHeight) && (sysCaretHeight != vs.lineHeight)) { + return true; + } +#endif + return false; +} + +bool ScintillaWX::CreateSystemCaret() { +#ifdef __WXMSW__ + sysCaretWidth = vs.caretWidth; + if (0 == sysCaretWidth) { + sysCaretWidth = 1; + } + sysCaretHeight = vs.lineHeight; + int bitmapSize = (((sysCaretWidth + 15) & ~15) >> 3) * sysCaretHeight; + char *bits = new char[bitmapSize]; + memset(bits, 0, bitmapSize); + sysCaretBitmap = ::CreateBitmap(sysCaretWidth, sysCaretHeight, 1, + 1, reinterpret_cast(bits)); + delete [] bits; + BOOL retval = ::CreateCaret(GetHwndOf(stc), sysCaretBitmap, + sysCaretWidth, sysCaretHeight); + ::ShowCaret(GetHwndOf(stc)); + return retval != 0; +#else + return false; +#endif +} + +bool ScintillaWX::DestroySystemCaret() { +#ifdef __WXMSW__ + ::HideCaret(GetHwndOf(stc)); + BOOL retval = ::DestroyCaret(); + if (sysCaretBitmap) { + ::DeleteObject(sysCaretBitmap); + sysCaretBitmap = 0; + } + return retval != 0; +#else + return false; +#endif } +//---------------------------------------------------------------------- + + long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) { return 0; } long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) { -// switch (iMessage) { -// case EM_CANPASTE: -// return CanPaste(); -// default: - return ScintillaBase::WndProc(iMessage, wParam, lParam); -// } -// return 0; + switch (iMessage) { + case SCI_CALLTIPSHOW: { + // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx + // because of the little tweak that needs done below for wxGTK. + // When updating new versions double check that this is still + // needed, and that any new code there is copied here too. + Point pt = LocationFromPosition(wParam); + char* defn = reinterpret_cast(lParam); + AutoCompleteCancel(); + pt.y += vs.lineHeight; + PRectangle rc = ct.CallTipStart(currentPos, pt, + defn, + vs.styles[STYLE_DEFAULT].fontName, + vs.styles[STYLE_DEFAULT].sizeZoomed, + CodePage(), + vs.styles[STYLE_DEFAULT].characterSet, + wMain); + // If the call-tip window would be out of the client + // space, adjust so it displays above the text. + PRectangle rcClient = GetClientRectangle(); + if (rc.bottom > rcClient.bottom) { +#ifdef __WXGTK__ + int offset = int(vs.lineHeight * 1.25) + rc.Height(); +#else + int offset = vs.lineHeight + rc.Height(); +#endif + rc.top -= offset; + rc.bottom -= offset; + } + // Now display the window. + CreateCallTipWindow(rc); + ct.wCallTip.SetPositionRelative(rc, wMain); + ct.wCallTip.Show(); + break; + } + +#ifdef SCI_LEXER + case SCI_LOADLEXERLIBRARY: + LexerManager::GetInstance()->Load((const char*)lParam); + break; +#endif + + default: + return ScintillaBase::WndProc(iMessage, wParam, lParam); + } + return 0; } @@ -303,41 +660,48 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { paintState = painting; - Surface surfaceWindow; - surfaceWindow.Init(dc); - PRectangle rcPaint = PRectangleFromwxRect(rect); + Surface* surfaceWindow = Surface::Allocate(); + surfaceWindow->Init(dc, wMain.GetID()); + rcPaint = PRectangleFromwxRect(rect); + PRectangle rcClient = GetClientRectangle(); + paintingAllText = rcPaint.Contains(rcClient); + dc->BeginDrawing(); - Paint(&surfaceWindow, rcPaint); - dc->EndDrawing(); - surfaceWindow.Release(); + ClipChildren(*dc, rcPaint); + Paint(surfaceWindow, rcPaint); + + delete surfaceWindow; if (paintState == paintAbandoned) { - // Painting area was insufficient to cover new styling or brace highlight positions + // Painting area was insufficient to cover new styling or brace + // highlight positions FullPaint(); } paintState = notPainting; -#ifdef __WXGTK__ - // On wxGTK the editor window paints can overwrite the listbox... - if (ac.Active()) - ((wxWindow*)ac.lb.GetID())->Refresh(TRUE); -#endif + dc->EndDrawing(); } void ScintillaWX::DoHScroll(int type, int pos) { int xPos = xOffset; - if (type == wxEVT_SCROLLWIN_LINEUP) + 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) + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) xPos += H_SCROLL_STEP; - else if (type == wxEVT_SCROLLWIN_PAGEUP) - xPos -= H_SCROLL_PAGE; - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) - xPos += H_SCROLL_PAGE; - else if (type == wxEVT_SCROLLWIN_TOP) + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) + 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) - xPos = H_SCROLL_MAX; - else if (type == wxEVT_SCROLLWIN_THUMBTRACK) + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) + xPos = scrollWidth; + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) xPos = pos; HorizontalScrollTo(xPos); @@ -345,26 +709,27 @@ void ScintillaWX::DoHScroll(int type, int pos) { void ScintillaWX::DoVScroll(int type, int pos) { int topLineNew = topLine; - if (type == wxEVT_SCROLLWIN_LINEUP) + if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) topLineNew -= 1; - else if (type == wxEVT_SCROLLWIN_LINEDOWN) + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) topLineNew += 1; - else if (type == wxEVT_SCROLLWIN_PAGEUP) + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) topLineNew -= LinesToScroll(); - else if (type == wxEVT_SCROLLWIN_PAGEDOWN) + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) topLineNew += LinesToScroll(); - else if (type == wxEVT_SCROLLWIN_TOP) + else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) topLineNew = 0; - else if (type == wxEVT_SCROLLWIN_BOTTOM) + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) topLineNew = MaxScrollPos(); - else if (type == wxEVT_SCROLLWIN_THUMBTRACK) + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) topLineNew = pos; 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; @@ -377,11 +742,16 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int } } else { // otherwise just scroll the window + if ( !delta ) + delta = 120; wheelRotation += rotation; 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); } @@ -389,78 +759,147 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int } -void ScintillaWX::DoSize(int width, int height) { - PRectangle rcClient(0,0,width,height); - SetScrollBarsTo(rcClient); - DropGraphics(); +void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) { + ChangeSize(); } void ScintillaWX::DoLoseFocus(){ + focusEvent = true; SetFocusState(false); + focusEvent = false; + DestroySystemCaret(); } void ScintillaWX::DoGainFocus(){ + focusEvent = true; SetFocusState(true); + focusEvent = false; + DestroySystemCaret(); + CreateSystemCaret(); } void ScintillaWX::DoSysColourChange() { 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); } -void ScintillaWX::DoButtonUp(Point pt, unsigned int curTime, bool ctrl) { +void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) { ButtonUp(pt, curTime, ctrl); } -void ScintillaWX::DoButtonMove(Point pt) { +void ScintillaWX::DoLeftButtonMove(Point pt) { ButtonMove(pt); } +#ifdef __WXGTK__ +void ScintillaWX::DoMiddleButtonUp(Point pt) { + // 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, noSel, true); -void ScintillaWX::DoAddChar(char ch) { - AddChar(ch); + pdoc->BeginUndoAction(); + wxTextDataObject data; + bool gotData = false; + if (wxTheClipboard->Open()) { + wxTheClipboard->UsePrimarySelection(true); + gotData = wxTheClipboard->GetData(data); + wxTheClipboard->UsePrimarySelection(false); + wxTheClipboard->Close(); + } + if (gotData) { + wxString text = wxTextBuffer::Translate(data.GetText(), + wxConvertEOLMode(pdoc->eolMode)); + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text); + int len = strlen(buf); + pdoc->InsertString(currentPos, buf, len); + SetEmptySelection(currentPos + len); + } + pdoc->EndUndoAction(); + NotifyChange(); + Redraw(); + + ShowCaretAtCurrentPosition(); + EnsureCaretVisible(); } +#else +void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) { +} +#endif -int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* consumed) { -#ifdef __WXGTK__ - // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK... - if (ctrl && key >= 1 && key <= 26) - key += 'A' - 1; + +void ScintillaWX::DoAddChar(int key) { +#if wxUSE_UNICODE + wxChar wszChars[2]; + wszChars[0] = (wxChar)key; + wszChars[1] = 0; + wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars); + AddCharUTF((char*)buf.data(), strlen(buf)); +#else + AddChar((char)key); #endif +} + + +int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed) +{ + int key = evt.GetKeyCode(); + bool shift = evt.ShiftDown(), + ctrl = evt.ControlDown(), + alt = evt.AltDown(); + + if (ctrl && key >= 1 && key <= 26 && key != WXK_BACK) + key += 'A' - 1; switch (key) { - case WXK_DOWN: key = SCK_DOWN; break; - case WXK_UP: key = SCK_UP; break; - case WXK_LEFT: key = SCK_LEFT; break; - case WXK_RIGHT: key = SCK_RIGHT; break; - case WXK_HOME: key = SCK_HOME; break; - case WXK_END: key = SCK_END; break; - case WXK_PRIOR: key = SCK_PRIOR; break; - case WXK_NEXT: key = SCK_NEXT; break; - case WXK_DELETE: key = SCK_DELETE; break; - case WXK_INSERT: key = SCK_INSERT; break; - case WXK_ESCAPE: key = SCK_ESCAPE; break; - case WXK_BACK: key = SCK_BACK; break; - case WXK_TAB: key = SCK_TAB; break; - case WXK_RETURN: key = SCK_RETURN; break; - case WXK_ADD: - case WXK_NUMPAD_ADD: - key = SCK_ADD; break; - case WXK_SUBTRACT: - case WXK_NUMPAD_SUBTRACT: - key = SCK_SUBTRACT; break; - case WXK_DIVIDE: - case WXK_NUMPAD_DIVIDE: - key = SCK_DIVIDE; break; - case WXK_CONTROL: key = 0; break; - case WXK_ALT: key = 0; break; - case WXK_SHIFT: key = 0; break; - case WXK_MENU: key = 0; break; + case WXK_DOWN: key = SCK_DOWN; break; + case WXK_UP: key = SCK_UP; break; + case WXK_LEFT: key = SCK_LEFT; break; + case WXK_RIGHT: key = SCK_RIGHT; break; + case WXK_HOME: key = SCK_HOME; break; + case WXK_END: key = SCK_END; break; + case WXK_PAGEUP: // fall through + case WXK_PRIOR: key = SCK_PRIOR; break; + case WXK_PAGEDOWN: // fall through + case WXK_NEXT: key = SCK_NEXT; break; + case WXK_DELETE: key = SCK_DELETE; break; + case WXK_INSERT: key = SCK_INSERT; break; + case WXK_ESCAPE: key = SCK_ESCAPE; break; + case WXK_BACK: key = SCK_BACK; break; + case WXK_TAB: key = SCK_TAB; break; + case WXK_NUMPAD_ENTER: // fall through + case WXK_RETURN: key = SCK_RETURN; break; + case WXK_ADD: // fall through + case WXK_NUMPAD_ADD: key = SCK_ADD; break; + case WXK_SUBTRACT: // fall through + case WXK_NUMPAD_SUBTRACT: key = SCK_SUBTRACT; break; + case WXK_DIVIDE: // fall through + case WXK_NUMPAD_DIVIDE: key = SCK_DIVIDE; break; + case WXK_CONTROL: key = 0; break; + case WXK_ALT: key = 0; break; + case WXK_SHIFT: key = 0; break; + case WXK_MENU: key = 0; break; } +#ifdef __WXMAC__ + if ( evt.MetaDown() ) { + // check for a few common Mac Meta-key combos and remap them to Ctrl + // for Scintilla + switch ( key ) { + case 'Z': // Undo + case 'X': // Cut + case 'C': // Copy + case 'V': // Paste + case 'A': // Select All + ctrl = true; + break; + } + } +#endif + int rv = KeyDown(key, shift, ctrl, alt, consumed); if (key) @@ -476,55 +915,89 @@ void ScintillaWX::DoCommand(int ID) { void ScintillaWX::DoContextMenu(Point pt) { - ContextMenu(pt); + if (displayPopupMenu) + ContextMenu(pt); } void ScintillaWX::DoOnListBox() { AutoCompleteCompleted(); } + +void ScintillaWX::DoOnIdle(wxIdleEvent& evt) { + + if ( Idle() ) + evt.RequestMore(); + else + SetIdle(false); +} + //---------------------------------------------------------------------- +#if wxUSE_DRAG_AND_DROP bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { SetDragPosition(invalidPosition); - int movePos = PositionFromLocation(Point(x,y)); - DropAt(movePos, data, dragResult == wxDragMove, FALSE); // TODO: rectangular? - return TRUE; + + wxString text = wxTextBuffer::Translate(data, + wxConvertEOLMode(pdoc->eolMode)); + + // Send an event to allow the drag details to be changed + wxStyledTextEvent evt(wxEVT_STC_DO_DROP, stc->GetId()); + evt.SetEventObject(stc); + evt.SetDragResult(dragResult); + evt.SetX(x); + evt.SetY(y); + evt.SetPosition(PositionFromLocation(Point(x,y))); + evt.SetDragText(text); + stc->GetEventHandler()->ProcessEvent(evt); + + dragResult = evt.GetDragResult(); + if (dragResult == wxDragMove || dragResult == wxDragCopy) { + DropAt(evt.GetPosition(), + wx2stc(evt.GetDragText()), + dragResult == wxDragMove, + false); // TODO: rectangular? + return true; + } + return false; } -wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) { - return def; +wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) { + dragResult = def; + return dragResult; } wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) { SetDragPosition(PositionFromLocation(Point(x, y))); - dragResult = def; - return def; + + // Send an event to allow the drag result to be changed + wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId()); + evt.SetEventObject(stc); + evt.SetDragResult(def); + evt.SetX(x); + evt.SetY(y); + evt.SetPosition(PositionFromLocation(Point(x,y))); + stc->GetEventHandler()->ProcessEvent(evt); + + dragResult = evt.GetDragResult(); + return dragResult; } void ScintillaWX::DoDragLeave() { SetDragPosition(invalidPosition); } - +#endif //---------------------------------------------------------------------- -// Redraw all of text area. This paint will not be abandoned. +// Force the whole window to be repainted void ScintillaWX::FullPaint() { - paintState = painting; - rcPaint = GetTextRectangle(); - paintingAllText = true; - wxClientDC dc(wMain.GetID()); - Surface surfaceWindow; - surfaceWindow.Init(&dc); - Paint(&surfaceWindow, rcPaint); - surfaceWindow.Release(); - -// wMain.GetID()->Refresh(FALSE); - - paintState = notPainting; +#ifndef __WXMAC__ + stc->Refresh(false); +#endif + stc->Update(); } @@ -537,7 +1010,35 @@ void ScintillaWX::DoScrollToColumn(int column) { HorizontalScrollTo(column * vs.spaceWidth); } +// wxGTK doesn't appear to need this explicit clipping code any longer, but I +// will leave it here commented out for a while just in case... +void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) +{ +// wxRegion rgn(wxRectFromPRectangle(rect)); +// if (ac.Active()) { +// wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect(); +// rgn.Subtract(childRect); +// } +// if (ct.inCallTipMode) { +// wxSTCCallTip* tip = (wxSTCCallTip*)ct.wCallTip.GetID(); +// wxRect childRect = tip->GetRect(); +// #if wxUSE_POPUPWIN && wxSTC_USE_POPUP +// childRect.SetPosition(tip->GetMyPosition()); +// #endif +// rgn.Subtract(childRect); +// } +// dc.SetClippingRegion(rgn); +} + +void ScintillaWX::SetUseAntiAliasing(bool useAA) { + vs.extraFontFlag = useAA; + InvalidateStyleRedraw(); +} + +bool ScintillaWX::GetUseAntiAliasing() { + return vs.extraFontFlag; +} //---------------------------------------------------------------------- //----------------------------------------------------------------------