X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d17d68f470c31f7c145b095eb1a3e0c2f581f30..8161b5b9f03998a332dbacad3b476a292bc847f6:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index eac07cc904..dc03ce10db 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -13,8 +13,18 @@ #endif #include "wx/cursor.h" +#include "wx/utils.h" +#include "wx/app.h" -#include "gdk/gdk.h" +#include +#include + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; //----------------------------------------------------------------------------- // wxCursor @@ -48,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor() { + } wxCursor::wxCursor( int cursorId ) @@ -57,51 +68,241 @@ wxCursor::wxCursor( int cursorId ) GdkCursorType gdk_cur = GDK_LEFT_PTR; switch (cursorId) { + case wxCURSOR_ARROW: // fall through to default + case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break; + case wxCURSOR_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break; case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break; case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break; case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break; case wxCURSOR_SIZENS: gdk_cur = GDK_SB_V_DOUBLE_ARROW; break; - case wxCURSOR_WAIT: + case wxCURSOR_ARROWWAIT: + case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break; case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break; case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break; case wxCURSOR_NO_ENTRY: gdk_cur = GDK_PIRATE; break; - case wxCURSOR_SIZENWSE: + case wxCURSOR_SIZENWSE: case wxCURSOR_SIZENESW: gdk_cur = GDK_FLEUR; break; case wxCURSOR_QUESTION_ARROW: gdk_cur = GDK_QUESTION_ARROW; break; - case wxCURSOR_PAINT_BRUSH: gdk_cur = GDK_SPRAYCAN; break; - case wxCURSOR_MAGNIFIER: gdk_cur = GDK_PLUS; break; - case wxCURSOR_CHAR: gdk_cur = GDK_XTERM; break; + case wxCURSOR_PAINT_BRUSH: gdk_cur = GDK_SPRAYCAN; break; + case wxCURSOR_MAGNIFIER: gdk_cur = GDK_PLUS; break; + case wxCURSOR_CHAR: gdk_cur = GDK_XTERM; break; case wxCURSOR_LEFT_BUTTON: gdk_cur = GDK_LEFTBUTTON; break; case wxCURSOR_MIDDLE_BUTTON: gdk_cur = GDK_MIDDLEBUTTON; break; case wxCURSOR_RIGHT_BUTTON: gdk_cur = GDK_RIGHTBUTTON; break; + case wxCURSOR_BULLSEYE: gdk_cur = GDK_TARGET; break; + + case wxCURSOR_POINT_LEFT: gdk_cur = GDK_SB_LEFT_ARROW; break; + case wxCURSOR_POINT_RIGHT: gdk_cur = GDK_SB_RIGHT_ARROW; break; /* - case wxCURSOR_DOUBLE_ARROW: gdk_cur = GDK_DOUBLE_ARROW; break; - case wxCURSOR_CROSS_REVERSE: gdk_cur = GDK_CROSS_REVERSE; break; + case wxCURSOR_DOUBLE_ARROW: gdk_cur = GDK_DOUBLE_ARROW; break; + case wxCURSOR_CROSS_REVERSE: gdk_cur = GDK_CROSS_REVERSE; break; case wxCURSOR_BASED_ARROW_UP: gdk_cur = GDK_BASED_ARROW_UP; break; case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break; */ + default: + wxFAIL_MSG(wxT("unsupported cursor type")); + // will use the standard one + break; } M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); } +extern GtkWidget *wxGetRootWindow(); + +wxCursor::wxCursor(const char bits[], int width, int height, + int hotSpotX, int hotSpotY, + const char maskBits[], wxColour *fg, wxColour *bg) +{ + if (!maskBits) + maskBits = bits; + if (!fg) + fg = wxBLACK; + if (!bg) + bg = wxWHITE; + if (hotSpotX < 0 || hotSpotX >= width) + hotSpotX = 0; + if (hotSpotY < 0 || hotSpotY >= height) + hotSpotY = 0; + + GdkBitmap *data = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) bits, width, height ); + GdkBitmap *mask = gdk_bitmap_create_from_data( wxGetRootWindow()->window, (gchar *) maskBits, width, height); + + m_refData = new wxCursorRefData; + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( + data, mask, fg->GetColor(), bg->GetColor(), + hotSpotX, hotSpotY ); + + gdk_bitmap_unref( data ); + gdk_bitmap_unref( mask ); +} + + wxCursor::wxCursor( const wxCursor &cursor ) + : wxObject() { Ref( cursor ); } +#if wxUSE_IMAGE + +wxCursor::wxCursor( const wxImage & image ) +{ + unsigned char * rgbBits = image.GetData(); + int w = image.GetWidth() ; + int h = image.GetHeight(); + bool bHasMask = image.HasMask(); + int imagebitcount = (w*h)/8; + + unsigned char * bits = new unsigned char [imagebitcount]; + unsigned char * maskBits = new unsigned char [imagebitcount]; + + int i, j, i8; unsigned char c, cMask; + for (i=0; i mid grey + if (c>127) + bits[i] = bits[i] | cMask; + cMask = cMask * 2; + } + } + + unsigned long keyMaskColor; + if (bHasMask) + { + unsigned char + r = image.GetMaskRed(), + g = image.GetMaskGreen(), + b = image.GetMaskBlue(); + + for (i=0; isecond.value; + key = entry->first; + if ( !bHasMask || (key != keyMaskColor) ) + { + if (value > nMost) + { + nMost = value; + colMostFreq = key; + } + else if (value > nNext) + { + nNext = value; + colNextMostFreq = key; + } + } + } + + wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16), + (unsigned char)(colMostFreq >> 8), + (unsigned char)(colMostFreq) ); + + wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16), + (unsigned char)(colNextMostFreq >> 8), + (unsigned char)(colNextMostFreq) ); + + int hotSpotX; + int hotSpotY; + + if (image.HasOption(wxCUR_HOTSPOT_X)) + hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X); + else + hotSpotX = 0; + + if (image.HasOption(wxCUR_HOTSPOT_Y)) + hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y); + else + hotSpotY = 0; + + if (hotSpotX < 0 || hotSpotX >= w) + hotSpotX = 0; + if (hotSpotY < 0 || hotSpotY >= h) + hotSpotY = 0; + + GdkBitmap *data = gdk_bitmap_create_from_data(wxGetRootWindow()->window, + (gchar *) bits, w, h); + GdkBitmap *mask = gdk_bitmap_create_from_data(wxGetRootWindow()->window, + (gchar *) maskBits, w, h); + + m_refData = new wxCursorRefData; + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap + ( + data, + mask, + fg.GetColor(), bg.GetColor(), + hotSpotX, hotSpotY + ); + + gdk_bitmap_unref( data ); + gdk_bitmap_unref( mask ); + delete [] bits; + delete [] maskBits; +} + +#endif // wxUSE_IMAGE + wxCursor::~wxCursor() { } wxCursor& wxCursor::operator = ( const wxCursor& cursor ) { - if (*this == cursor) return (*this); + if (*this == cursor) + return (*this); + Ref( cursor ); - + return *this; } @@ -129,29 +330,60 @@ GdkCursor *wxCursor::GetCursor() const // busy cursor routines //----------------------------------------------------------------------------- -bool g_isBusy = FALSE; +extern wxCursor g_globalCursor; + +static wxCursor gs_savedCursor; +static int gs_busyCount = 0; + +const wxCursor &wxBusyCursor::GetStoredCursor() +{ + return gs_savedCursor; +} + +const wxCursor wxBusyCursor::GetBusyCursor() +{ + return wxCursor(wxCURSOR_WATCH); +} void wxEndBusyCursor() { - g_isBusy = FALSE; + if (--gs_busyCount > 0) + return; + + wxSetCursor( gs_savedCursor ); + gs_savedCursor = wxNullCursor; + + if (wxTheApp) + wxTheApp->SendIdleEvents(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) { - g_isBusy = TRUE; + if (gs_busyCount++ > 0) + return; + + wxASSERT_MSG( !gs_savedCursor.Ok(), + wxT("forgot to call wxEndBusyCursor, will leak memory") ); + + gs_savedCursor = g_globalCursor; + + wxSetCursor( wxCursor(wxCURSOR_WATCH) ); + + if (wxTheApp) + wxTheApp->SendIdleEvents(); + + gdk_flush(); } bool wxIsBusy() { - return g_isBusy; + return gs_busyCount > 0; } void wxSetCursor( const wxCursor& cursor ) { - extern wxCursor *g_globalCursor; - if (g_globalCursor) (*g_globalCursor) = cursor; + if (g_isIdle) + wxapp_install_idle_handler(); - if (cursor.Ok()) {} + g_globalCursor = cursor; } - -