X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/752cd08c659c7393bacbfe4305760f4ee58a8255..5f4d35b8045442f97ed74ba2aa633e843adae7ef:/contrib/src/stc/ScintillaWX.cpp diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 50bfac2f18..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 "ScintillaWX.h" +#include "ExternalLexer.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; +#ifdef __WXMSW__ + // GetHwndOf() + #include +#endif //---------------------------------------------------------------------- // Helper classes @@ -69,22 +73,36 @@ void wxSTCDropTarget::OnLeave() { #define param2 wxBORDER_NONE // popup's 2nd param is flags #else #define wxSTCCallTipBase wxWindow -#define param2 -1 // wxWindows 2nd param is ID +#define param2 -1 // wxWindow's 2nd param is ID #endif +#include + class wxSTCCallTip : public wxSTCCallTipBase { public: - wxSTCCallTip(wxWindow* parent, CallTip* ct) - : wxSTCCallTipBase(parent, param2) + 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); + ~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); + surfaceWindow->Init(&dc, m_ct->wDraw.GetID()); m_ct->PaintCT(surfaceWindow); + surfaceWindow->Release(); delete surfaceWindow; } @@ -93,62 +111,95 @@ public: 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 != -1) + if (x != wxDefaultCoord) { + m_cx = x; GetParent()->ClientToScreen(&x, NULL); - if (y != -1) - GetParent()->ClientToScreen(NULL, &y); - wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags); - } - - virtual bool Show( bool show = TRUE ) { - bool retval = wxSTCCallTipBase::Show(show); - if (show) { - CaptureMouse(); } - else { - if (HasCapture()) ReleaseMouse(); + if (y != wxDefaultCoord) { + m_cy = y; + GetParent()->ClientToScreen(NULL, &y); } - return retval; + wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags); } +#endif - void OnLeftDown(wxMouseEvent& ) { - Show(FALSE); + wxPoint GetMyPosition() { + return wxPoint(m_cx, m_cy); } -#endif private: - CallTip* m_ct; + CallTip* m_ct; + ScintillaWX* m_swx; + int m_cx, m_cy; DECLARE_EVENT_TABLE() }; BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase) EVT_PAINT(wxSTCCallTip::OnPaint) EVT_SET_FOCUS(wxSTCCallTip::OnFocus) -#if wxUSE_POPUPWIN && wxSTC_USE_POPUP EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown) -#endif 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(); } //---------------------------------------------------------------------- @@ -162,11 +213,19 @@ void ScintillaWX::Initialise() { 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(); } @@ -178,7 +237,7 @@ void ScintillaWX::StartDrag() { wxStyledTextEvent evt(wxEVT_STC_START_DRAG, stc->GetId()); evt.SetEventObject(stc); evt.SetDragText(dragText); - evt.SetDragAllowMove(TRUE); + evt.SetDragAllowMove(true); evt.SetPosition(wxMin(stc->GetSelectionStart(), stc->GetSelectionEnd())); stc->GetEventHandler()->ProcessEvent(evt); @@ -190,17 +249,32 @@ void ScintillaWX::StartDrag() { wxDragResult result; source.SetData(data); - dropWentOutside = TRUE; + dropWentOutside = true; result = source.DoDragDrop(evt.GetDragAllowMove()); if (result == wxDragMove && dropWentOutside) ClearSelection(); - inDragDrop = FALSE; + 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; +} + + void ScintillaWX::SetTicking(bool on) { wxSTCTimer* steTimer; if (timer.ticking != on) { @@ -221,11 +295,13 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { - if (on && !capturedMouse) - stc->CaptureMouse(); - else if (!on && capturedMouse) - stc->ReleaseMouse(); - capturedMouse = on; + if (mouseDownCaptures) { + if (on && !capturedMouse) + stc->CaptureMouse(); + else if (!on && capturedMouse && stc->HasCapture()) + stc->ReleaseMouse(); + capturedMouse = on; + } } @@ -259,15 +335,22 @@ void ScintillaWX::SetHorizontalScrollPos() { } +const int H_SCROLL_STEP = 20; + bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { bool modified = false; + 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 != nMax || sbThumb != nPage) { - stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax); + if (sbMax != vertEnd || sbThumb != nPage) { + stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1); modified = true; } } @@ -275,31 +358,47 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) { int sbMax = stc->m_vScrollBar->GetRange(); 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); + if (sbMax != vertEnd || sbPage != nPage) { + stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage); 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, 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 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(sbPos, pageWidth, horizEnd, pageWidth); + modified = true; + if (scrollWidth < pageWidth) { + HorizontalScrollTo(0); } } } + return modified; } @@ -314,16 +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) { SelectionText st; CopySelectionRange(&st); - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - wxString text = stc2wx(st.s, st.len); - wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->Close(); + CopyToClipboard(st); } } @@ -333,14 +440,17 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool gotData; + bool gotData = false; - wxTheClipboard->Open(); - wxTheClipboard->UsePrimarySelection(); - 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()); + 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); @@ -352,20 +462,40 @@ void ScintillaWX::Paste() { } -bool ScintillaWX::CanPaste() { - 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(); - wxTheClipboard->UsePrimarySelection(); - canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); - 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(stc, &ct); - ct.wDraw = ct.wCallTip; + if (! ct.wCallTip.Created() ) { + ct.wCallTip = new wxSTCCallTip(stc, &ct, this); + ct.wDraw = ct.wCallTip; + } } @@ -373,30 +503,153 @@ void ScintillaWX::AddToPopUp(const char *label, int cmd, bool enabled) { if (!label[0]) ((wxMenu*)popup.GetID())->AppendSeparator(); else - ((wxMenu*)popup.GetID())->Append(cmd, stc2wx(label)); + ((wxMenu*)popup.GetID())->Append(cmd, wxGetTranslation(stc2wx(label))); if (!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; } @@ -408,39 +661,46 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { paintState = painting; Surface* surfaceWindow = Surface::Allocate(); - surfaceWindow->Init(dc); - PRectangle rcPaint = PRectangleFromwxRect(rect); + surfaceWindow->Init(dc, wMain.GetID()); + rcPaint = PRectangleFromwxRect(rect); + PRectangle rcClient = GetClientRectangle(); + paintingAllText = rcPaint.Contains(rcClient); + dc->BeginDrawing(); + ClipChildren(*dc, rcPaint); Paint(surfaceWindow, rcPaint); - dc->EndDrawing(); + 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; + 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) - 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) - xPos = H_SCROLL_MAX; + xPos = scrollWidth; else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) xPos = pos; @@ -467,8 +727,9 @@ void ScintillaWX::DoVScroll(int type, int 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; @@ -481,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); } @@ -493,48 +759,100 @@ 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); + + 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 + void ScintillaWX::DoAddChar(int key) { - AddChar(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(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... - if (ctrl && key >= 1 && key <= 26) + +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; -#endif switch (key) { case WXK_DOWN: key = SCK_DOWN; break; @@ -543,13 +861,16 @@ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons 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; @@ -563,6 +884,22 @@ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool* cons 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) @@ -586,12 +923,24 @@ 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); + 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); @@ -599,7 +948,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { evt.SetX(x); evt.SetY(y); evt.SetPosition(PositionFromLocation(Point(x,y))); - evt.SetDragText(data); + evt.SetDragText(text); stc->GetEventHandler()->ProcessEvent(evt); dragResult = evt.GetDragResult(); @@ -607,14 +956,14 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { DropAt(evt.GetPosition(), wx2stc(evt.GetDragText()), dragResult == wxDragMove, - FALSE); // TODO: rectangular? - return TRUE; + false); // TODO: rectangular? + return true; } - return FALSE; + return false; } -wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) { +wxDragResult ScintillaWX::DoDragEnter(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def) { dragResult = def; return dragResult; } @@ -643,20 +992,12 @@ void ScintillaWX::DoDragLeave() { #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(stc); - Surface* surfaceWindow = Surface::Allocate(); - surfaceWindow->Init(&dc); - Paint(surfaceWindow, rcPaint); - delete surfaceWindow; - -// stc->Refresh(FALSE); - - paintState = notPainting; +#ifndef __WXMAC__ + stc->Refresh(false); +#endif + stc->Update(); } @@ -669,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; +} //---------------------------------------------------------------------- //----------------------------------------------------------------------