X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..ac22204b1b6013f7e53951835d2dc9168eaa004c:/src/gtk/cursor.cpp?ds=inline diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index 159bb4bffa..aa71d2490f 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 +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/image.h" + #include "wx/colour.h" +#endif // WX_PRECOMP -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -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 ); } //----------------------------------------------------------------------------- @@ -68,6 +63,20 @@ 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; @@ -78,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; @@ -102,6 +111,7 @@ 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 @@ -115,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; @@ -136,15 +146,8 @@ 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 ); -} - - -wxCursor::wxCursor( const wxCursor &cursor ) - : wxObject() -{ - Ref( cursor ); + g_object_unref (data); + g_object_unref (mask); } #if wxUSE_IMAGE @@ -211,24 +214,21 @@ wxCursor::wxCursor( const wxImage & image ) keyMaskColor = 0; } - // find the most frequent color(s) it seems a waste of effort to copy the - // image but otherwise we need to remove the const modifier ?? - wxImage tmpImage = image.Copy(); + // find the most frequent color(s) wxImageHistogram histogram; + image.ComputeHistogram(histogram); // colors as rrggbb unsigned long key; unsigned long value; - tmpImage.ComputeHistogram(histogram); - - long MostFreqCol = 0; + long colMostFreq = 0; unsigned long nMost = 0; - long NextFreqCol = 0; + long colNextMostFreq = 0; unsigned long nNext = 0; - wxImageHistogram::iterator entry = histogram.begin(); - - while ( entry != histogram.end() ) + for ( wxImageHistogram::iterator entry = histogram.begin(); + entry != histogram.end(); + ++entry ) { value = entry->second.value; key = entry->first; @@ -237,49 +237,69 @@ wxCursor::wxCursor( const wxImage & image ) if (value > nMost) { nMost = value; - MostFreqCol = key; + colMostFreq = key; } else if (value > nNext) { nNext = value; - NextFreqCol = key; + colNextMostFreq = key; } } } - wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16), - (unsigned char)(MostFreqCol >> 8), - (unsigned char)(MostFreqCol) ); + 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; + } - wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16), - (unsigned char)(NextFreqCol >> 8), - (unsigned char)(NextFreqCol) ); + int hotSpotX; + int hotSpotY; - int hotSpotX=0; - int hotSpotY=0; + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) + hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); + else + hotSpotX = 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 (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 ); + 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 ); + 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; } @@ -290,27 +310,7 @@ wxCursor::~wxCursor() { } -wxCursor& wxCursor::operator = ( const wxCursor& cursor ) -{ - if (*this == cursor) - return (*this); - - Ref( cursor ); - - return *this; -} - -bool wxCursor::operator == ( const wxCursor& cursor ) const -{ - return m_refData == cursor.m_refData; -} - -bool wxCursor::operator != ( const wxCursor& cursor ) const -{ - return m_refData != cursor.m_refData; -} - -bool wxCursor::Ok() const +bool wxCursor::IsOk() const { return (m_refData != NULL); } @@ -348,10 +348,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; @@ -364,7 +364,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) wxSetCursor( wxCursor(wxCURSOR_WATCH) ); if (wxTheApp) - wxTheApp->SendIdleEvents(); + wxTheApp->ProcessIdle(); gdk_flush(); }