X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2fa61e833ffe9789ef3d3327157e17101a4a2ce..249803fbcd1f73040e4b5457e341d8db2e5cb66e:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index c419a36837..a175daaa6e 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cursor.cpp +// Name: src/gtk/cursor.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,24 +7,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#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 -#include -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/image.h" + #include "wx/colour.h" +#endif // WX_PRECOMP -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" //for idle stuff //----------------------------------------------------------------------------- // wxCursor @@ -35,7 +30,7 @@ class wxCursorRefData: public wxObjectRefData public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); GdkCursor *m_cursor; }; @@ -47,7 +42,7 @@ wxCursorRefData::wxCursorRefData() wxCursorRefData::~wxCursorRefData() { - if (m_cursor) gdk_cursor_destroy( m_cursor ); + if (m_cursor) gdk_cursor_unref( m_cursor ); } //----------------------------------------------------------------------------- @@ -58,6 +53,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor() { + } wxCursor::wxCursor( int cursorId ) @@ -67,7 +63,23 @@ wxCursor::wxCursor( int cursorId ) GdkCursorType gdk_cur = GDK_LEFT_PTR; switch (cursorId) { + case wxCURSOR_BLANK: + { + static const gchar bits[] = { 0 }; + static /* const -- not in GTK1 */ GdkColor color = { 0, 0, 0, 0 }; + + GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1); + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap, + pixmap, + &color, + &color, + 0, 0); + } + return; + + 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; @@ -75,7 +87,7 @@ wxCursor::wxCursor( int cursorId ) case wxCURSOR_ARROWWAIT: case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; - case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break; + case wxCURSOR_SIZING: gdk_cur = GDK_FLEUR; 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; @@ -99,11 +111,10 @@ wxCursor::wxCursor( int cursorId ) 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 - - case wxCURSOR_ARROW: break; } @@ -114,7 +125,7 @@ extern GtkWidget *wxGetRootWindow(); wxCursor::wxCursor(const char bits[], int width, int height, int hotSpotX, int hotSpotY, - const char maskBits[], wxColour *fg, wxColour *bg) + const char maskBits[], const wxColour *fg, const wxColour *bg) { if (!maskBits) maskBits = bits; @@ -135,28 +146,168 @@ wxCursor::wxCursor(const char bits[], int width, int height, data, mask, fg->GetColor(), bg->GetColor(), hotSpotX, hotSpotY ); - gdk_bitmap_unref( data ); - gdk_bitmap_unref( mask ); + g_object_unref (data); + g_object_unref (mask); } +#if wxUSE_IMAGE -wxCursor::wxCursor( const wxCursor &cursor ) +wxCursor::wxCursor( const wxImage & image ) { - Ref( cursor ); -} + unsigned char * rgbBits = image.GetData(); + int w = image.GetWidth() ; + int h = image.GetHeight(); + bool bHasMask = image.HasMask(); + int imagebitcount = (w*h)/8; -wxCursor::~wxCursor() -{ -} + unsigned char * bits = new unsigned char [imagebitcount]; + unsigned char * maskBits = new unsigned char [imagebitcount]; -wxCursor& wxCursor::operator = ( const wxCursor& cursor ) -{ - if (*this == cursor) - return (*this); + 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; - Ref( cursor ); + 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); - return *this; + m_refData = new wxCursorRefData; + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap + ( + data, + mask, + fg.GetColor(), bg.GetColor(), + hotSpotX, hotSpotY + ); + + g_object_unref (data); + g_object_unref (mask); + delete [] bits; + delete [] maskBits; +} + +#endif // wxUSE_IMAGE + +wxCursor::~wxCursor() +{ } bool wxCursor::operator == ( const wxCursor& cursor ) const @@ -207,10 +358,10 @@ void wxEndBusyCursor() gs_savedCursor = wxNullCursor; if (wxTheApp) - wxTheApp->SendIdleEvents(); + wxTheApp->ProcessIdle(); } -void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) +void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) { if (gs_busyCount++ > 0) return; @@ -223,7 +374,9 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) wxSetCursor( wxCursor(wxCURSOR_WATCH) ); if (wxTheApp) - wxTheApp->SendIdleEvents(); + wxTheApp->ProcessIdle(); + + gdk_flush(); } bool wxIsBusy()