X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13971833d8ef565afc5c3b48442ed5dc1384d4dd..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 17646128c6..adf882b133 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -14,8 +14,10 @@ #include "wx/cursor.h" #include "wx/utils.h" +#include "wx/app.h" -#include "gdk/gdk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -56,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor() { + } wxCursor::wxCursor( int cursorId ) @@ -70,6 +73,7 @@ wxCursor::wxCursor( int cursorId ) 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_ARROWWAIT: case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; @@ -88,6 +92,8 @@ wxCursor::wxCursor( int cursorId ) 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; @@ -95,7 +101,7 @@ wxCursor::wxCursor( int cursorId ) case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break; */ default: - wxFAIL_MSG(T("unsupported cursor type")); + wxFAIL_MSG(wxT("unsupported cursor type")); // will use the standard one case wxCURSOR_ARROW: @@ -105,11 +111,174 @@ wxCursor::wxCursor( int cursorId ) 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 ) { 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 r, g, b ; + 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 ; + } + } + if (bHasMask) + { + 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; + MostFreqCol = key; + } + else if (value > nNext) + { + nNext = value; + NextFreqCol = key; + } + } + } + + wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), + (unsigned char)(MostFreqCol >> 8), + (unsigned char)(MostFreqCol) ) ; + + wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), + (unsigned char)(NextFreqCol >> 8), + (unsigned char)(NextFreqCol) ) ; + + int hotSpotX=0; + int hotSpotY=0; + + if (image.HasOption(wxCUR_HOTSPOT_X)) + hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X); + if (image.HasOption(wxCUR_HOTSPOT_Y)) + hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y); + + 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 + wxCursor::~wxCursor() { } @@ -153,6 +322,16 @@ 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() { if (--gs_busyCount > 0) @@ -161,7 +340,8 @@ void wxEndBusyCursor() wxSetCursor( gs_savedCursor ); gs_savedCursor = wxNullCursor; - wxYield(); + if (wxTheApp) + wxTheApp->SendIdleEvents(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) @@ -170,13 +350,16 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) return; wxASSERT_MSG( !gs_savedCursor.Ok(), - T("forgot to call wxEndBusyCursor, will leak memory") ); + wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; wxSetCursor( wxCursor(wxCURSOR_WATCH) ); - wxYield(); + if (wxTheApp) + wxTheApp->SendIdleEvents(); + + gdk_flush(); } bool wxIsBusy()