X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff654490b7cb185631a1dc4621094d88643ccf41..e3041f4af06d127021c568c39783279b8d0bea75:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index b8d86c2037..63a0340630 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -17,6 +17,7 @@ #include "wx/utils.h" #include "wx/image.h" #include "wx/colour.h" + #include "wx/bitmap.h" #endif // WX_PRECOMP #include @@ -25,13 +26,14 @@ // wxCursor //----------------------------------------------------------------------------- -class wxCursorRefData: public wxObjectRefData +class wxCursorRefData: public wxGDIRefData { - public: - +public: wxCursorRefData(); virtual ~wxCursorRefData(); + virtual bool IsOk() const { return m_cursor != NULL; } + GdkCursor *m_cursor; }; @@ -47,13 +49,12 @@ wxCursorRefData::~wxCursorRefData() //----------------------------------------------------------------------------- -#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 ) @@ -65,8 +66,8 @@ wxCursor::wxCursor( int cursorId ) { case wxCURSOR_BLANK: { - static const gchar bits[] = { 0 }; - static /* const -- not in GTK1 */ GdkColor color = { 0, 0, 0, 0 }; + 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, @@ -74,20 +75,21 @@ wxCursor::wxCursor( int cursorId ) &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_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break; - case wxCURSOR_HAND: gdk_cur = GDK_HAND1; 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; case wxCURSOR_ARROWWAIT: case wxCURSOR_WAIT: case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break; - case wxCURSOR_SIZING: gdk_cur = GDK_FLEUR; break; + case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; 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; @@ -172,121 +174,78 @@ static void GetHotSpot(const wxImage& image, int& x, int& y) 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; + int hotSpotX, hotSpotY; + GetHotSpot(image, hotSpotX, hotSpotY); + m_refData = new wxCursorRefData; + wxImage image_copy(image); - if ( gdk_display_supports_cursor_color(gdk_display_get_default()) ) + GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window); + if (gdk_display_supports_cursor_color(display)) { - unsigned char rMask = 0, - gMask = 0, - bMask = 0; - if (bHasMask) + if (!image.HasAlpha()) { - rMask = image.GetMaskRed(); - gMask = image.GetMaskGreen(); - bMask = image.GetMaskBlue(); - } - - GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h); - unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() : NULL; - unsigned char *out = gdk_pixbuf_get_pixels(pixbuf); - int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w; - for ( int y = 0; y < h; y++, out += rowpad ) - { - for ( int x = 0; x < w; x++, out += 4, rgbBits += 3 ) - { - out[0] = rgbBits[0]; - out[1] = rgbBits[1]; - out[2] = rgbBits[2]; - if (bHasMask && - out[0] == rMask && out[1] == gMask && out[2] == bMask) - out[3] = 0; - else - out[3] = alpha ? *alpha : 255; - if ( alpha ) - ++alpha; - } + // add alpha, so wxBitmap will convert to pixbuf format + image_copy.InitAlpha(); } - - int hotSpotX, hotSpotY; - GetHotSpot(image, hotSpotX, hotSpotY); - - m_refData = new wxCursorRefData; + wxBitmap bitmap(image_copy); + wxASSERT(bitmap.HasPixbuf()); M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf ( - gdk_display_get_default(), - pixbuf, + display, + bitmap.GetPixbuf(), hotSpotX, hotSpotY ); - g_object_unref (pixbuf); return; } - 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; - } + 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); } - - unsigned long keyMaskColor; - if (bHasMask) + else { - unsigned char - r = image.GetMaskRed(), - g = image.GetMaskGreen(), - b = image.GetMaskBlue(); + 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) { - if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b) - maskBits[i] = maskBits[i] | cMask; - cMask = cMask * 2; + // wxBitmap only converts (255,255,255) to white + data[0] = 255; + data[1] = 255; + data[2] = 255; } } - - keyMaskColor = (r << 16) | (g << 8) | b; - } - else // no mask - { - for (i=0; isecond.value; - key = entry->first; + unsigned long key = entry->first; if ( !bHasMask || (key != keyMaskColor) ) { + unsigned long value = entry->second.value; if (value > nMost) { + nNext = nMost; + colNextMostFreq = colMostFreq; nMost = value; colMostFreq = key; } @@ -331,27 +292,15 @@ wxCursor::wxCursor( const wxImage & image ) bg = tmp; } - int hotSpotX, hotSpotY; - GetHotSpot(image, hotSpotX, hotSpotY); - - 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, + bitmap.GetPixmap(), mask, fg.GetColor(), bg.GetColor(), hotSpotX, hotSpotY ); - g_object_unref (data); g_object_unref (mask); - delete [] bits; - delete [] maskBits; } #endif // wxUSE_IMAGE @@ -360,14 +309,19 @@ wxCursor::~wxCursor() { } -bool wxCursor::IsOk() const +GdkCursor *wxCursor::GetCursor() const { - return (m_refData != NULL); + return M_CURSORDATA->m_cursor; } -GdkCursor *wxCursor::GetCursor() const +wxGDIRefData *wxCursor::CreateGDIRefData() const { - return M_CURSORDATA->m_cursor; + return new wxCursorRefData; +} + +wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const +{ + return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data)); } //-----------------------------------------------------------------------------