////////////////////////////////////////////////////////////////////////////
-// Name: ScintillaWX.cxx
-// Purpose: A wxWindows implementation of Scintilla. A class derived
+// Name: src/stc/ScintillaWX.cpp
+// 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
// Created: 13-Jan-2000
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// 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"
+
+#if !wxUSE_STD_CONTAINERS && !wxUSE_STD_IOSTREAM && !wxUSE_STD_STRING
+ #include "wx/beforestd.h"
+ #include <string>
+ #include "wx/afterstd.h"
+#endif
#include "ScintillaWX.h"
#include "ExternalLexer.h"
#include "wx/stc/stc.h"
+#include "wx/stc/private.h"
#include "PlatWX.h"
-#include <wx/textbuf.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 // wxWindow's 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, ScintillaWX* swx)
- : wxSTCCallTipBase(parent, param2),
- m_ct(ct), m_swx(swx)
+ 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)
{
+ SetBackgroundStyle(wxBG_STYLE_CUSTOM);
}
~wxSTCCallTip() {
+#if wxUSE_POPUPWIN && defined(__WXGTK__)
+ wxRect rect = GetRect();
+ rect.x = m_cx;
+ rect.y = m_cy;
+ GetParent()->Refresh(false, &rect);
+#endif
}
- bool AcceptsFocus() const { return FALSE; }
+ bool AcceptsFocus() const { return false; }
- void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
- wxPaintDC dc(this);
- Surface* surfaceWindow = Surface::Allocate();
+ void OnPaint(wxPaintEvent& WXUNUSED(evt))
+ {
+ wxAutoBufferedPaintDC dc(this);
+ Surface* surfaceWindow = Surface::Allocate(0);
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();
}
- void OnLeftDown(wxMouseEvent& event) {
+ 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)
+ 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);
}
+
+#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;
ScintillaWX* m_swx;
+ int m_cx, m_cy;
DECLARE_EVENT_TABLE()
};
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
stc = win;
wheelRotation = 0;
Initialise();
+#ifdef __WXMSW__
+ sysCaretBitmap = 0;
+ sysCaretWidth = 0;
+ sysCaretHeight = 0;
+#endif
}
dropTarget = new wxSTCDropTarget;
dropTarget->SetScintilla(this);
stc->SetDropTarget(dropTarget);
-#endif
- vs.extraFontFlag = true;
+#endif // wxUSE_DRAG_AND_DROP
+ vs.extraFontFlag = true; // UseAntiAliasing
}
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.SetDragFlags(wxDrag_DefaultMove);
evt.SetPosition(wxMin(stc->GetSelectionStart(),
stc->GetSelectionEnd()));
stc->GetEventHandler()->ProcessEvent(evt);
dragText = evt.GetDragText();
- if (dragText.Length()) {
+ if ( !dragText.empty() ) {
wxDropSource source(stc);
wxTextDataObject data(dragText);
wxDragResult result;
source.SetData(data);
- dropWentOutside = TRUE;
- result = source.DoDragDrop(evt.GetDragAllowMove());
+ dropWentOutside = true;
+ inDragDrop = ddDragging;
+ result = source.DoDragDrop(evt.GetDragFlags());
if (result == wxDragMove && dropWentOutside)
ClearSelection();
- inDragDrop = FALSE;
- SetDragPosition(invalidPosition);
+ inDragDrop = ddNone;
+ SetDragPosition(SelectionPosition(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(-1, wxEVT_IDLE,
- (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+ if (on)
+ stc->Connect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
else
- stc->Disconnect(-1, wxEVT_IDLE,
- (wxObjectEventFunction) (wxEventFunction) (wxIdleEventFunction) &wxStyledTextCtrl::OnIdle);
+ stc->Disconnect(wxID_ANY, wxEVT_IDLE, wxIdleEventHandler(wxStyledTextCtrl::OnIdle));
idler.state = on;
}
return idler.state;
}
-
+
void ScintillaWX::SetTicking(bool on) {
wxSTCTimer* steTimer;
if (timer.ticking != on) {
void ScintillaWX::ScrollText(int linesToMove) {
int dy = vs.lineHeight * (linesToMove);
stc->ScrollWindow(0, dy);
- stc->Update();
}
void ScintillaWX::SetVerticalScrollPos() {
void ScintillaWX::Copy() {
- if (currentPos != anchor) {
+ if (!sel.Empty()) {
SelectionText st;
CopySelectionRange(&st);
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);
- pdoc->InsertString(currentPos, buf, len);
- SetEmptySelection(currentPos + len);
+ 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);
+ int caretMain = sel.MainCaret();
+ pdoc->InsertString(caretMain, buf, len);
+ SetEmptySelection(caretMain + 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()) {
- wxTheClipboard->UsePrimarySelection(FALSE);
- wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len));
+ 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 (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();
}
}
return canPaste;
+#else
+ return false;
+#endif // wxUSE_CLIPBOARD
}
void ScintillaWX::CreateCallTipWindow(PRectangle) {
}
-// 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() {
-#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) {
+ if (!sel.Empty()) {
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 = PointMainCaret();
+ ::SetCaretPos(pos.x, pos.y);
+ }
#endif
}
-long ScintillaWX::DefWndProc(unsigned int /*iMessage*/, unsigned long /*wParam*/, long /*lParam*/) {
+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
+}
+
+
+//----------------------------------------------------------------------
+
+
+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) {
+#if 0 // TODO: check this
+
case SCI_CALLTIPSHOW: {
// NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
// because of the little tweak that needs done below for wxGTK.
char* defn = reinterpret_cast<char *>(lParam);
AutoCompleteCancel();
pt.y += vs.lineHeight;
- PRectangle rc = ct.CallTipStart(currentPos, pt,
+ int ctStyle = ct.UseStyleCallTip() ? STYLE_CALLTIP : STYLE_DEFAULT;
+ if (ct.UseStyleCallTip())
+ {
+ ct.SetForeBack(vs.styles[STYLE_CALLTIP].fore, vs.styles[STYLE_CALLTIP].back);
+ }
+ int caretMain = sel.MainCaret();
+ PRectangle rc = ct.CallTipStart(caretMain, pt,
defn,
- vs.styles[STYLE_DEFAULT].fontName,
- vs.styles[STYLE_DEFAULT].sizeZoomed,
- IsUnicodeMode(),
+ vs.styles[ctStyle].fontName,
+ vs.styles[ctStyle].sizeZoomed,
+ CodePage(),
+ vs.styles[ctStyle].characterSet,
wMain);
// If the call-tip window would be out of the client
// space, adjust so it displays above the text.
ct.wCallTip.Show();
break;
}
+#endif
#ifdef SCI_LEXER
- case SCI_LOADLEXERLIBRARY:
+ case SCI_LOADLEXERLIBRARY:
LexerManager::GetInstance()->Load((const char*)lParam);
break;
#endif
+
default:
return ScintillaBase::WndProc(iMessage, wParam, lParam);
}
void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
paintState = painting;
- Surface* surfaceWindow = Surface::Allocate();
- 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;
+ AutoSurface surfaceWindow(dc, this);
+ if (surfaceWindow) {
+ rcPaint = PRectangleFromwxRect(rect);
+ PRectangle rcClient = GetClientRectangle();
+ paintingAllText = rcPaint.Contains(rcClient);
+
+ ClipChildren(*dc, rcPaint);
+ Paint(surfaceWindow, rcPaint);
+ surfaceWindow->Release();
+ }
+
if (paintState == paintAbandoned) {
- // Painting area was insufficient to cover new styling or brace highlight positions
- FullPaint(dc);
+ // Painting area was insufficient to cover new styling or brace
+ // highlight positions. So trigger a new paint event that will
+ // repaint the whole window.
+ stc->Refresh(false);
+
+#if defined(__WXOSX__)
+ // On Mac we also need to finish the current paint to make sure that
+ // everything is on the screen that needs to be there between now and
+ // when the next paint event arrives.
+ FullPaintDC(dc);
+#endif
+ }
+ paintState = notPainting;
+}
+
+
+// Force the whole window to be repainted
+void ScintillaWX::FullPaint() {
+ stc->Refresh(false);
+ stc->Update();
+}
+
+
+void ScintillaWX::FullPaintDC(wxDC* dc) {
+ paintState = painting;
+ rcPaint = GetClientRectangle();
+ paintingAllText = true;
+ AutoSurface surfaceWindow(dc, this);
+ if (surfaceWindow) {
+ Paint(surfaceWindow, rcPaint);
+ surfaceWindow->Release();
}
paintState = notPainting;
}
+
void ScintillaWX::DoHScroll(int type, int pos) {
int xPos = xOffset;
PRectangle rcText = GetTextRectangle();
int lines;
if (ctrlDown) { // Zoom the fonts if Ctrl key down
- if (rotation < 0) {
+ if (rotation > 0) {
KeyCommand(SCI_ZOOMIN);
}
else {
void ScintillaWX::DoSize(int WXUNUSED(width), int WXUNUSED(height)) {
-// PRectangle rcClient(0,0,width,height);
-// SetScrollBarsTo(rcClient);
-// DropGraphics();
ChangeSize();
}
focusEvent = true;
SetFocusState(false);
focusEvent = false;
+ DestroySystemCaret();
}
void ScintillaWX::DoGainFocus(){
focusEvent = true;
SetFocusState(true);
focusEvent = false;
+ DestroySystemCaret();
+ CreateSystemCaret();
}
void ScintillaWX::DoSysColourChange() {
// 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);
+ MovePositionTo(newPos, Selection::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);
+ int caretMain = sel.MainCaret();
+ pdoc->InsertString(caretMain, buf, len);
+ SetEmptySelection(caretMain + len);
}
pdoc->EndUndoAction();
NotifyChange();
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.
- if (ctrl && key >= 1 && key <= 26)
+int ScintillaWX::DoKeyDown(const wxKeyEvent& evt, bool* consumed)
+{
+ int key = evt.GetKeyCode();
+ if (key == WXK_NONE) {
+ // This is a Unicode character not representable in Latin-1 or some key
+ // without key code at all (e.g. dead key or VK_PROCESSKEY under MSW).
+ if ( consumed )
+ *consumed = false;
+ return 0;
+ }
+
+ 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_PAGEUP: // fall through
- case WXK_PRIOR: key = SCK_PRIOR; break;
- case WXK_PAGEDOWN: // fall through
- 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_CONTROL: key = 0; break;
case WXK_ALT: key = 0; break;
case WXK_SHIFT: key = 0; break;
- case WXK_MENU: key = 0; break;
+ case WXK_MENU: key = SCK_MENU; break;
}
#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 ) {
}
}
#endif
-
+
int rv = KeyDown(key, shift, ctrl, alt, consumed);
if (key)
AutoCompleteCompleted();
}
-
+
void ScintillaWX::DoOnIdle(wxIdleEvent& evt) {
if ( Idle() )
else
SetIdle(false);
}
-
+
//----------------------------------------------------------------------
#if wxUSE_DRAG_AND_DROP
bool ScintillaWX::DoDropText(long x, long y, const wxString& data) {
- SetDragPosition(invalidPosition);
+ SetDragPosition(SelectionPosition(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.SetX(x);
evt.SetY(y);
evt.SetPosition(PositionFromLocation(Point(x,y)));
- evt.SetDragText(data);
+ evt.SetDragText(text);
stc->GetEventHandler()->ProcessEvent(evt);
dragResult = evt.GetDragResult();
if (dragResult == wxDragMove || dragResult == wxDragCopy) {
- DropAt(evt.GetPosition(),
+ DropAt(SelectionPosition(evt.GetPosition()),
wx2stc(evt.GetDragText()),
dragResult == wxDragMove,
- FALSE); // TODO: rectangular?
- return TRUE;
+ false); // TODO: rectangular?
+ return true;
}
- return FALSE;
+ return false;
}
wxDragResult ScintillaWX::DoDragOver(wxCoord x, wxCoord y, wxDragResult def) {
- SetDragPosition(PositionFromLocation(Point(x, y)));
+ SetDragPosition(SelectionPosition(PositionFromLocation(Point(x, y))));
// Send an event to allow the drag result to be changed
wxStyledTextEvent evt(wxEVT_STC_DRAG_OVER, stc->GetId());
void ScintillaWX::DoDragLeave() {
- SetDragPosition(invalidPosition);
+ SetDragPosition(SelectionPosition(invalidPosition));
}
-#endif
+#endif // wxUSE_DRAG_AND_DROP
//----------------------------------------------------------------------
-// Redraw all of text area. This paint will not be abandoned.
-void ScintillaWX::FullPaint(wxDC *dc) {
- wxCHECK_RET(dc != NULL, wxT("Invalid wxDC in ScintillaWX::FillPaint"));
- paintState = painting;
- rcPaint = GetClientRectangle();
- paintingAllText = true;
- Surface* surfaceWindow = Surface::Allocate();
- surfaceWindow->Init(dc, wMain.GetID());
-
- dc->BeginDrawing();
- ClipChildren(*dc, rcPaint);
- Paint(surfaceWindow, rcPaint);
- dc->EndDrawing();
-
- delete surfaceWindow;
- paintState = notPainting;
-}
-
-
void ScintillaWX::DoScrollToLine(int line) {
ScrollTo(line);
}
HorizontalScrollTo(column * vs.spaceWidth);
}
-#ifdef __WXGTK__
-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
- wxRegion rgn(wxRectFromPRectangle(rect));
- if (ac.Active()) {
- wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
- rgn.Subtract(childRect);
- }
- if (ct.inCallTipMode) {
- wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
- rgn.Subtract(childRect);
- }
-
- dc.SetClippingRegion(rgn);
-}
-#else
-void ScintillaWX::ClipChildren(wxDC& WXUNUSED(dc), PRectangle WXUNUSED(rect)) {
+// 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);
}
-#endif
void ScintillaWX::SetUseAntiAliasing(bool useAA) {
}
bool ScintillaWX::GetUseAntiAliasing() {
- return vs.extraFontFlag;
+ return vs.extraFontFlag != 0;
}
-
+
//----------------------------------------------------------------------
//----------------------------------------------------------------------
+
+#endif // wxUSE_STC
projects / wxWidgets.git / blobdiff