X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d99859e492c91806d2415def24fd91b3703b6d1b..08168cc43d14a68d702253d9926b680729066afb:/src/stc/PlatWX.cpp diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index 98eba98548..dfa9435994 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -1,5 +1,5 @@ // Scintilla source code edit control -// PlatWX.cxx - implementation of platform facilities on wxWindows +// PlatWX.cxx - implementation of platform facilities on wxWidgets // Copyright 1998-1999 by Neil Hodgson // Robin Dunn // The License.txt file describes the conditions under which this software may be distributed. @@ -18,19 +18,15 @@ #include "wx/stc/stc.h" -#ifdef __WXGTK__ -#include -#endif - Point Point::FromLong(long lpoint) { return Point(lpoint & 0xFFFF, lpoint >> 16); } wxRect wxRectFromPRectangle(PRectangle prc) { - wxRect rc(prc.left, prc.top, - prc.right-prc.left, prc.bottom-prc.top); - return rc; + wxRect r(prc.left, prc.top, + prc.Width(), prc.Height()); + return r; } PRectangle PRectangleFromwxRect(wxRect rc) { @@ -40,7 +36,9 @@ PRectangle PRectangleFromwxRect(wxRect rc) { wxColour wxColourFromCA(const ColourAllocated& ca) { ColourDesired cd(ca.AsLong()); - return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue()); + return wxColour((unsigned char)cd.GetRed(), + (unsigned char)cd.GetGreen(), + (unsigned char)cd.GetBlue()); } //---------------------------------------------------------------------- @@ -100,7 +98,7 @@ Font::Font() { Font::~Font() { } -void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic) { +void Font::Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag) { wxFontEncoding encoding; Release(); @@ -185,13 +183,15 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b if (ea.GetCount()) encoding = ea[0]; - id = new wxFont(size, + wxFont* font = new wxFont(size, wxDEFAULT, italic ? wxITALIC : wxNORMAL, bold ? wxBOLD : wxNORMAL, false, stc2wx(faceName), encoding); + font->SetNoAntiAliasing(!extraFontFlag); + id = font; } @@ -288,7 +288,7 @@ void SurfaceImpl::Init(SurfaceID hdc_, WindowID) { hdc = (wxDC*)hdc_; } -void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID) { +void SurfaceImpl::InitPixMap(int width, int height, Surface *WXUNUSED(surface_), WindowID) { Release(); hdc = new wxMemoryDC(); hdcOwned = true; @@ -405,7 +405,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase, SetFont(font); hdc->SetTextForeground(wxColourFromCA(fore)); hdc->SetTextBackground(wxColourFromCA(back)); - //FillRectangle(rc, back); + FillRectangle(rc, back); // ybase is where the baseline should be, but wxWin uses the upper left // corner, so I need to calculate the real position for the text... @@ -418,11 +418,12 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, SetFont(font); hdc->SetTextForeground(wxColourFromCA(fore)); hdc->SetTextBackground(wxColourFromCA(back)); - //FillRectangle(rc, back); + FillRectangle(rc, back); hdc->SetClippingRegion(wxRectFromPRectangle(rc)); // see comments above hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); + hdc->DestroyClippingRegion(); } @@ -444,42 +445,18 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase, void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) { - wxString str = stc2wx(s, len); - SetFont(font); + wxString str = stc2wx(s, len); + wxArrayInt tpos; -#ifndef __WXMAC__ - // Calculate the position of each character based on the widths of - // the previous characters - int* tpos = new int[len]; - int totalWidth = 0; - size_t i; - for (i=0; iGetTextExtent(str[i], &w, &h); - totalWidth += w; - tpos[i] = totalWidth; - } -#else - // Instead of a running total, remeasure from the begining of the - // text for each character's position. This is because with AA fonts - // on OS X widths can be fractions of pixels wide when more than one - // are drawn together, so the sum of all character widths is not necessarily - // (and probably not) the same as the whole string width. - int* tpos = new int[len]; - size_t i; - for (i=0; iGetTextExtent(str.Left(i+1), &w, &h); - tpos[i] = w; - } -#endif + SetFont(font); + hdc->GetPartialTextExtents(str, tpos); #if wxUSE_UNICODE // Map the widths for UCS-2 characters back to the UTF-8 input string // NOTE: I don't think this is right for when sizeof(wxChar) > 2, ie wxGTK2 // so figure it out and fix it! - i = 0; + size_t i = 0; size_t ui = 0; while ((int)i < len) { unsigned char uch = (unsigned char)s[i]; @@ -497,10 +474,8 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio #else // If not unicode then just use the widths we have - memcpy(positions, tpos, len * sizeof(*tpos)); + memcpy(positions, tpos.begin(), len * sizeof(int)); #endif - - delete [] tpos; } @@ -541,7 +516,7 @@ int SurfaceImpl::Descent(Font &font) { return d; } -int SurfaceImpl::InternalLeading(Font &font) { +int SurfaceImpl::InternalLeading(Font &WXUNUSED(font)) { return 0; } @@ -554,7 +529,7 @@ int SurfaceImpl::ExternalLeading(Font &font) { int SurfaceImpl::Height(Font &font) { SetFont(font); - return hdc->GetCharHeight(); + return hdc->GetCharHeight() + 1; } int SurfaceImpl::AverageCharWidth(Font &font) { @@ -562,7 +537,7 @@ int SurfaceImpl::AverageCharWidth(Font &font) { return hdc->GetCharWidth(); } -int SurfaceImpl::SetPalette(Palette *pal, bool inBackGround) { +int SurfaceImpl::SetPalette(Palette *WXUNUSED(pal), bool WXUNUSED(inBackGround)) { return 0; } @@ -577,7 +552,7 @@ void SurfaceImpl::SetUnicodeMode(bool unicodeMode_) { unicodeMode=unicodeMode_; } -void SurfaceImpl::SetDBCSMode(int codePage) { +void SurfaceImpl::SetDBCSMode(int WXUNUSED(codePage)) { // dbcsMode = codePage == SC_CP_DBCS; } @@ -597,7 +572,7 @@ Window::~Window() { void Window::Destroy() { if (id) { - Show(FALSE); + Show(false); GETWIN(id)->Destroy(); } id = 0; @@ -674,6 +649,7 @@ void Window::SetCursor(Cursor curs) { break; case cursorHand: cursorId = wxCURSOR_HAND; + break; default: cursorId = wxCURSOR_ARROW; break; @@ -696,33 +672,195 @@ void Window::SetTitle(const char *s) { // Helper classes for ListBox -// This is a simple subclass of wxLIstView that just resets focus to the +// This is a simple subclass of wxListView that just resets focus to the // parent when it gets it. class wxSTCListBox : public wxListView { public: wxSTCListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) - : wxListView(parent, id, pos, size, style) - {} + : wxListView() + { +#ifdef __WXMSW__ + Hide(); // don't flicker as we move it around... +#endif + Create(parent, id, pos, size, style); + } + void OnFocus(wxFocusEvent& event) { GetParent()->SetFocus(); event.Skip(); } + void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { + // Do nothing. Prevents base class from resetting the colors... + } + +#ifdef __WXMAC__ + // For some reason I don't understand yet the focus doesn't really leave + // the listbox like it should, so if we get any events feed them back to + // the wxSTC + void OnKeyDown(wxKeyEvent& event) { + GetGrandParent()->GetEventHandler()->ProcessEvent(event); + } + void OnChar(wxKeyEvent& event) { + GetGrandParent()->GetEventHandler()->ProcessEvent(event); + } + + // And we need to force the focus back when being destroyed + ~wxSTCListBox() { + GetGrandParent()->SetFocus(); + } +#endif + private: DECLARE_EVENT_TABLE() }; BEGIN_EVENT_TABLE(wxSTCListBox, wxListView) EVT_SET_FOCUS( wxSTCListBox::OnFocus) + EVT_KILL_FOCUS(wxSTCListBox::OnKillFocus) +#ifdef __WXMAC__ + EVT_KEY_DOWN( wxSTCListBox::OnKeyDown) + EVT_CHAR( wxSTCListBox::OnChar) +#endif END_EVENT_TABLE() +#if wxUSE_POPUPWIN //----------------------------------- +#include + -// A window to place the wxSTCListBox upon +// +// TODO: Refactor these two classes to have a common base (or a mix-in) to get +// rid of the code duplication. (Either that or convince somebody to +// implement wxPopupWindow for the Mac!!) +// +// In the meantime, be careful to duplicate any changes as needed... +// + +// A popup window to place the wxSTCListBox upon +class wxSTCListBoxWin : public wxPopupWindow +{ +private: + wxListView* lv; + CallBackAction doubleClickAction; + void* doubleClickActionData; +public: + wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : + wxPopupWindow(parent, wxBORDER_NONE) + { + SetBackgroundColour(*wxBLACK); // for our simple border + + lv = new wxSTCListBox(parent, id, wxDefaultPosition, wxDefaultSize, + wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE); + lv->SetCursor(wxCursor(wxCURSOR_ARROW)); + lv->InsertColumn(0, wxEmptyString); + lv->InsertColumn(1, wxEmptyString); + + // NOTE: We need to fool the wxListView into thinking that it has the + // focus so it will use the normal selection colour and will look + // "right" to the user. But since the wxPopupWindow or its children + // can't receive focus then we have to pull a fast one and temporarily + // parent the listctrl on the STC window and then call SetFocus and + // then reparent it back to the popup. + lv->SetFocus(); + lv->Reparent(this); +#ifdef __WXMSW__ + lv->Show(); +#endif + } + + + // Set position in client coords + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO) { + if (x != wxDefaultCoord) { + GetParent()->ClientToScreen(&x, NULL); + } + if (y != wxDefaultCoord) { + GetParent()->ClientToScreen(NULL, &y); + } + wxPopupWindow::DoSetSize(x, y, width, height, sizeFlags); + } + + // return position as if it were in client coords + virtual void DoGetPosition( int *x, int *y ) const { + int sx, sy; + wxPopupWindow::DoGetPosition(&sx, &sy); + GetParent()->ScreenToClient(&sx, &sy); + if (x) *x = sx; + if (y) *y = sy; + } + + + bool Destroy() { + if ( !wxPendingDelete.Member(this) ) + wxPendingDelete.Append(this); + return true; + } + + + int IconWidth() { + wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL); + if (il != NULL) { + int w, h; + il->GetSize(0, w, h); + return w; + } + return 0; + } + + + void SetDoubleClickAction(CallBackAction action, void *data) { + doubleClickAction = action; + doubleClickActionData = data; + } + + + void OnFocus(wxFocusEvent& event) { + GetParent()->SetFocus(); + event.Skip(); + } + + void OnSize(wxSizeEvent& event) { + // resize the child + wxSize sz = GetSize(); + sz.x -= 2; + sz.y -= 2; + lv->SetSize(1, 1, sz.x, sz.y); + // reset the column widths + lv->SetColumnWidth(0, IconWidth()+4); + lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) - + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X)); + event.Skip(); + } + + void OnActivate(wxListEvent& WXUNUSED(event)) { + doubleClickAction(doubleClickActionData); + } + + wxListView* GetLB() { return lv; } + +private: + DECLARE_EVENT_TABLE() + +}; + +BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxPopupWindow) + EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus) + EVT_SIZE ( wxSTCListBoxWin::OnSize) + EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate) +END_EVENT_TABLE() + + + +#else // wxUSE_POPUPWIN ----------------------------------- + +// A normal window to place the wxSTCListBox upon. class wxSTCListBoxWin : public wxWindow { private: wxListView* lv; @@ -730,18 +868,42 @@ private: void* doubleClickActionData; public: wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : - wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER ) + wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxSIMPLE_BORDER ) { - SetBackgroundColour(*wxBLACK); lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER); lv->SetCursor(wxCursor(wxCURSOR_ARROW)); lv->InsertColumn(0, wxEmptyString); lv->InsertColumn(1, wxEmptyString); + + // Eventhough we immediately reset the focus to the parent, this helps + // things to look right... + lv->SetFocus(); + Hide(); } + + // On OSX and (possibly others) there can still be pending + // messages/events for the list control when Scintilla wants to + // close it, so do a pending delete of it instead of destroying + // immediately. + bool Destroy() { +#ifdef __WXMAC__ + // The bottom edge of this window is not getting properly + // refreshed upon deletion, so help it out... + wxWindow* p = GetParent(); + wxRect r(GetPosition(), GetSize()); + r.SetHeight(r.GetHeight()+1); + p->Refresh(false, &r); +#endif + if ( !wxPendingDelete.Member(this) ) + wxPendingDelete.Append(this); + return true; + } + + int IconWidth() { wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL); if (il != NULL) { @@ -765,9 +927,9 @@ public: } void OnSize(wxSizeEvent& event) { - // resize the child, leaving a 1 pixel border + // resize the child wxSize sz = GetClientSize(); - lv->SetSize(1, 1, sz.x-2, sz.y-2); + lv->SetSize(sz); // reset the column widths lv->SetColumnWidth(0, IconWidth()+4); lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) - @@ -775,7 +937,15 @@ public: event.Skip(); } - void OnActivate(wxListEvent& event) { +#ifdef __WXMAC__ + virtual bool Show(bool show = true) { + bool rv = wxWindow::Show(show); + GetParent()->Refresh(false); + return rv; + } +#endif + + void OnActivate(wxListEvent& WXUNUSED(event)) { doubleClickAction(doubleClickActionData); } @@ -787,11 +957,12 @@ private: BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow) - EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus) - EVT_SIZE ( wxSTCListBoxWin::OnSize) - EVT_LIST_ITEM_ACTIVATED(-1, wxSTCListBoxWin::OnActivate) + EVT_SET_FOCUS ( wxSTCListBoxWin::OnFocus) + EVT_SIZE ( wxSTCListBoxWin::OnSize) + EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxSTCListBoxWin::OnActivate) END_EVENT_TABLE() +#endif // wxUSE_POPUPWIN ----------------------------------- inline wxSTCListBoxWin* GETLBW(WindowID win) { @@ -831,7 +1002,6 @@ public: virtual int GetSelection(); virtual int Find(const char *prefix); virtual void GetValue(int n, char *value, int len); - virtual void Sort(); virtual void RegisterImage(int type, const char *xpm_data); virtual void ClearRegisteredImages(); virtual void SetDoubleClickAction(CallBackAction, void *); @@ -887,7 +1057,7 @@ PRectangle ListBoxImpl::GetDesiredRect() { // wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of // the max size in Append and calculate it here... int maxw = maxStrWidth; - int maxh = 0; + int maxh ; // give it a default if there are no lines, and/or add a bit more if (maxw == 0) maxw = 100; @@ -953,10 +1123,10 @@ int ListBoxImpl::Length() { void ListBoxImpl::Select(int n) { - bool select = TRUE; + bool select = true; if (n == -1) { n = 0; - select = FALSE; + select = false; } GETLB(id)->Focus(n); GETLB(id)->Select(n, select); @@ -968,9 +1138,9 @@ int ListBoxImpl::GetSelection() { } -int ListBoxImpl::Find(const char *prefix) { +int ListBoxImpl::Find(const char *WXUNUSED(prefix)) { // No longer used - return -1; + return wxNOT_FOUND; } @@ -984,17 +1154,15 @@ void ListBoxImpl::GetValue(int n, char *value, int len) { value[len-1] = '\0'; } -void ListBoxImpl::Sort() { -} - void ListBoxImpl::RegisterImage(int type, const char *xpm_data) { wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1); - wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM)); + wxImage img(stream, wxBITMAP_TYPE_XPM); + wxBitmap bmp(img); if (! imgList) { // assumes all images are the same size - imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), TRUE); + imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), true); imgTypeMap = new wxArrayInt; } @@ -1062,7 +1230,7 @@ void Menu::Show(Point pt, Window &w) { //---------------------------------------------------------------------- -DynamicLibrary *DynamicLibrary::Load(const char *modulePath) { +DynamicLibrary *DynamicLibrary::Load(const char *WXUNUSED(modulePath)) { wxFAIL_MSG(wxT("Dynamic lexer loading not implemented yet")); return NULL; } @@ -1096,13 +1264,13 @@ unsigned int Platform::DoubleClickTime() { } bool Platform::MouseButtonBounce() { - return FALSE; + return false; } void Platform::DebugDisplay(const char *s) { wxLogDebug(stc2wx(s)); } -bool Platform::IsKeyDown(int key) { +bool Platform::IsKeyDown(int WXUNUSED(key)) { return false; // I don't think we'll need this. } @@ -1158,31 +1326,31 @@ void Platform::DebugPrintf(const char *format, ...) { static bool assertionPopUps = true; bool Platform::ShowAssertionPopUps(bool assertionPopUps_) { - bool ret = assertionPopUps; - assertionPopUps = assertionPopUps_; - return ret; + bool ret = assertionPopUps; + assertionPopUps = assertionPopUps_; + return ret; } void Platform::Assert(const char *c, const char *file, int line) { - char buffer[2000]; - sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line); - if (assertionPopUps) { - /*int idButton = */ - wxMessageBox(stc2wx(buffer), - wxT("Assertion failure"), - wxICON_HAND | wxOK); -// if (idButton == IDRETRY) { -// ::DebugBreak(); -// } else if (idButton == IDIGNORE) { -// // all OK -// } else { -// abort(); -// } - } else { - strcat(buffer, "\r\n"); - Platform::DebugDisplay(buffer); - abort(); - } + char buffer[2000]; + sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line); + if (assertionPopUps) { + /*int idButton = */ + wxMessageBox(stc2wx(buffer), + wxT("Assertion failure"), + wxICON_HAND | wxOK); +// if (idButton == IDRETRY) { +// ::DebugBreak(); +// } else if (idButton == IDIGNORE) { +// // all OK +// } else { +// abort(); +// } + } else { + strcat(buffer, "\r\n"); + Platform::DebugDisplay(buffer); + abort(); + } } @@ -1195,16 +1363,16 @@ int Platform::Clamp(int val, int minVal, int maxVal) { } -bool Platform::IsDBCSLeadByte(int codePage, char ch) { +bool Platform::IsDBCSLeadByte(int WXUNUSED(codePage), char WXUNUSED(ch)) { return false; } -int Platform::DBCSCharLength(int codePage, const char *s) { - return 0; +int Platform::DBCSCharLength(int WXUNUSED(codePage), const char *WXUNUSED(s)) { + return 1; } int Platform::DBCSCharMaxLength() { - return 0; + return 1; } @@ -1224,17 +1392,46 @@ double ElapsedTime::Duration(bool reset) { //---------------------------------------------------------------------- #if wxUSE_UNICODE + +#include "UniConversion.h" + +// Convert using Scintilla's functions instead of wx's, Scintilla's are more +// forgiving and won't assert... + wxString stc2wx(const char* str, size_t len) { - char *buffer=new char[len+1]; - strncpy(buffer, str, len); - buffer[len]=0; + if (!len) + return wxEmptyString; + + size_t wclen = UCS2Length(str, len); + wxWCharBuffer buffer(wclen+1); + + size_t actualLen = UCS2FromUTF8(str, len, buffer.data(), wclen+1); + return wxString(buffer.data(), actualLen); +} + + + +wxString stc2wx(const char* str) +{ + return stc2wx(str, strlen(str)); +} + + +const wxWX2MBbuf wx2stc(const wxString& str) +{ + const wchar_t* wcstr = str.c_str(); + size_t wclen = str.length(); + size_t len = UTF8Length(wcstr, wclen); - wxString cstr(buffer, wxConvUTF8); + wxCharBuffer buffer(len+1); + UTF8FromUCS2(wcstr, wclen, buffer.data(), len); - delete[] buffer; - return cstr; + // TODO check NULL termination!! + + return buffer; } + #endif