Correctly align background brush when erasing owner drawn bitmaps in wxMSW.

[wxWidgets.git] / src / gtk / cursor.cpp

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 3e2a20c6320ecd7962dbb6003a6dc98d5bdc4c9d..3ebc5e1a4fce39cc0f9bbf1ccf06d24501d0b611 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/cursor.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/gtk/cursor.cpp

-// Purpose:
+// Purpose:     wxCursor implementation

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling


@@ -21,9 +21,10 @@
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>
 #endif // WX_PRECOMP
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/object.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxCursor
+// wxCursorRefData

 //-----------------------------------------------------------------------------
 
 class wxCursorRefData: public wxGDIRefData
 //-----------------------------------------------------------------------------
 
 class wxCursorRefData: public wxGDIRefData


@@ -35,11 +36,16 @@ public:
     virtual bool IsOk() const { return m_cursor != NULL; }
 
     GdkCursor *m_cursor;
     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()
 {
 };
 
 wxCursorRefData::wxCursorRefData()
 {

-    m_cursor = (GdkCursor *) NULL;
+    m_cursor = NULL;

 }
 
 wxCursorRefData::~wxCursorRefData()
 }
 
 wxCursorRefData::~wxCursorRefData()


@@ -47,16 +53,78 @@ wxCursorRefData::~wxCursorRefData()
     if (m_cursor) gdk_cursor_unref( m_cursor );
 }
 
     if (m_cursor) gdk_cursor_unref( m_cursor );
 }
 

+
+//-----------------------------------------------------------------------------
+// wxCursor

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define M_CURSORDATA wx_static_cast(wxCursorRefData*, m_refData)
+#define M_CURSORDATA static_cast<wxCursorRefData*>(m_refData)

 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
 

+// used in the following two ctors
+extern GtkWidget *wxGetRootWindow();
+
+

 wxCursor::wxCursor()
 {
 }
 
 wxCursor::wxCursor()
 {
 }
 

+#if wxUSE_IMAGE
+wxCursor::wxCursor(const wxString& cursor_file,
+                   wxBitmapType type,
+                   int hotSpotX, int hotSpotY)
+{
+    wxImage img;
+    if (!img.LoadFile(cursor_file, type))
+        return;
+
+    // eventually set the hotspot:
+    if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+        img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
+    if (!img.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+        img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);
+
+    InitFromImage(img);
+}
+
+wxCursor::wxCursor(const wxImage& img)
+{
+    InitFromImage(img);
+}
+#endif
+
+wxCursor::wxCursor(const char bits[], int width, int height,
+                   int hotSpotX, int hotSpotY,
+                   const char maskBits[], const wxColour *fg, const wxColour *bg)
+{
+    if (!maskBits)
+        maskBits = bits;
+    if (!fg)
+        fg = wxBLACK;
+    if (!bg)
+        bg = wxWHITE;
+    if (hotSpotX < 0 || hotSpotX >= width)
+        hotSpotX = 0;
+    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);
+
+    m_refData = new wxCursorRefData;
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
+                 data, mask, fg->GetColor(), bg->GetColor(),
+                 hotSpotX, hotSpotY );
+
+    g_object_unref (data);
+    g_object_unref (mask);
+}
+
+wxCursor::~wxCursor()
+{
+}
+

 void wxCursor::InitFromStock( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();
 void wxCursor::InitFromStock( wxStockCursor cursorId )
 {
     m_refData = new wxCursorRefData();


@@ -123,75 +191,6 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 

-
-// used in the following two ctors
-extern GtkWidget *wxGetRootWindow();
-
-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)
-{
-    if (!maskBits)
-        maskBits = bits;
-    if (!fg)
-        fg = wxBLACK;
-    if (!bg)
-        bg = wxWHITE;
-    if (hotSpotX < 0 || hotSpotX >= width)
-        hotSpotX = 0;
-    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);
-
-    m_refData = new wxCursorRefData;
-    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(
-                 data, mask, fg->GetColor(), bg->GetColor(),
-                 hotSpotX, hotSpotY );
-
-    g_object_unref (data);
-    g_object_unref (mask);
-}
-

 #if wxUSE_IMAGE
 
 static void GetHotSpot(const wxImage& image, int& x, int& y)
 #if wxUSE_IMAGE
 
 static void GetHotSpot(const wxImage& image, int& x, int& y)


