missing commit

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 9caf8523e14f75a2a6b0dba949bf43e4253a9a23..af25572696ca394ae61a3e32075a19ff1a627bac 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


@@ -13,59 +13,178 @@
 #include "wx/cursor.h"
 
 #ifndef WX_PRECOMP
 #include "wx/cursor.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
-    #include "wx/utils.h"
+    #include "wx/window.h"

     #include "wx/image.h"
     #include "wx/image.h"

+    #include "wx/bitmap.h"
+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/gtk/private.h" //for idle stuff
+#include <gtk/gtk.h>
+#include "wx/gtk/private/object.h"
+#include "wx/gtk/private/gtk2-compat.h"

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

-// wxCursor
+// wxCursorRefData

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

-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData: public wxGDIRefData

 {
 {

-  public:
-
+public:

     wxCursorRefData();
     wxCursorRefData();

-    ~wxCursorRefData();
+    virtual ~wxCursorRefData();
+
+    virtual bool IsOk() const { return m_cursor != NULL; }

 
     GdkCursor *m_cursor;
 
     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()
 {

-    if (m_cursor) gdk_cursor_unref( m_cursor );
+    if (m_cursor)
+    {
+#ifdef __WXGTK3__
+        g_object_unref(m_cursor);
+#else
+        gdk_cursor_unref(m_cursor);
+#endif
+    }

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

+// wxCursor
+//-----------------------------------------------------------------------------
+
+#define M_CURSORDATA static_cast<wxCursorRefData*>(m_refData)

 
 

-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
+// 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)
+{
+    m_refData = new wxCursorRefData;
+    if (hotSpotX < 0 || hotSpotX >= width)
+        hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY >= height)
+        hotSpotY = 0;
+#ifdef __WXGTK3__
+    wxBitmap bitmap(bits, width, height);
+    if (maskBits)
+        bitmap.SetMask(new wxMask(wxBitmap(maskBits, width, height)));
+    GdkPixbuf* pixbuf = bitmap.GetPixbuf();
+    if (fg || bg)
+    {
+        const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+        const int n_channels = gdk_pixbuf_get_n_channels(pixbuf);
+        guchar* data = gdk_pixbuf_get_pixels(pixbuf);
+        for (int j = 0; j < height; j++, data += stride)
+        {
+            guchar* p = data;
+            for (int i = 0; i < width; i++, p += n_channels)
+            {
+                if (p[0])
+                {
+                    if (fg)
+                    {
+                        p[0] = fg->Red();
+                        p[1] = fg->Green();
+                        p[2] = fg->Blue();
+                    }
+                }
+                else
+                {
+                    if (bg)
+                    {
+                        p[0] = bg->Red();
+                        p[1] = bg->Green();
+                        p[2] = bg->Blue();
+                    }
+                }
+            }
+        }
+    }
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(wxGetRootWindow()), pixbuf, hotSpotX, hotSpotY);
+#else
+    if (!maskBits)
+        maskBits = bits;
+    if (!fg)
+        fg = wxBLACK;
+    if (!bg)
+        bg = wxWHITE;
+
+    GdkBitmap* data = gdk_bitmap_create_from_data(
+        gtk_widget_get_window(wxGetRootWindow()), const_cast<char*>(bits), width, height);
+    GdkBitmap* mask = gdk_bitmap_create_from_data(
+        gtk_widget_get_window(wxGetRootWindow()), const_cast<char*>(maskBits), width, height);
+
+    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);
+#endif

 }
 
 }
 

