X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1db952fde952abc8b241c1e1fac0f952f8b4dd5..cb78397f149e1e94c624b450db62bc540203081f:/src/gtk1/cursor.cpp diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp index 61a8c8f0b6..adf882b133 100644 --- a/src/gtk1/cursor.cpp +++ b/src/gtk1/cursor.cpp @@ -14,6 +14,7 @@ #include "wx/cursor.h" #include "wx/utils.h" +#include "wx/app.h" #include <gdk/gdk.h> #include <gtk/gtk.h> @@ -57,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject) wxCursor::wxCursor() { + } wxCursor::wxCursor( int cursorId ) @@ -71,6 +73,7 @@ wxCursor::wxCursor( int cursorId ) 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_SIZING; break; @@ -108,7 +111,7 @@ wxCursor::wxCursor( int cursorId ) M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur ); } -extern GtkWidget *wxRootWindow; +extern GtkWidget *wxGetRootWindow(); wxCursor::wxCursor(const char bits[], int width, int height, int hotSpotX, int hotSpotY, @@ -125,8 +128,8 @@ wxCursor::wxCursor(const char bits[], int width, int height, if (hotSpotY < 0 || hotSpotY >= height) hotSpotY = 0; - GdkBitmap *data = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) bits, width, height ); - GdkBitmap *mask = gdk_bitmap_create_from_data( wxRootWindow->window, (gchar *) maskBits, width, height); + 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); m_refData = new wxCursorRefData; M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap( @@ -143,6 +146,139 @@ wxCursor::wxCursor( const wxCursor &cursor ) Ref( cursor ); } +#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; i<imagebitcount; i++) + { + 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 ; + } + } + if (bHasMask) + { + r = image.GetMaskRed() ; + g = image.GetMaskGreen() ; + b = image.GetMaskBlue() ; + + for (i=0; i<imagebitcount; i++) + { + maskBits[i] = 0x0; + i8 = i * 8; + + cMask = 1; + for (j=0; j<8; j++) + { + 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 ; + } + } + } + else + { + for (i=0; i<imagebitcount; i++) + maskBits[i]= 0xFF ; + } + //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(); + wxImageHistogram histogram; + + //colors as rrggbb + unsigned long key; + unsigned long value; + unsigned long keyMaskColor = 0; + if (bHasMask) + keyMaskColor = (r << 16) | (g << 8) | b; + + tmpImage.ComputeHistogram(histogram); + + long MostFreqCol = 0; + unsigned long nMost = 0; + long NextFreqCol = 0; + unsigned long nNext = 0; + wxImageHistogram::iterator entry = histogram.begin(); + + while ( entry != histogram.end() ) + { + value = entry->second.value; + key = entry->first; + if ( !bHasMask || (key != keyMaskColor) ) + { + if (value > nMost) + { + nMost = value; + MostFreqCol = key; + } + else if (value > nNext) + { + nNext = value; + NextFreqCol = key; + } + } + } + + 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) ) ; + + 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 + wxCursor::~wxCursor() { } @@ -204,7 +340,8 @@ void wxEndBusyCursor() wxSetCursor( gs_savedCursor ); gs_savedCursor = wxNullCursor; - wxYield(); + if (wxTheApp) + wxTheApp->SendIdleEvents(); } void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) @@ -219,7 +356,10 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) ) wxSetCursor( wxCursor(wxCURSOR_WATCH) ); - wxYield(); + if (wxTheApp) + wxTheApp->SendIdleEvents(); + + gdk_flush(); } bool wxIsBusy()