@@ -212,7 +211,7 @@ static void GetHotSpot(const wxImage& image, int& x, int& y)
         y = 0;
 }
 
         y = 0;
 }
 

-wxCursor::wxCursor( const wxImage & image )
+void wxCursor::InitFromImage( const wxImage & image )

 {
     int w = image.GetWidth() ;
     int h = image.GetHeight();
 {
     int w = image.GetWidth() ;
     int h = image.GetHeight();


@@ -238,117 +237,112 @@ wxCursor::wxCursor( const wxImage & image )
                               bitmap.GetPixbuf(),
                               hotSpotX, hotSpotY
                              );
                               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(
+                wxGetRootWindow()->window, 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<GdkPixmap> 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)
-            {
-                nNext = nMost;
-                colNextMostFreq = colMostFreq;
-                nMost = value;
-                colMostFreq = key;
-            }
-            else if (value > nNext)
+            unsigned long key = entry->first;
+            if ( !bHasMask || (key != keyMaskColor) )

             {
             {

-                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
 
 }
 
 #endif // wxUSE_IMAGE
 

-wxCursor::~wxCursor()
-{
-}
-

 GdkCursor *wxCursor::GetCursor() const
 {
     return M_CURSORDATA->m_cursor;
 GdkCursor *wxCursor::GetCursor() const
 {
     return M_CURSORDATA->m_cursor;


@@ -359,9 +353,17 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
     return new wxCursorRefData;
 }
 
     return new wxCursorRefData;
 }
 

-wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, 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;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -385,7 +387,7 @@ const wxCursor wxBusyCursor::GetBusyCursor()
     return wxCursor(wxCURSOR_WATCH);
 }
 
     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)
 {
     wxWindowList::const_iterator i = list.begin();
     for (size_t n = list.size(); n--; ++i)


@@ -393,8 +395,8 @@ static void InternalIdle(const wxWindowList& list, GdkDisplay*& display)
         wxWindow* win = *i;
         if (display == NULL && win->m_widget && win->m_widget->window)
             display = gdk_drawable_get_display(win->m_widget->window);
         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);
+        win->GTKUpdateCursor(true, false);
+        UpdateCursors(win->GetChildren(), display);

     }
 }
 
     }
 }
 


@@ -406,7 +408,7 @@ void wxEndBusyCursor()
     g_globalCursor = gs_savedCursor;
     gs_savedCursor = wxNullCursor;
     GdkDisplay* unused = NULL;
     g_globalCursor = gs_savedCursor;
     gs_savedCursor = wxNullCursor;
     GdkDisplay* unused = NULL;

-    InternalIdle(wxTopLevelWindows, unused);
+    UpdateCursors(wxTopLevelWindows, unused);

 }
 
 void wxBeginBusyCursor(const wxCursor* cursor)
 }
 
 void wxBeginBusyCursor(const wxCursor* cursor)


@@ -420,7 +422,7 @@ void wxBeginBusyCursor(const wxCursor* cursor)
     gs_savedCursor = g_globalCursor;
     g_globalCursor = *cursor;
     GdkDisplay* display = NULL;
     gs_savedCursor = g_globalCursor;
     g_globalCursor = *cursor;
     GdkDisplay* display = NULL;

-    InternalIdle(wxTopLevelWindows, display);
+    UpdateCursors(wxTopLevelWindows, display);

     if (display)
         gdk_display_flush(display);
 }
     if (display)
         gdk_display_flush(display);
 }


@@ -433,5 +435,6 @@ bool wxIsBusy()
 void wxSetCursor( const wxCursor& cursor )
 {
     g_globalCursor = cursor;
 void wxSetCursor( const wxCursor& cursor )
 {
     g_globalCursor = cursor;

-    wxTheApp->WakeUpIdle();
+    GdkDisplay* unused = NULL;
+    UpdateCursors(wxTopLevelWindows, unused);

 }
 }