X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f97d84a63b21fffcc830390e5bc3fe0eedb6e15b..5ff5710d558a9cdffdc8845e7e6a5e6b14e7094f:/contrib/src/stc/ScintillaWX.cpp diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index f7349c8d27..6630a7d59c 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -22,7 +22,7 @@ //---------------------------------------------------------------------- -const int H_SCROLL_MAX = 2000; +const int H_SCROLL_MAX = 4000; const int H_SCROLL_STEP = 20; const int H_SCROLL_PAGE = 200; @@ -44,7 +44,7 @@ private: }; - +#if wxUSE_DRAG_AND_DROP bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) { return swx->DoDropText(x, y, data); } @@ -60,6 +60,7 @@ wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def void wxSTCDropTarget::OnLeave() { swx->DoDragLeave(); } +#endif class wxSTCCallTip : public wxWindow { @@ -93,8 +94,8 @@ END_EVENT_TABLE() ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { capturedMouse = false; wMain = win; - wDraw = win; stc = win; + wheelRotation = 0; Initialise(); } @@ -109,9 +110,11 @@ ScintillaWX::~ScintillaWX() { void ScintillaWX::Initialise() { //ScintillaBase::Initialise(); +#if wxUSE_DRAG_AND_DROP dropTarget = new wxSTCDropTarget; dropTarget->SetScintilla(this); stc->SetDropTarget(dropTarget); +#endif } @@ -121,16 +124,33 @@ void ScintillaWX::Finalise() { 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(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 } @@ -155,9 +175,9 @@ void ScintillaWX::SetTicking(bool on) { void ScintillaWX::SetMouseCapture(bool on) { if (on && !capturedMouse) - wMain.GetID()->CaptureMouse(); + stc->CaptureMouse(); else if (!on && capturedMouse) - wMain.GetID()->ReleaseMouse(); + stc->ReleaseMouse(); capturedMouse = on; } @@ -169,36 +189,69 @@ bool ScintillaWX::HaveMouseCapture() { void ScintillaWX::ScrollText(int linesToMove) { int dy = vs.lineHeight * (linesToMove); - // TODO: calculate the rectangle to refreshed... - wMain.GetID()->ScrollWindow(0, dy); + 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); + } } 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; + 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); + 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 != nMax || sbPage != nPage) { + stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax, 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; + + 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; + } + } + 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; + } + } } return modified; } @@ -217,9 +270,10 @@ void ScintillaWX::NotifyParent(SCNotification scn) { void ScintillaWX::Copy() { if (currentPos != anchor) { - char* text = CopySelectionRange(); + SelectionText st; + CopySelectionRange(&st); wxTheClipboard->Open(); - wxTheClipboard->SetData(new wxTextDataObject(text)); + wxTheClipboard->SetData(new wxTextDataObject(wxString(st.s, st.len))); wxTheClipboard->Close(); } } @@ -230,12 +284,12 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool canPaste; + bool gotData; wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); + gotData = wxTheClipboard->GetData(data); wxTheClipboard->Close(); - if (canPaste) { + if (gotData) { wxString str = data.GetText(); int len = str.Length(); pdoc->InsertString(currentPos, str.c_str(), len); @@ -249,18 +303,17 @@ void ScintillaWX::Paste() { bool ScintillaWX::CanPaste() { - wxTextDataObject data; bool canPaste; wxTheClipboard->Open(); - canPaste = wxTheClipboard->GetData(data); + canPaste = wxTheClipboard->IsSupported( wxDF_TEXT ); wxTheClipboard->Close(); return canPaste; } void ScintillaWX::CreateCallTipWindow(PRectangle) { - ct.wCallTip = new wxSTCCallTip(wDraw.GetID(), -1, &ct); + ct.wCallTip = new wxSTCCallTip(stc, -1, &ct); ct.wDraw = ct.wCallTip; } @@ -325,60 +378,70 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) { void ScintillaWX::DoHScroll(int type, int pos) { int xPos = xOffset; - switch (type) { - case wxEVT_SCROLLWIN_LINEUP: + if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) xPos -= H_SCROLL_STEP; - break; - case wxEVT_SCROLLWIN_LINEDOWN: + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) xPos += H_SCROLL_STEP; - break; - case wxEVT_SCROLLWIN_PAGEUP: + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) xPos -= H_SCROLL_PAGE; - break; - case wxEVT_SCROLLWIN_PAGEDOWN: + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) xPos += H_SCROLL_PAGE; - break; - case wxEVT_SCROLLWIN_TOP: + else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) xPos = 0; - break; - case wxEVT_SCROLLWIN_BOTTOM: + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) xPos = H_SCROLL_MAX; - break; - case wxEVT_SCROLLWIN_THUMBTRACK: + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) xPos = pos; - break; - } + HorizontalScrollTo(xPos); } void ScintillaWX::DoVScroll(int type, int pos) { int topLineNew = topLine; - switch (type) { - case wxEVT_SCROLLWIN_LINEUP: + if (type == wxEVT_SCROLLWIN_LINEUP || type == wxEVT_SCROLL_LINEUP) topLineNew -= 1; - break; - case wxEVT_SCROLLWIN_LINEDOWN: + else if (type == wxEVT_SCROLLWIN_LINEDOWN || type == wxEVT_SCROLL_LINEDOWN) topLineNew += 1; - break; - case wxEVT_SCROLLWIN_PAGEUP: + else if (type == wxEVT_SCROLLWIN_PAGEUP || type == wxEVT_SCROLL_PAGEUP) topLineNew -= LinesToScroll(); - break; - case wxEVT_SCROLLWIN_PAGEDOWN: + else if (type == wxEVT_SCROLLWIN_PAGEDOWN || type == wxEVT_SCROLL_PAGEDOWN) topLineNew += LinesToScroll(); - break; - case wxEVT_SCROLLWIN_TOP: + else if (type == wxEVT_SCROLLWIN_TOP || type == wxEVT_SCROLL_TOP) topLineNew = 0; - break; - case wxEVT_SCROLLWIN_BOTTOM: + else if (type == wxEVT_SCROLLWIN_BOTTOM || type == wxEVT_SCROLL_BOTTOM) topLineNew = MaxScrollPos(); - break; - case wxEVT_SCROLLWIN_THUMBTRACK: + else if (type == wxEVT_SCROLLWIN_THUMBTRACK || type == wxEVT_SCROLL_THUMBTRACK) topLineNew = pos; - break; - } + ScrollTo(topLineNew); } + +void ScintillaWX::DoMouseWheel(int rotation, int delta, int linesPerAction, int ctrlDown) { + int topLineNew = topLine; + int lines; + + if (ctrlDown) { // Zoom the fonts if Ctrl key down + if (rotation < 0) { + KeyCommand(SCI_ZOOMIN); + } + else { + KeyCommand(SCI_ZOOMOUT); + } + } + else { // otherwise just scroll the window + wheelRotation += rotation; + lines = wheelRotation / delta; + wheelRotation -= lines * delta; + if (lines != 0) { + lines *= linesPerAction; + topLineNew -= lines; + ScrollTo(topLineNew); + } + } +} + + void ScintillaWX::DoSize(int width, int height) { PRectangle rcClient(0,0,width,height); SetScrollBarsTo(rcClient); @@ -386,11 +449,11 @@ void ScintillaWX::DoSize(int width, int height) { } void ScintillaWX::DoLoseFocus(){ - DropCaret(); + SetFocusState(false); } void ScintillaWX::DoGainFocus(){ - ShowCaretAtCurrentPosition(); + SetFocusState(true); } void ScintillaWX::DoSysColourChange() { @@ -411,37 +474,52 @@ void ScintillaWX::DoButtonMove(Point pt) { void ScintillaWX::DoAddChar(char ch) { - //bool acActiveBeforeCharAdded = ac.Active(); AddChar(ch); - //if (acActiveBeforeCharAdded) - // AutoCompleteChanged(ch); } -int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt) { +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; +#endif + 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: key = SCK_ADD; break; - case WXK_SUBTRACT: key = SCK_SUBTRACT; break; - case WXK_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_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; } - return KeyDown(key, shift, ctrl, alt); + int rv = KeyDown(key, shift, ctrl, alt, consumed); + + if (key) + return rv; + else + return 1; } @@ -460,42 +538,74 @@ void ScintillaWX::DoOnListBox() { //---------------------------------------------------------------------- +#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; + + // 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(data); + stc->GetEventHandler()->ProcessEvent(evt); + + dragResult = evt.GetDragResult(); + if (dragResult == wxDragMove || dragResult == wxDragCopy) { + DropAt(evt.GetPosition(), + evt.GetDragText(), + dragResult == wxDragMove, + FALSE); // TODO: rectangular? + return TRUE; + } + return FALSE; } wxDragResult ScintillaWX::DoDragEnter(wxCoord x, wxCoord y, wxDragResult def) { - return 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. void ScintillaWX::FullPaint() { paintState = painting; -// rcPaint = GetTextRectangle(); -// wxClientDC dc(wMain.GetID()); -// Surface surfaceWindow; -// surfaceWindow.Init(&dc); -// Paint(&surfaceWindow, rcPaint); -// surfaceWindow.Release(); - wMain.GetID()->Refresh(FALSE); + rcPaint = GetTextRectangle(); + paintingAllText = true; + wxClientDC dc(stc); + Surface surfaceWindow; + surfaceWindow.Init(&dc); + Paint(&surfaceWindow, rcPaint); + surfaceWindow.Release(); + +// stc->Refresh(FALSE); + paintState = notPainting; }