X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6764050d805a7e7575ba7126e2f78bd64db8117..42604e44bec70f5a26cabb26653f7ca1490fb04e:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index a939e16fe4..73983f1351 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -21,6 +21,8 @@ #endif // WX_PRECOMP #include +#include "wx/gtk/private/object.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // wxCursorRefData @@ -35,6 +37,11 @@ public: virtual bool IsOk() const { return m_cursor != NULL; } GdkCursor *m_cursor; + +private: + // There is no way to copy m_cursor so we can't implement a copy ctor + // properly. + wxDECLARE_NO_COPY_CLASS(wxCursorRefData); }; wxCursorRefData::wxCursorRefData() @@ -72,13 +79,13 @@ wxCursor::wxCursor(const wxString& cursor_file, wxImage img; if (!img.LoadFile(cursor_file, type)) return; - + // eventually set the hotspot: - if (!image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) + if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX); - if (!image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) + if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY); - + InitFromImage(img); } @@ -103,8 +110,10 @@ wxCursor::wxCursor(const char bits[], int width, int height, 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); + GdkBitmap* data = gdk_bitmap_create_from_data( + gtk_widget_get_window(wxGetRootWindow()), const_cast(bits), width, height); + GdkBitmap* mask = gdk_bitmap_create_from_data( + gtk_widget_get_window(wxGetRootWindow()), const_cast(maskBits), width, height); m_refData = new wxCursorRefData; M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( @@ -215,7 +224,7 @@ void wxCursor::InitFromImage( const wxImage & image ) m_refData = new wxCursorRefData; wxImage image_copy(image); - GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window); + GdkDisplay* display = gdk_drawable_get_display(gtk_widget_get_window(wxGetRootWindow())); if (gdk_display_supports_cursor_color(display)) { if (!image.HasAlpha()) @@ -231,109 +240,108 @@ void wxCursor::InitFromImage( const wxImage & image ) bitmap.GetPixbuf(), hotSpotX, hotSpotY ); - return; } - - unsigned long keyMaskColor = 0; - GdkPixmap* mask; - if (bHasMask) + else // no colour cursor support { - 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; - } + unsigned long keyMaskColor = 0; + GdkPixmap *maskRaw; + if (bHasMask) + { + keyMaskColor = wxImageHistogram::MakeKey( + image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); + // get mask before image is modified + wxBitmap bitmap(image, 1); + maskRaw = bitmap.GetMask()->GetBitmap(); + g_object_ref(maskRaw); + } + else + { + const int size = ((w + 7) / 8) * h; + char* bits = new char[size]; + memset(bits, 0xff, size); + maskRaw = gdk_bitmap_create_from_data( + gtk_widget_get_window(wxGetRootWindow()), bits, w, h); + delete[] bits; + } - // modify image so wxBitmap can be used to convert to pixmap - image_copy.SetMask(false); - int i, j; - wxByte* data = image_copy.GetData(); - for (j = 0; j < h; j++) - { - for (i = 0; i < w; i++, data += 3) + // assign the raw pointer to wxGtkObject to ensure it is unref'd later + wxGtkObject mask(maskRaw); + + // modify image so wxBitmap can be used to convert to pixmap + image_copy.SetMask(false); + wxByte* data = image_copy.GetData(); + for (int j = 0; j < h; j++) { - //if average value is > mid grey - if (int(data[0]) + data[1] + data[2] >= 3 * 128) + for (int i = 0; i < w; i++, data += 3) { - // wxBitmap only converts (255,255,255) to white - data[0] = 255; - data[1] = 255; - data[2] = 255; + // if average value of the pixel is > mid grey, convert it to + // background (0), otherwise to foreground (255, using wxBitmap + // convention) + data[0] = + data[1] = + data[2] = int(data[0]) + data[1] + data[2] >= 3 * 128 ? 0 : 255; } } - } - 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 ) - { - unsigned long key = entry->first; - if ( !bHasMask || (key != keyMaskColor) ) + 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 ) { - unsigned long value = entry->second.value; - if (value > nMost) + unsigned long key = entry->first; + if ( !bHasMask || (key != keyMaskColor) ) { - nNext = nMost; - colNextMostFreq = colMostFreq; - nMost = value; - colMostFreq = key; - } - else if (value > nNext) - { - nNext = value; - colNextMostFreq = key; + unsigned long value = entry->second.value; + if (value > nMost) + { + nNext = nMost; + colNextMostFreq = colMostFreq; + 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 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) ); + 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(); + 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; - } - - M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap - ( - bitmap.GetPixmap(), - mask, - fg.GetColor(), bg.GetColor(), - hotSpotX, hotSpotY - ); + if (bg_intensity > fg_intensity) + { + //swap fg and bg + wxColour tmp = fg; + fg = bg; + bg = tmp; + } - g_object_unref (mask); + M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap + ( + bitmap.GetPixmap(), + mask, + fg.GetColor(), bg.GetColor(), + hotSpotX, hotSpotY + ); + } } #endif // wxUSE_IMAGE @@ -348,9 +356,17 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const return new wxCursorRefData; } -wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const +wxGDIRefData * +wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const { - return new wxCursorRefData(*static_cast(data)); + // TODO: We can't clone GDK cursors at the moment. To do this we'd need + // to remember the original data from which the cursor was created + // (i.e. standard cursor type or the bitmap) or use + // gdk_cursor_get_cursor_type() (which is in 2.22+ only) and + // gdk_cursor_get_image(). + wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxGTK.") ); + + return new wxCursorRefData; } //----------------------------------------------------------------------------- @@ -374,16 +390,20 @@ const wxCursor wxBusyCursor::GetBusyCursor() return wxCursor(wxCURSOR_WATCH); } -static void InternalIdle(const wxWindowList& list, GdkDisplay*& display) +static void UpdateCursors(const wxWindowList& list, GdkDisplay*& display) { wxWindowList::const_iterator i = list.begin(); for (size_t n = list.size(); n--; ++i) { wxWindow* win = *i; - if (display == NULL && win->m_widget && win->m_widget->window) - display = gdk_drawable_get_display(win->m_widget->window); - win->OnInternalIdle(); - InternalIdle(win->GetChildren(), display); + if (display == NULL && win->m_widget) + { + GdkWindow* w = gtk_widget_get_window(win->m_widget); + if (w) + display = gdk_drawable_get_display(w); + } + win->GTKUpdateCursor(true, false); + UpdateCursors(win->GetChildren(), display); } } @@ -395,7 +415,7 @@ void wxEndBusyCursor() g_globalCursor = gs_savedCursor; gs_savedCursor = wxNullCursor; GdkDisplay* unused = NULL; - InternalIdle(wxTopLevelWindows, unused); + UpdateCursors(wxTopLevelWindows, unused); } void wxBeginBusyCursor(const wxCursor* cursor) @@ -409,7 +429,7 @@ void wxBeginBusyCursor(const wxCursor* cursor) gs_savedCursor = g_globalCursor; g_globalCursor = *cursor; GdkDisplay* display = NULL; - InternalIdle(wxTopLevelWindows, display); + UpdateCursors(wxTopLevelWindows, display); if (display) gdk_display_flush(display); } @@ -422,5 +442,6 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { g_globalCursor = cursor; - wxTheApp->WakeUpIdle(); + GdkDisplay* unused = NULL; + UpdateCursors(wxTopLevelWindows, unused); }