X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..caa2490c0fb8053b1d416117a9619695d75af9e4:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 4876e3f8d3..4360b9748d 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -7,15 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "cursor.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/cursor.h" #include "wx/utils.h" +#include "wx/app.h" -#include "gdk/gdk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -56,6 +60,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor() { + } wxCursor::wxCursor( int cursorId ) @@ -65,11 +70,14 @@ 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_ARROWWAIT: case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; @@ -86,6 +94,10 @@ wxCursor::wxCursor( int cursorId ) 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; @@ -93,21 +105,206 @@ 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: 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 fg_intensity = fg.Red() + fg.Green() + fg.Blue(); + int bg_intensity = bg.Red() + bg.Green() + bg.Blue(); + + if (bg_intensity > fg_intensity) + { + //swap fg and bg + wxColour tmp = fg; + fg = bg; + bg = tmp; + } + + int hotSpotX; + int hotSpotY; + + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) + hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); + else + hotSpotX = 0; + + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) + hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_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() { } @@ -151,6 +348,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) @@ -158,6 +365,9 @@ void wxEndBusyCursor() wxSetCursor( gs_savedCursor ); gs_savedCursor = wxNullCursor; + + if (wxTheApp) + wxTheApp->ProcessIdle(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) @@ -166,13 +376,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->ProcessIdle(); + + gdk_flush(); } bool wxIsBusy() @@ -182,7 +395,7 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { - if (g_isIdle) + if (g_isIdle) wxapp_install_idle_handler(); g_globalCursor = cursor;