X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7eff657c071f9df1938edb2d1b530492ccfc9489..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index ab0d7294a2..63a0340630 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,35 +7,32 @@ // 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" + #include "wx/bitmap.h" +#endif // WX_PRECOMP -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include //----------------------------------------------------------------------------- // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData: public wxGDIRefData { - public: - +public: wxCursorRefData(); - ~wxCursorRefData(); + virtual ~wxCursorRefData(); + + virtual bool IsOk() const { return m_cursor != NULL; } GdkCursor *m_cursor; }; @@ -47,18 +44,17 @@ wxCursorRefData::wxCursorRefData() wxCursorRefData::~wxCursorRefData() { - if (m_cursor) gdk_cursor_destroy( m_cursor ); + if (m_cursor) gdk_cursor_unref( m_cursor ); } //----------------------------------------------------------------------------- -#define M_CURSORDATA ((wxCursorRefData *)m_refData) +#define M_CURSORDATA wx_static_cast(wxCursorRefData*, m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject) wxCursor::wxCursor() { - } wxCursor::wxCursor( int cursorId ) @@ -68,8 +64,25 @@ wxCursor::wxCursor( int cursorId ) GdkCursorType gdk_cur = GDK_LEFT_PTR; switch (cursorId) { + case wxCURSOR_BLANK: + { + const char bits[] = { 0 }; + const 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); + g_object_unref(pixmap); + } + return; + + case wxCURSOR_ARROW: // fall through to default case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break; - case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break; + case wxCURSOR_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break; + case wxCURSOR_HAND: gdk_cur = GDK_HAND2; 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; @@ -100,11 +113,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; } @@ -115,7 +127,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,191 +148,189 @@ 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 ) +static void GetHotSpot(const wxImage& image, int& x, int& y) { - Ref( cursor ); + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) + x = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); + else + x = 0; + + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) + y = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); + else + y = 0; + + if (x < 0 || x >= image.GetWidth()) + x = 0; + if (y < 0 || y >= image.GetHeight()) + y = 0; } -#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; iwindow); + if (gdk_display_supports_cursor_color(display)) + { + if (!image.HasAlpha()) { - bits[i] = 0; - i8 = i * 8; - - cMask = 1; - for (j=0; j<8; j++) - { - // possible overflow if we do the summation first ? - c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3 ; - //if average value is > mid grey - if (c>127) - bits[i] = bits[i] | cMask ; - cMask = cMask * 2 ; - } + // add alpha, so wxBitmap will convert to pixbuf format + image_copy.InitAlpha(); } + wxBitmap bitmap(image_copy); + wxASSERT(bitmap.HasPixbuf()); + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf + ( + display, + bitmap.GetPixbuf(), + hotSpotX, hotSpotY + ); + return; + } + + unsigned long keyMaskColor = 0; + GdkPixmap* mask; if (bHasMask) - { - r = image.GetMaskRed() ; - g = image.GetMaskGreen() ; - b = image.GetMaskBlue() ; + { + keyMaskColor = wxImageHistogram::MakeKey( + image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); + // get mask before image is modified + wxBitmap bitmap(image, 1); + mask = bitmap.GetMask()->GetBitmap(); + g_object_ref(mask); + } + else + { + const int size = ((w + 7) / 8) * h; + char* bits = new char[size]; + memset(bits, 0xff, size); + mask = gdk_bitmap_create_from_data( + wxGetRootWindow()->window, bits, w, h); + delete[] bits; + } - for (i=0; i mid grey + if (int(data[0]) + data[1] + data[2] >= 3 * 128) + { + // wxBitmap only converts (255,255,255) to white + data[0] = 255; + data[1] = 255; + data[2] = 255; + } } - //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(); - wxHashTable hTable; - - //colors as rrggbb - unsigned long key; - unsigned long keyMaskColor = 0; - if (bHasMask) keyMaskColor = (r << 16) | (g << 8) | b; - - tmpImage.ComputeHistogram( hTable ); - - long MostFreqCol = 0 ; long nMost = 0; - long NextFreqCol = 0 ; long nNext = 0; - long value ; - hTable.BeginFind(); - wxNode *node = NULL; - while ((node = hTable.Next()) != NULL) + } + wxBitmap bitmap(image_copy, 1); + + // find the most frequent color(s) + wxImageHistogram histogram; + image.ComputeHistogram(histogram); + + long colMostFreq = 0; + unsigned long nMost = 0; + long colNextMostFreq = 0; + unsigned long nNext = 0; + for ( wxImageHistogram::iterator entry = histogram.begin(); + entry != histogram.end(); + ++entry ) { - wxHNode *hnode = (wxHNode*) node->GetData(); - value = hnode->value; - key = node->GetKeyInteger() ; - if (!bHasMask || (key != keyMaskColor) ) + unsigned long key = entry->first; + if ( !bHasMask || (key != keyMaskColor) ) { - if (value > nMost) + unsigned long value = entry->second.value; + if (value > nMost) { - nMost = value; - MostFreqCol = key; + nNext = nMost; + colNextMostFreq = colMostFreq; + nMost = value; + colMostFreq = key; } - else - if (value > nNext) + else if (value > nNext) { - nNext = value ; - NextFreqCol = key; + nNext = value; + colNextMostFreq = key; } } } + wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16), + (unsigned char)(colMostFreq >> 8), + (unsigned char)(colMostFreq) ); - 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) ) ; + 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=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 + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap + ( + bitmap.GetPixmap(), + mask, + fg.GetColor(), bg.GetColor(), + hotSpotX, hotSpotY + ); -wxCursor::~wxCursor() -{ + g_object_unref (mask); } -wxCursor& wxCursor::operator = ( const wxCursor& cursor ) -{ - if (*this == cursor) - return (*this); - - Ref( cursor ); - - return *this; -} +#endif // wxUSE_IMAGE -bool wxCursor::operator == ( const wxCursor& cursor ) const +wxCursor::~wxCursor() { - return m_refData == cursor.m_refData; } -bool wxCursor::operator != ( const wxCursor& cursor ) const +GdkCursor *wxCursor::GetCursor() const { - return m_refData != cursor.m_refData; + return M_CURSORDATA->m_cursor; } -bool wxCursor::Ok() const +wxGDIRefData *wxCursor::CreateGDIRefData() const { - return (m_refData != NULL); + return new wxCursorRefData; } -GdkCursor *wxCursor::GetCursor() const +wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const { - return M_CURSORDATA->m_cursor; + return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data)); } //----------------------------------------------------------------------------- // busy cursor routines //----------------------------------------------------------------------------- -extern wxCursor g_globalCursor; +/* Current cursor, in order to hang on to + * cursor handle when setting the cursor globally */ +wxCursor g_globalCursor; static wxCursor gs_savedCursor; static int gs_busyCount = 0; @@ -344,10 +354,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; @@ -360,8 +370,8 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) wxSetCursor( wxCursor(wxCURSOR_WATCH) ); if (wxTheApp) - wxTheApp->SendIdleEvents(); - + wxTheApp->ProcessIdle(); + gdk_flush(); } @@ -372,8 +382,6 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { - if (g_isIdle) - wxapp_install_idle_handler(); - g_globalCursor = cursor; + wxTheApp->WakeUpIdle(); }