X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a2fb4cd61069956c046e9721fda447ba1a743d7..fa275e864825d4fbd99d6a3ccb911998fce13a02:/src/stc/PlatWX.cpp diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp index ae08569e59..fbf1faf2a3 100644 --- a/src/stc/PlatWX.cpp +++ b/src/stc/PlatWX.cpp @@ -7,6 +7,8 @@ #include #include +#include + #include "Platform.h" #include "PlatWX.h" @@ -176,15 +178,20 @@ void Font::Create(const char *faceName, int characterSet, int size, bool bold, b break; } - // TODO: Use wxFontMapper and wxEncodingConverter if encoding not available. + wxFontEncodingArray ea = wxEncodingConverter::GetPlatformEquivalents(encoding); + if (ea.GetCount()) + encoding = ea[0]; id = new wxFont(size, wxDEFAULT, italic ? wxITALIC : wxNORMAL, bold ? wxBOLD : wxNORMAL, false, - faceName, + stc2wx(faceName), encoding); +#ifdef __WXMAC__ + ((wxFont*)id)->SetNoAntiAliasing( true ) ; +#endif } @@ -280,9 +287,16 @@ bool SurfaceImpl::Initialised() { } void SurfaceImpl::Init() { +#if 0 Release(); hdc = new wxMemoryDC(); hdcOwned = true; +#else + // On Mac and GTK the DC is not really valid until it has a bitmap + // selected into it. So instead of just creating the DC with no bitmap, + // go ahead and give it one. + InitPixMap(1,1,NULL); +#endif } void SurfaceImpl::Init(SurfaceID hdc_) { @@ -320,8 +334,6 @@ int SurfaceImpl::LogPixelsY() { int SurfaceImpl::DeviceHeightFont(int points) { return points; -// int logPix = LogPixelsY(); -// return (points * logPix + logPix / 2) / 72; } void SurfaceImpl::MoveTo(int x_, int y_) { @@ -391,15 +403,9 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase, hdc->SetTextBackground(wxColourFromCA(back)); FillRectangle(rc, back); -#if wxUSE_UNICODE -#error fix this... Convert s from UTF-8. -#else - wxString str = wxString(s, len); -#endif - // 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... - hdc->DrawText(str, rc.left, ybase - font.ascent); + hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); } void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, @@ -411,14 +417,8 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase, FillRectangle(rc, back); hdc->SetClippingRegion(wxRectFromPRectangle(rc)); -#if wxUSE_UNICODE -#error fix this... Convert s from UTF-8. -#else - wxString str = wxString(s, len); -#endif - // see comments above - hdc->DrawText(str, rc.left, ybase - font.ascent); + hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent); hdc->DestroyClippingRegion(); } @@ -427,43 +427,61 @@ int SurfaceImpl::WidthText(Font &font, const char *s, int len) { int w; int h; -#if wxUSE_UNICODE -#error fix this... Convert s from UTF-8. -#else - wxString str = wxString(s, len); -#endif - - hdc->GetTextExtent(str, &w, &h); + hdc->GetTextExtent(stc2wx(s, len), &w, &h); return w; } -void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) { -#if wxUSE_UNICODE -#error fix this... Convert s from UTF-8. -#else - wxString str = wxString(s, len); -#endif +void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positions) { + wxString str = stc2wx(s, len); SetFont(font); + + // Calculate the position of each character based on the widths of + // the previous characters + int* tpos = new int[len]; int totalWidth = 0; - for (size_t i=0; i<(size_t)len; i++) { - int w; - int h; + size_t i; + for (i=0; iGetTextExtent(str[i], &w, &h); totalWidth += w; - positions[i] = totalWidth; + tpos[i] = totalWidth; } + +#if wxUSE_UNICODE + // Map the widths for UCS-2 characters back to the UTF-8 input string + i = 0; + size_t ui = 0; + while (i < len) { + unsigned char uch = (unsigned char)s[i]; + positions[i++] = tpos[ui]; + if (uch >= 0x80) { + if (uch < (0x80 + 0x40 + 0x20)) { + positions[i++] = tpos[ui]; + } else { + positions[i++] = tpos[ui]; + positions[i++] = tpos[ui]; + } + } + ui++; + } +#else + + // If not unicode then just use the widths we have + memcpy(positions, tpos, len * sizeof(*tpos)); +#endif + + delete [] tpos; } + int SurfaceImpl::WidthChar(Font &font, char ch) { SetFont(font); int w; int h; -#if wxUSE_UNICODE -#error fix this... Convert s from UTF-8. -#else - hdc->GetTextExtent(ch, &w, &h); -#endif + char s[2] = { ch, 0 }; + + hdc->GetTextExtent(stc2wx(s, 1), &w, &h); return w; } @@ -517,8 +535,14 @@ void SurfaceImpl::FlushCachedState() { } void SurfaceImpl::SetUnicodeMode(bool unicodeMode_) { - // TODO: Make this jive with wxUSE_UNICODE unicodeMode=unicodeMode_; +#if wxUSE_UNICODE + wxASSERT_MSG(unicodeMode == wxUSE_UNICODE, + wxT("Only unicode may be used when wxUSE_UNICODE is on.")); +#else + wxASSERT_MSG(unicodeMode == wxUSE_UNICODE, + wxT("Only non-unicode may be used when wxUSE_UNICODE is off.")); +#endif } Surface *Surface::Allocate() { @@ -569,11 +593,13 @@ void Window::Show(bool show) { void Window::InvalidateAll() { GETWIN(id)->Refresh(false); + wxWakeUpIdle(); } void Window::InvalidateRectangle(PRectangle rc) { wxRect r = wxRectFromPRectangle(rc); GETWIN(id)->Refresh(false, &r); + wxWakeUpIdle(); } void Window::SetFont(Font &font) { @@ -609,34 +635,66 @@ void Window::SetCursor(Cursor curs) { cursorId = wxCURSOR_ARROW; break; } - - GETWIN(id)->SetCursor(wxCursor(cursorId)); +#ifdef __WXMOTIF__ + wxCursor wc = wxStockCursor(cursorId) ; +#else + wxCursor wc = wxCursor(cursorId) ; +#endif + GETWIN(id)->SetCursor(wc); } void Window::SetTitle(const char *s) { -#if wxUSE_UNICODE -#error Fix this... -#else - GETWIN(id)->SetTitle(s); -#endif + GETWIN(id)->SetTitle(stc2wx(s)); } //---------------------------------------------------------------------- // Helper classes for ListBox -// A wxListBox that gives focus back to its parent if it gets it. + +#if 1 // defined(__WXMAC__) +class wxSTCListBoxWin : public wxListBox { +public: + wxSTCListBoxWin(wxWindow* parent, wxWindowID id) + : wxListBox(parent, id, wxDefaultPosition, wxSize(0,0), + 0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER) { + SetCursor(wxCursor(wxCURSOR_ARROW)); + Hide(); + } + + void OnFocus(wxFocusEvent& event) { + GetParent()->SetFocus(); + event.Skip(); + } + + wxListBox* GetLB() { return this; } + +private: + DECLARE_EVENT_TABLE() +}; + + +BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxListBox) + EVT_SET_FOCUS(wxSTCListBoxWin::OnFocus) +END_EVENT_TABLE() + + + +#else + + class wxSTCListBox : public wxListBox { public: wxSTCListBox(wxWindow* parent, wxWindowID id) : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize, - 0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER) + 0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER | wxWANTS_CHARS) {} - void OnFocus(wxFocusEvent& event) { - GetParent()->SetFocus(); - event.Skip(); + void OnKeyDown(wxKeyEvent& event) { + // Give the key events to the STC. It will then update + // the listbox as needed. + GetGrandParent()->GetEventHandler()->ProcessEvent(event); } private: @@ -644,22 +702,25 @@ private: }; BEGIN_EVENT_TABLE(wxSTCListBox, wxListBox) - EVT_SET_FOCUS(wxSTCListBox::OnFocus) + EVT_KEY_DOWN(wxSTCListBox::OnKeyDown) + EVT_CHAR(wxSTCListBox::OnKeyDown) END_EVENT_TABLE() +#undef wxSTC_USE_POPUP +#define wxSTC_USE_POPUP 0 // wxPopupWindow just doesn't work well in this case... + // A window to place the listbox upon. If wxPopupWindow is supported then // that will be used so the listbox can extend beyond the client area of the // wxSTC if needed. - -#if wxUSE_POPUPWIN +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP #include #define wxSTCListBoxWinBase wxPopupWindow #define param2 wxBORDER_NONE // popup's 2nd param is flags #else #define wxSTCListBoxWinBase wxWindow -#define param2 -1 // wxWindows 2nd param is ID +#define param2 -1 // wxWindow's 2nd param is ID #endif class wxSTCListBoxWin : public wxSTCListBoxWinBase { @@ -667,19 +728,17 @@ public: wxSTCListBoxWin(wxWindow* parent, wxWindowID id) : wxSTCListBoxWinBase(parent, param2) { lb = new wxSTCListBox(this, id); - } + lb->SetCursor(wxCursor(wxCURSOR_ARROW)); + lb->SetFocus(); + } void OnSize(wxSizeEvent& event) { lb->SetSize(GetSize()); } - void OnFocus(wxFocusEvent& event) { - GetParent()->SetFocus(); - event.Skip(); - } wxListBox* GetLB() { return lb; } -#if wxUSE_POPUPWIN +#if wxUSE_POPUPWIN && wxSTC_USE_POPUP virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) { @@ -697,10 +756,9 @@ private: }; BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxSTCListBoxWinBase) - EVT_SIZE (wxSTCListBoxWin::OnSize) - EVT_SET_FOCUS (wxSTCListBoxWin::OnFocus) + EVT_SIZE(wxSTCListBoxWin::OnSize) END_EVENT_TABLE() - +#endif inline wxListBox* GETLB(WindowID win) { return (((wxSTCListBoxWin*)win)->GetLB()); @@ -729,8 +787,8 @@ PRectangle ListBox::GetDesiredRect() { rc.left = 0; if (sz.x > 400) sz.x = 400; - if (sz.y > 160) // TODO: Use desiredVisibleRows?? - sz.y = 160; + if (sz.y > 140) // TODO: Use desiredVisibleRows?? + sz.y = 140; rc.right = sz.x; rc.bottom = sz.y; return rc; @@ -749,7 +807,7 @@ void ListBox::Clear() { } void ListBox::Append(char *s) { - GETLB(id)->Append(s); + GETLB(id)->Append(stc2wx(s)); } int ListBox::Length() { @@ -757,12 +815,17 @@ int ListBox::Length() { } void ListBox::Select(int n) { - GETLB(id)->SetSelection(n); + bool select = TRUE; + if (n == -1) { + n = 0; + select = FALSE; + } + GETLB(id)->SetSelection(n, select); #ifdef __WXGTK__ if (n > 4) n = n - 4; else - n = 1; + n = 0; GETLB(id)->SetFirstItem(n); #endif } @@ -777,12 +840,9 @@ int ListBox::Find(const char *prefix) { } void ListBox::GetValue(int n, char *value, int len) { -#if wxUSE_UNICODE -#error fix this... wxString text = GETLB(id)->GetString(n); - strncpy(value, text.c_str(), len); + strncpy(value, wx2stc(text), len); value[len-1] = '\0'; -#endif } void ListBox::Sort() { @@ -824,7 +884,9 @@ ColourDesired Platform::ChromeHighlight() { } const char *Platform::DefaultFont() { - return wxNORMAL_FONT->GetFaceName(); + static char buf[128]; + strcpy(buf, wxNORMAL_FONT->GetFaceName().mbc_str()); + return buf; } int Platform::DefaultFontSize() { @@ -836,7 +898,7 @@ unsigned int Platform::DoubleClickTime() { } void Platform::DebugDisplay(const char *s) { - wxLogDebug(s); + wxLogDebug(stc2wx(s)); } bool Platform::IsKeyDown(int key) { @@ -852,6 +914,15 @@ long Platform::SendScintilla(WindowID w, return stc->SendMsg(msg, wParam, lParam); } +long Platform::SendScintillaPointer(WindowID w, + unsigned int msg, + unsigned long wParam, + void *lParam) { + + wxStyledTextCtrl* stc = (wxStyledTextCtrl*)w; + return stc->SendMsg(msg, wParam, (long)lParam); +} + // These are utility functions not really tied to a platform @@ -895,8 +966,10 @@ 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(buffer, "Assertion failure", - wxICON_HAND | wxOK); + /*int idButton = */ + wxMessageBox(stc2wx(buffer), + wxT("Assertion failure"), + wxICON_HAND | wxOK); // if (idButton == IDRETRY) { // ::DebugBreak(); // } else if (idButton == IDIGNORE) {