-wxCursor::wxCursor( int cursorId )
+wxCursor::~wxCursor()
+{
+}
+
+void wxCursor::InitFromStock( wxStockCursor cursorId )

 {
     m_refData = new wxCursorRefData();
 
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
 {
     m_refData = new wxCursorRefData();
 
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {

+#ifdef __WXGTK3__
+        case wxCURSOR_BLANK:            gdk_cur = GDK_BLANK_CURSOR; break;
+#else

         case wxCURSOR_BLANK:
             {
         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,
 
                 GdkPixmap *pixmap = gdk_bitmap_create_from_data(NULL, bits, 1, 1);
                 M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap(pixmap,


@@ -73,13 +192,14 @@ wxCursor::wxCursor( int cursorId )
                                                                     &color,
                                                                     &color,
                                                                     0, 0);
                                                                     &color,
                                                                     &color,
                                                                     0, 0);

+                g_object_unref(pixmap);

             }
             return;
             }
             return;

-
+#endif

         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_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_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;


@@ -120,220 +240,78 @@ wxCursor::wxCursor( int cursorId )
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 

-extern GtkWidget *wxGetRootWindow();
-
-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
 
 #if wxUSE_IMAGE
 

-wxCursor::wxCursor( const wxImage & image )
+void wxCursor::InitFromImage( 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 i, j, i8; unsigned char c, cMask;
-    for (i=0; i<imagebitcount; i++)
+    const int w = image.GetWidth();
+    const int h = image.GetHeight();
+    const guchar* alpha = image.GetAlpha();
+    const bool hasMask = image.HasMask();
+    int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+    if (hotSpotX < 0 || hotSpotX > w) hotSpotX = 0;
+    if (hotSpotY < 0 || hotSpotY > h) hotSpotY = 0;
+    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(image.GetData(), GDK_COLORSPACE_RGB, false, 8, w, h, w * 3, NULL, NULL);
+    if (alpha || hasMask)

     {
     {

-        bits[i] = 0;
-        i8 = i * 8;
-
-        cMask = 1;
-        for (j=0; j<8; j++)
+        guchar r = 0, g = 0, b = 0;
+        if (hasMask)

         {
         {

-            // 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;
-        }
-    }
-
-    unsigned long keyMaskColor;
-    if (bHasMask)
-    {
-        unsigned char
-            r = image.GetMaskRed(),
-            g = image.GetMaskGreen(),
+            r = image.GetMaskRed();
+            g = image.GetMaskGreen();

             b = image.GetMaskBlue();
             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;
-            }

         }
         }

-
-        keyMaskColor = (r << 16) | (g << 8) | b;
-    }
-    else // no mask
-    {
-        for (i=0; i<imagebitcount; i++)
-            maskBits[i] = 0xFF;
-
-        // init it to avoid compiler warnings
-        keyMaskColor = 0;
-    }
-
-    // find the most frequent color(s)
-    wxImageHistogram histogram;
-    image.ComputeHistogram(histogram);
-
-    // colors as rrggbb
-    unsigned long key;
-    unsigned long value;
-
-    long colMostFreq = 0;
-    unsigned long nMost = 0;
-    long colNextMostFreq = 0;
-    unsigned long nNext = 0;
-    for ( wxImageHistogram::iterator entry = histogram.begin();
-          entry != histogram.end();
-          ++entry )
-    {
-        value = entry->second.value;
-        key = entry->first;
-        if ( !bHasMask || (key != keyMaskColor) )
+        GdkPixbuf* pixbuf0 = pixbuf;
+        pixbuf = gdk_pixbuf_add_alpha(pixbuf, hasMask, r, g, b);
+        g_object_unref(pixbuf0);
+        if (alpha)

         {
         {

-            if (value > nMost)
-            {
-                nMost = value;
-                colMostFreq = key;
-            }
-            else if (value > nNext)
-            {
-                nNext = value;
-                colNextMostFreq = key;
-            }
+            guchar* d = gdk_pixbuf_get_pixels(pixbuf);
+            const int stride = gdk_pixbuf_get_rowstride(pixbuf);
+            for (int j = 0; j < h; j++, d += stride)
+                for (int i = 0; i < w; i++, alpha++)
+                    if (d[4 * i + 3])
+                        d[4 * i + 3] = *alpha;

         }
     }
         }
     }

-
-    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) );
-
-    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;
-    }
-
-    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_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);
-    delete [] bits;
-    delete [] maskBits;
+    M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf(gtk_widget_get_display(wxGetRootWindow()), pixbuf, hotSpotX, hotSpotY);
+    g_object_unref(pixbuf);

 }
 
 #endif // wxUSE_IMAGE
 
 }
 
 #endif // wxUSE_IMAGE
 

-wxCursor::~wxCursor()
-{
-}
-
-bool wxCursor::operator == ( const wxCursor& cursor ) const
+GdkCursor *wxCursor::GetCursor() const

 {
 {

-    return m_refData == cursor.m_refData;
+    return M_CURSORDATA->m_cursor;

 }
 
 }
 

-bool wxCursor::operator != ( const wxCursor& cursor ) const
+wxGDIRefData *wxCursor::CreateGDIRefData() const

 {
 {

-    return m_refData != cursor.m_refData;
+    return new wxCursorRefData;

 }
 
 }
 

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

 {
 {

-    return (m_refData != NULL);
-}
-
-GdkCursor *wxCursor::GetCursor() const
-{
-    return M_CURSORDATA->m_cursor;
+    // 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;

 }
 
 //-----------------------------------------------------------------------------
 // busy cursor routines
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // 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;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;


@@ -348,34 +326,42 @@ const wxCursor wxBusyCursor::GetBusyCursor()
     return wxCursor(wxCURSOR_WATCH);
 }
 
     return wxCursor(wxCURSOR_WATCH);
 }
 

+static void UpdateCursors(GdkDisplay** display)
+{
+    wxWindowList::const_iterator i = wxTopLevelWindows.begin();
+    for (size_t n = wxTopLevelWindows.size(); n--; ++i)
+    {
+        wxWindow* win = *i;
+        win->GTKUpdateCursor();
+        if (display && *display == NULL && win->m_widget)
+            *display = gtk_widget_get_display(win->m_widget);
+    }
+}
+

 void wxEndBusyCursor()
 {
     if (--gs_busyCount > 0)
         return;
 
 void wxEndBusyCursor()
 {
     if (--gs_busyCount > 0)
         return;
 

-    wxSetCursor( gs_savedCursor );
+    g_globalCursor = gs_savedCursor;

     gs_savedCursor = wxNullCursor;
     gs_savedCursor = wxNullCursor;

-
-    if (wxTheApp)
-        wxTheApp->ProcessIdle();
+    UpdateCursors(NULL);

 }
 
 }
 

-void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
+void wxBeginBusyCursor(const wxCursor* cursor)

 {
     if (gs_busyCount++ > 0)
         return;
 
 {
     if (gs_busyCount++ > 0)
         return;
 

-    wxASSERT_MSG( !gs_savedCursor.Ok(),
+    wxASSERT_MSG( !gs_savedCursor.IsOk(),

                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;
                   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;
+    UpdateCursors(&display);
+    if (display)
+        gdk_display_flush(display);

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()


@@ -385,8 +371,6 @@ bool wxIsBusy()
 
 void wxSetCursor( const wxCursor& cursor )
 {
 
 void wxSetCursor( const wxCursor& cursor )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     g_globalCursor = cursor;
     g_globalCursor = cursor;

+    UpdateCursors(NULL);

 }
 }