////////////////////////////////////////////////////////////////////////////
// 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
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_STC
+
+#ifndef WX_PRECOMP
+ #include "wx/scrolbar.h"
+ #include "wx/menu.h"
+ #include "wx/timer.h"
+#endif // WX_PRECOMP
+
+#include "wx/textbuf.h"
+#include "wx/dataobj.h"
+#include "wx/clipbrd.h"
+#include "wx/dnd.h"
#include "ScintillaWX.h"
+#include "ExternalLexer.h"
#include "wx/stc/stc.h"
+#include "wx/stc/private.h"
#include "PlatWX.h"
+#ifdef __WXMSW__
+ // GetHwndOf()
+ #include "wx/msw/private.h"
+#endif
+
//----------------------------------------------------------------------
// Helper classes
class wxSTCTimer : public wxTimer {
public:
wxSTCTimer(ScintillaWX* swx) {
- this->swx = swx;
+ m_swx = swx;
}
void Notify() {
- swx->DoTick();
+ m_swx->DoTick();
}
private:
- ScintillaWX* swx;
+ ScintillaWX* m_swx;
};
#if wxUSE_DRAG_AND_DROP
bool wxSTCDropTarget::OnDropText(wxCoord x, wxCoord y, const wxString& data) {
- return swx->DoDropText(x, y, data);
+ return m_swx->DoDropText(x, y, data);
}
wxDragResult wxSTCDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def) {
- return swx->DoDragEnter(x, y, def);
+ return m_swx->DoDragEnter(x, y, def);
}
wxDragResult wxSTCDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def) {
- return swx->DoDragOver(x, y, def);
+ return m_swx->DoDragOver(x, y, def);
}
void wxSTCDropTarget::OnLeave() {
- swx->DoDragLeave();
+ m_swx->DoDragLeave();
}
-#endif
-
+#endif // wxUSE_DRAG_AND_DROP
-#ifdef __WXGTK__
-#undef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 0
-#endif
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
-#include <wx/popupwin.h>
+#if wxUSE_POPUPWIN
+#include "wx/popupwin.h"
#define wxSTCCallTipBase wxPopupWindow
-#define param2 wxBORDER_NONE // popup's 2nd param is flags
#else
-#define wxSTCCallTipBase wxWindow
-#define param2 -1 // wxWindows 2nd param is ID
+#include "wx/frame.h"
+#define wxSTCCallTipBase wxFrame
#endif
+#include "wx/dcbuffer.h"
+
class wxSTCCallTip : public wxSTCCallTipBase {
public:
- wxSTCCallTip(wxWindow* parent, CallTip* ct)
- : wxSTCCallTipBase(parent, param2)
+ wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
+#if wxUSE_POPUPWIN
+ wxSTCCallTipBase(parent, wxBORDER_NONE),
+#else
+ wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+ wxFRAME_NO_TASKBAR
+ | wxFRAME_FLOAT_ON_PARENT
+ | wxBORDER_NONE
+#ifdef __WXMAC__
+ | wxPOPUP_WINDOW
+#endif
+ ),
+#endif
+ m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
{
- m_ct = ct;
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
}
~wxSTCCallTip() {
- if (HasCapture()) ReleaseMouse();
+#if wxUSE_POPUPWIN && defined(__WXGTK__)
+ wxRect rect = GetRect();
+ rect.x = m_cx;
+ rect.y = m_cy;
+ GetParent()->Refresh(false, &rect);
+#endif
}
- void OnPaint(wxPaintEvent& evt) {
- wxPaintDC dc(this);
+ bool AcceptsFocus() const { return false; }
+
+ void OnPaint(wxPaintEvent& WXUNUSED(evt))
+ {
+ wxAutoBufferedPaintDC dc(this);
Surface* surfaceWindow = Surface::Allocate();
- surfaceWindow->Init(&dc);
+ surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
m_ct->PaintCT(surfaceWindow);
+ surfaceWindow->Release();
delete surfaceWindow;
}
- void OnFocus(wxFocusEvent& event) {
+ void OnFocus(wxFocusEvent& event)
+ {
GetParent()->SetFocus();
event.Skip();
}
-#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+ void OnLeftDown(wxMouseEvent& event)
+ {
+ wxPoint pt = event.GetPosition();
+ Point p(pt.x, pt.y);
+ m_ct->MouseClick(p);
+ m_swx->CallTipClick();
+ }
+
virtual void DoSetSize(int x, int y,
int width, int height,
- int sizeFlags = wxSIZE_AUTO) {
- if (x != -1)
+ int sizeFlags = wxSIZE_AUTO)
+ {
+ // convert coords to screen coords since we're a top-level window
+ if (x != wxDefaultCoord) {
+ m_cx = x;
GetParent()->ClientToScreen(&x, NULL);
- if (y != -1)
+ }
+ if (y != wxDefaultCoord) {
+ m_cy = y;
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();
- return retval;
- }
-
- void OnLeftDown(wxMouseEvent& ) {
- Show(FALSE);
+#if wxUSE_POPUPWIN
+#else
+ virtual bool Show( bool show = true )
+ {
+ // Although we're a frame, we always want the parent to be active, so
+ // raise it whenever we get shown.
+ bool rv = wxSTCCallTipBase::Show(show);
+ if (rv && show)
+ {
+ wxTopLevelWindow *frame = wxDynamicCast(
+ wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+ if (frame)
+ frame->Raise();
+ }
+ return rv;
}
#endif
+
+ wxPoint GetMyPosition()
+ {
+ return wxPoint(m_cx, m_cy);
+ }
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()
+//----------------------------------------------------------------------
+
+#if wxUSE_DATAOBJ
+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;
+}
+#endif // wxUSE_DATAOBJ
+
+
//----------------------------------------------------------------------
// 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();
}
//----------------------------------------------------------------------
dropTarget = new wxSTCDropTarget;
dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
-#endif
+#endif // wxUSE_DRAG_AND_DROP
+ vs.extraFontFlag = true; // UseAntiAliasing
}
void ScintillaWX::Finalise() {
ScintillaBase::Finalise();
+ SetTicking(false);
+ SetIdle(false);
+ DestroySystemCaret();
}
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);
dragText = evt.GetDragText();
- if (dragText.Length()) {
+ if (dragText.length()) {
wxDropSource source(stc);
wxTextDataObject data(dragText);
wxDragResult result;
source.SetData(data);
- dropWentOutside = TRUE;
+ dropWentOutside = true;
+ inDragDrop = ddDragging;
result = source.DoDragDrop(evt.GetDragAllowMove());
if (result == wxDragMove && dropWentOutside)
ClearSelection();
- inDragDrop = FALSE;
+ inDragDrop = ddNone;
SetDragPosition(invalidPosition);
}
-#endif
+#endif // wxUSE_DRAG_AND_DROP
+}
+
+
+bool ScintillaWX::SetIdle(bool on) {
+ if (idler.state != on) {
+ // connect or disconnect the EVT_IDLE handler
+ if (on)
+ stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+ else
+ stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
+ idler.state = on;
+ }
+ return idler.state;
}
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;
+ }
}
}
}
+
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+1);
+ if (sbMax != vertEnd || sbThumb != nPage) {
+ stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1);
modified = true;
}
}
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+1, nPage);
+ if (sbMax != vertEnd || sbPage != nPage) {
+ stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage);
modified = true;
}
}
int sbThumb = stc->GetScrollThumb(wxHORIZONTAL);
int sbPos = stc->GetScrollPos(wxHORIZONTAL);
if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
- stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd);
+ stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);
modified = true;
if (scrollWidth < pageWidth) {
HorizontalScrollTo(0);
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);
+ stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);
modified = true;
if (scrollWidth < pageWidth) {
HorizontalScrollTo(0);
}
+// 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);
- if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
- wxString text = stc2wx(st.s, st.len);
- wxTheClipboard->SetData(new wxTextDataObject(text));
- wxTheClipboard->Close();
- }
+ CopyToClipboard(st);
}
}
pdoc->BeginUndoAction();
ClearSelection();
+#if wxUSE_DATAOBJ
wxTextDataObject data;
- bool gotData = FALSE;
+ bool gotData = false;
+ wxTheClipboard->UsePrimarySelection(false);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
gotData = wxTheClipboard->GetData(data);
wxTheClipboard->Close();
}
if (gotData) {
- wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(data.GetText());
- int len = strlen(buf);
+ wxString text = wxTextBuffer::Translate(data.GetText(),
+ wxConvertEOLMode(pdoc->eolMode));
+ wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+
+#if wxUSE_UNICODE
+ // free up the old character buffer in case the text is real big
+ data.SetText(wxEmptyString);
+ text = wxEmptyString;
+#endif
+ int len = strlen(buf);
pdoc->InsertString(currentPos, buf, len);
SetEmptySelection(currentPos + len);
}
+#endif // wxUSE_DATAOBJ
pdoc->EndUndoAction();
NotifyChange();
}
+void ScintillaWX::CopyToClipboard(const SelectionText& st) {
+#if wxUSE_CLIPBOARD
+ if ( !st.len )
+ return;
+
+ wxTheClipboard->UsePrimarySelection(false);
+ if (wxTheClipboard->Open()) {
+ wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len-1));
+ wxTheClipboard->SetData(new wxTextDataObject(text));
+ wxTheClipboard->Close();
+ }
+#else
+ wxUnusedVar(st);
+#endif // wxUSE_CLIPBOARD
+}
+
+
bool ScintillaWX::CanPaste() {
- bool canPaste = FALSE;
+#if wxUSE_CLIPBOARD
+ bool canPaste = false;
bool didOpen;
- if ( (didOpen = !wxTheClipboard->IsOpened()) )
- wxTheClipboard->Open();
+ if (Editor::CanPaste()) {
+ wxTheClipboard->UsePrimarySelection(false);
+ 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();
+ if (wxTheClipboard->IsOpened()) {
+ canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+ if (didOpen)
+ wxTheClipboard->Close();
+ }
}
return canPaste;
+#else
+ return false;
+#endif // wxUSE_CLIPBOARD
}
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;
+ }
}
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
+// This is called by the Editor base class whenever something is selected.
+// For wxGTK we can put this text in the primary selection and then other apps
+// can paste with the middle button.
void ScintillaWX::ClaimSelection() {
#ifdef __WXGTK__
// Put the selected text in the PRIMARY selection
if (currentPos != anchor) {
SelectionText st;
CopySelectionRange(&st);
+ wxTheClipboard->UsePrimarySelection(true);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(TRUE);
wxString text = stc2wx(st.s, st.len);
wxTheClipboard->SetData(new wxTextDataObject(text));
- wxTheClipboard->UsePrimarySelection(FALSE);
wxTheClipboard->Close();
}
+ wxTheClipboard->UsePrimarySelection(false);
+ }
+#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 ( (vs.caretWidth && (sysCaretWidth != vs.caretWidth))
+ || (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<BYTE *>(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*/) {
+sptr_t ScintillaWX::DefWndProc(unsigned int /*iMessage*/, uptr_t /*wParam*/, sptr_t /*lParam*/) {
return 0;
}
-long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lParam) {
+sptr_t ScintillaWX::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
switch (iMessage) {
case SCI_CALLTIPSHOW: {
// NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
- // because of the little tweak that needs done below. When updating
- // new versions double check that this is still needed, and that any
- // new code there is copied here too.
+ // 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<char *>(lParam);
AutoCompleteCancel();
- if (!ct.wCallTip.Created()) {
- Point pt = LocationFromPosition(wParam);
- pt.y += vs.lineHeight;
- PRectangle rc = ct.CallTipStart(currentPos, pt,
- reinterpret_cast<char *>(lParam),
- vs.styles[STYLE_DEFAULT].fontName,
- vs.styles[STYLE_DEFAULT].sizeZoomed,
- IsUnicodeMode());
- // 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) {
+ 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();
+ int offset = int(vs.lineHeight * 1.25) + rc.Height();
#else
- int offset = vs.lineHeight + rc.Height();
+ 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();
+ 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);
paintState = painting;
Surface* surfaceWindow = Surface::Allocate();
- surfaceWindow->Init(dc);
- PRectangle rcPaint = PRectangleFromwxRect(rect);
- dc->BeginDrawing();
+ surfaceWindow->Init(dc, wMain.GetID());
+ rcPaint = PRectangleFromwxRect(rect);
+ PRectangle rcClient = GetClientRectangle();
+ paintingAllText = rcPaint.Contains(rcClient);
+
+ 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
}
}
}
else { // otherwise just scroll the window
+ if ( !delta )
+ delta = 120;
wheelRotation += rotation;
lines = wheelRotation / delta;
wheelRotation -= lines * delta;
}
-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() {
ButtonMove(pt);
}
-void ScintillaWX::DoMiddleButtonUp(Point 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, 0, 1);
+ MovePositionTo(newPos, noSel, true);
pdoc->BeginUndoAction();
wxTextDataObject data;
- bool gotData = FALSE;
+ bool gotData = false;
+ wxTheClipboard->UsePrimarySelection(true);
if (wxTheClipboard->Open()) {
- wxTheClipboard->UsePrimarySelection(TRUE);
gotData = wxTheClipboard->GetData(data);
- wxTheClipboard->UsePrimarySelection(FALSE);
wxTheClipboard->Close();
}
+ wxTheClipboard->UsePrimarySelection(false);
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);
ShowCaretAtCurrentPosition();
EnsureCaretVisible();
-#endif
}
+#else
+void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
+}
+#endif
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
}
-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;
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_PAGEUP: key = SCK_PRIOR; break;
+ case WXK_PAGEDOWN: key = SCK_NEXT; break;
+ case WXK_NUMPAD_DOWN: key = SCK_DOWN; break;
+ case WXK_NUMPAD_UP: key = SCK_UP; break;
+ case WXK_NUMPAD_LEFT: key = SCK_LEFT; break;
+ case WXK_NUMPAD_RIGHT: key = SCK_RIGHT; break;
+ case WXK_NUMPAD_HOME: key = SCK_HOME; break;
+ case WXK_NUMPAD_END: key = SCK_END; break;
+ case WXK_NUMPAD_PAGEUP: key = SCK_PRIOR; break;
+ case WXK_NUMPAD_PAGEDOWN: key = SCK_NEXT; break;
+ case WXK_NUMPAD_DELETE: key = SCK_DELETE; break;
+ case WXK_NUMPAD_INSERT: key = SCK_INSERT; 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_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)
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);
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();
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;
}
void ScintillaWX::DoDragLeave() {
SetDragPosition(invalidPosition);
}
-#endif
+#endif // wxUSE_DRAG_AND_DROP
//----------------------------------------------------------------------
-// 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();
}
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
+// 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;
+}
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+
+#endif // wxUSE_STC
projects / wxWidgets.git / blobdiff