X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee8bee6c8c345e5b61c8e9b1563ed85bb4fb7e15..49bf4e3e689c2131994aa2aab3c9eca6255a46eb:/src/stc/ScintillaWX.cpp diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 0e6d4c6874..427a83e6bd 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -73,7 +73,7 @@ class wxSTCCallTip : public wxSTCCallTipBase { public: wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) : wxSTCCallTipBase(parent, param2), - m_ct(ct), m_swx(swx), m_cx(-1), m_cy(-1) + m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord) { } @@ -86,7 +86,7 @@ public: #endif } - bool AcceptsFocus() const { return FALSE; } + bool AcceptsFocus() const { return false; } void OnPaint(wxPaintEvent& WXUNUSED(evt)) { wxBufferedPaintDC dc(this); @@ -113,11 +113,11 @@ public: 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) { + if (y != wxDefaultCoord) { m_cy = y; GetParent()->ClientToScreen(NULL, &y); } @@ -128,7 +128,7 @@ public: wxPoint GetMyPosition() { return wxPoint(m_cx, m_cy); } - + private: CallTip* m_ct; ScintillaWX* m_swx; @@ -148,27 +148,27 @@ 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 @@ -181,6 +181,11 @@ ScintillaWX::ScintillaWX(wxStyledTextCtrl* win) { stc = win; wheelRotation = 0; Initialise(); +#ifdef __WXMSW__ + sysCaretBitmap = 0; + sysCaretWidth = 0; + sysCaretHeight = 0; +#endif } @@ -211,6 +216,7 @@ void ScintillaWX::Finalise() { ScintillaBase::Finalise(); SetTicking(false); SetIdle(false); + DestroySystemCaret(); } @@ -222,7 +228,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); @@ -234,11 +240,11 @@ 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 @@ -248,18 +254,18 @@ void ScintillaWX::StartDrag() { bool ScintillaWX::SetIdle(bool on) { if (idler.state != on) { // connect or disconnect the EVT_IDLE handler - if (on) - stc->Connect(-1, wxEVT_IDLE, + if (on) + stc->Connect(wxID_ANY, wxEVT_IDLE, (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle); else - stc->Disconnect(-1, wxEVT_IDLE, + 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) { @@ -425,10 +431,10 @@ void ScintillaWX::Paste() { ClearSelection(); wxTextDataObject data; - bool gotData = FALSE; + bool gotData = false; if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->UsePrimarySelection(false); gotData = wxTheClipboard->GetData(data); wxTheClipboard->Close(); } @@ -449,7 +455,7 @@ void ScintillaWX::Paste() { void ScintillaWX::CopyToClipboard(const SelectionText& st) { if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->UsePrimarySelection(false); wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len)); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); @@ -458,7 +464,7 @@ void ScintillaWX::CopyToClipboard(const SelectionText& st) { bool ScintillaWX::CanPaste() { - bool canPaste = FALSE; + bool canPaste = false; bool didOpen; if (Editor::CanPaste()) { @@ -467,7 +473,7 @@ bool ScintillaWX::CanPaste() { wxTheClipboard->Open(); if (wxTheClipboard->IsOpened()) { - wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->UsePrimarySelection(false); canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); if (didOpen) wxTheClipboard->Close(); @@ -508,10 +514,10 @@ void ScintillaWX::ClaimSelection() { SelectionText st; CopySelectionRange(&st); if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(TRUE); + wxTheClipboard->UsePrimarySelection(true); wxString text = stc2wx(st.s, st.len); wxTheClipboard->SetData(new wxTextDataObject(text)); - wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->UsePrimarySelection(false); wxTheClipboard->Close(); } } @@ -520,6 +526,70 @@ void ScintillaWX::ClaimSelection() { } +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; } @@ -539,7 +609,8 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar defn, vs.styles[STYLE_DEFAULT].fontName, vs.styles[STYLE_DEFAULT].sizeZoomed, - IsUnicodeMode(), + 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. @@ -561,10 +632,11 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar } #ifdef SCI_LEXER - case SCI_LOADLEXERLIBRARY: + case SCI_LOADLEXERLIBRARY: LexerManager::GetInstance()->Load((const char*)lParam); break; #endif + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -679,9 +751,6 @@ void ScintillaWX::DoMouseWheel(int rotation, int delta, void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) { -// PRectangle rcClient(0,0,width,height); -// SetScrollBarsTo(rcClient); -// DropGraphics(); ChangeSize(); } @@ -689,12 +758,15 @@ void ScintillaWX::DoLoseFocus(){ focusEvent = true; SetFocusState(false); focusEvent = false; + DestroySystemCaret(); } void ScintillaWX::DoGainFocus(){ focusEvent = true; SetFocusState(true); focusEvent = false; + DestroySystemCaret(); + CreateSystemCaret(); } void ScintillaWX::DoSysColourChange() { @@ -722,11 +794,11 @@ void ScintillaWX::DoMiddleButtonUp(Point pt) { pdoc->BeginUndoAction(); wxTextDataObject data; - bool gotData = FALSE; + bool gotData = false; if (wxTheClipboard->Open()) { - wxTheClipboard->UsePrimarySelection(TRUE); + wxTheClipboard->UsePrimarySelection(true); gotData = wxTheClipboard->GetData(data); - wxTheClipboard->UsePrimarySelection(FALSE); + wxTheClipboard->UsePrimarySelection(false); wxTheClipboard->Close(); } if (gotData) { @@ -753,27 +825,25 @@ void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) { void ScintillaWX::DoAddChar(int key) { #if wxUSE_UNICODE wxChar wszChars[2]; - wszChars[0] = key; + wszChars[0] = (wxChar)key; wszChars[1] = 0; wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars); AddCharUTF((char*)buf.data(), strlen(buf)); #else - AddChar(key); + AddChar((char)key); #endif } -#ifdef __WXMAC__ -int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) { -#else -int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) { -#endif -#if defined(__WXGTK__) || defined(__WXMAC__) - // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK - // TODO: Check this, it shouldn't be true any longer. +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 += 'A' - 1; -#endif switch (key) { case WXK_DOWN: key = SCK_DOWN; break; @@ -791,6 +861,7 @@ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU 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; @@ -805,7 +876,7 @@ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU } #ifdef __WXMAC__ - if ( meta ) { + if ( evt.MetaDown() ) { // check for a few common Mac Meta-key combos and remap them to Ctrl // for Scintilla switch ( key ) { @@ -819,7 +890,7 @@ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNU } } #endif - + int rv = KeyDown(key, shift, ctrl, alt, consumed); if (key) @@ -843,7 +914,7 @@ void ScintillaWX::DoOnListBox() { AutoCompleteCompleted(); } - + void ScintillaWX::DoOnIdle(wxIdleEvent& evt) { if ( Idle() ) @@ -851,7 +922,7 @@ void ScintillaWX::DoOnIdle(wxIdleEvent& evt) { else SetIdle(false); } - + //---------------------------------------------------------------------- #if wxUSE_DRAG_AND_DROP @@ -860,7 +931,7 @@ bool ScintillaWX::DoDropText(long x, long y, const wxString& data) { 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); @@ -876,10 +947,10 @@ 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; } @@ -914,7 +985,9 @@ void ScintillaWX::DoDragLeave() { // Force the whole window to be repainted void ScintillaWX::FullPaint() { +#ifndef __WXMAC__ stc->Refresh(false); +#endif stc->Update(); } @@ -960,6 +1033,6 @@ void ScintillaWX::SetUseAntiAliasing(bool useAA) { bool ScintillaWX::GetUseAntiAliasing() { return vs.extraFontFlag; } - + //---------------------------------------------------------------------- //----------------------------------------------------------------------