X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fe39b0ce3c0f47faea34ef99c3d0260957cc4e0..fc5d9e38ee002c024be3019e37b63f1a1d88e7c2:/src/gtk/cursor.cpp diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp index d02105ec8b..1400774059 100644 --- a/src/gtk/cursor.cpp +++ b/src/gtk/cursor.cpp @@ -13,25 +13,26 @@ #include "wx/cursor.h" #ifndef WX_PRECOMP + #include "wx/window.h" #include "wx/app.h" - #include "wx/utils.h" + #include "wx/image.h" + #include "wx/bitmap.h" + #include "wx/log.h" #endif // WX_PRECOMP -#include "wx/gtk/private.h" //for idle stuff - -#include #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; }; @@ -48,16 +49,15 @@ wxCursorRefData::~wxCursorRefData() //----------------------------------------------------------------------------- -#define M_CURSORDATA ((wxCursorRefData *)m_refData) +#define M_CURSORDATA static_cast(m_refData) -IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) +IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject) wxCursor::wxCursor() { - } -wxCursor::wxCursor( int cursorId ) +void wxCursor::InitFromStock( wxStockCursor cursorId ) { m_refData = new wxCursorRefData(); @@ -66,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, @@ -75,13 +75,14 @@ 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; @@ -122,9 +123,49 @@ wxCursor::wxCursor( int cursorId ) M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); } + +// used in the following two ctors extern GtkWidget *wxGetRootWindow(); -wxCursor::wxCursor(const char bits[], int width, int height, +wxCursor::wxCursor(const wxString& cursor_file, + wxBitmapType type, + int hotSpotX, int hotSpotY) +{ + /* TODO: test this code! */ + + // Must be an XBM file + if (type != wxBITMAP_TYPE_XPM) { + wxLogError("Invalid cursor bitmap type '%d'", type); + return; + } + + // load the XPM + GdkBitmap *mask = NULL; + GdkBitmap *data = gdk_pixmap_create_from_xpm( wxGetRootWindow()->window, + &mask, NULL, cursor_file.mb_str() ); + if (!data) + return; + + // check given hotspot + gint w, h; + gdk_drawable_get_size( data, &w, &h ); + if (hotSpotX < 0 || hotSpotX >= w) + hotSpotX = 0; + if (hotSpotY < 0 || hotSpotY >= h) + hotSpotY = 0; + + // create the real cursor + m_refData = new wxCursorRefData; + M_CURSORDATA->m_cursor = + gdk_cursor_new_from_pixmap( data, mask, + wxBLACK->GetColor(), wxWHITE->GetColor(), + hotSpotX, hotSpotY ); + + g_object_unref (data); + g_object_unref (mask); +} + +wxCursor::wxCursor(const char bits[], int width, int height, int hotSpotX, int hotSpotY, const char maskBits[], const wxColour *fg, const wxColour *bg) { @@ -153,76 +194,98 @@ wxCursor::wxCursor(const char bits[], int width, int height, #if wxUSE_IMAGE +static void GetHotSpot(const wxImage& image, int& x, int& y) +{ + 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; +} + 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 * bits = new unsigned char [imagebitcount]; - unsigned char * maskBits = new unsigned char [imagebitcount]; + int hotSpotX, hotSpotY; + GetHotSpot(image, hotSpotX, hotSpotY); + m_refData = new wxCursorRefData; + wxImage image_copy(image); - int i, j, i8; unsigned char c, cMask; - for (i=0; iwindow); + if (gdk_display_supports_cursor_color(display)) { - bits[i] = 0; - i8 = i * 8; - - cMask = 1; - for (j=0; j<8; j++) + if (!image.HasAlpha()) { - // 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; + unsigned long keyMaskColor = 0; + GdkPixmap* mask; if (bHasMask) { - unsigned char - 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) { - 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; } @@ -267,42 +332,15 @@ wxCursor::wxCursor( const wxImage & image ) 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; - - 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 @@ -311,31 +349,28 @@ wxCursor::~wxCursor() { } -bool wxCursor::operator == ( const wxCursor& cursor ) const -{ - 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(*static_cast(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; @@ -350,19 +385,31 @@ const wxCursor wxBusyCursor::GetBusyCursor() return wxCursor(wxCURSOR_WATCH); } +static void InternalIdle(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); + } +} + void wxEndBusyCursor() { if (--gs_busyCount > 0) return; - wxSetCursor( gs_savedCursor ); + g_globalCursor = gs_savedCursor; gs_savedCursor = wxNullCursor; - - if (wxTheApp) - wxTheApp->ProcessIdle(); + GdkDisplay* unused = NULL; + InternalIdle(wxTopLevelWindows, unused); } -void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) +void wxBeginBusyCursor(const wxCursor* cursor) { if (gs_busyCount++ > 0) return; @@ -371,13 +418,11 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) ) wxT("forgot to call wxEndBusyCursor, will leak memory") ); gs_savedCursor = g_globalCursor; - - wxSetCursor( wxCursor(wxCURSOR_WATCH) ); - - if (wxTheApp) - wxTheApp->ProcessIdle(); - - gdk_flush(); + g_globalCursor = *cursor; + GdkDisplay* display = NULL; + InternalIdle(wxTopLevelWindows, display); + if (display) + gdk_display_flush(display); } bool wxIsBusy() @@ -387,8 +432,6 @@ bool wxIsBusy() void wxSetCursor( const wxCursor& cursor ) { - if (g_isIdle) - wxapp_install_idle_handler(); - g_globalCursor = cursor; + wxTheApp->WakeUpIdle(); }