added more robust wxTLW::ShowFullScreen implementation

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

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 3eca3593ef2303db7cad1ff2f7e4df786c54672b..dc03ce10db83ba99f5833335f94eba5c38c18cdd 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -14,8 +14,10 @@
 
 #include "wx/cursor.h"
 #include "wx/utils.h"
 
 #include "wx/cursor.h"
 #include "wx/utils.h"

+#include "wx/app.h"

 
 

-#include "gdk/gdk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -56,6 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
 
 wxCursor::wxCursor()
 {
 
 wxCursor::wxCursor()
 {

+

 }
 
 wxCursor::wxCursor( int cursorId )
 }
 
 wxCursor::wxCursor( int cursorId )


@@ -65,11 +68,14 @@ wxCursor::wxCursor( int cursorId )
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {
     GdkCursorType gdk_cur = GDK_LEFT_PTR;
     switch (cursorId)
     {

+        case wxCURSOR_ARROW:            // fall through to default

         case wxCURSOR_DEFAULT:          gdk_cur = GDK_LEFT_PTR; break;
         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_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_HAND:             gdk_cur = GDK_HAND1; 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_ARROWWAIT:

         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;


@@ -88,6 +94,8 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_RIGHT_BUTTON:     gdk_cur = GDK_RIGHTBUTTON; break;
         case wxCURSOR_BULLSEYE:         gdk_cur = GDK_TARGET; break;
 
         case wxCURSOR_RIGHT_BUTTON:     gdk_cur = GDK_RIGHTBUTTON; break;
         case wxCURSOR_BULLSEYE:         gdk_cur = GDK_TARGET; break;
 

+        case wxCURSOR_POINT_LEFT:       gdk_cur = GDK_SB_LEFT_ARROW; break;
+        case wxCURSOR_POINT_RIGHT:      gdk_cur = GDK_SB_RIGHT_ARROW; break;

 /*
         case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;
 /*
         case wxCURSOR_DOUBLE_ARROW:     gdk_cur = GDK_DOUBLE_ARROW; break;
         case wxCURSOR_CROSS_REVERSE:    gdk_cur = GDK_CROSS_REVERSE; break;


@@ -97,19 +105,193 @@ wxCursor::wxCursor( int cursorId )
         default:
             wxFAIL_MSG(wxT("unsupported cursor type"));
             // will use the standard one
         default:
             wxFAIL_MSG(wxT("unsupported cursor type"));
             // will use the standard one

-
-        case wxCURSOR_ARROW:

             break;
     }
 
     M_CURSORDATA->m_cursor = gdk_cursor_new( gdk_cur );
 }
 
             break;
     }
 
     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[], wxColour *fg, 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 );
+
+    gdk_bitmap_unref( data );
+    gdk_bitmap_unref( mask );
+}
+
+

 wxCursor::wxCursor( const wxCursor &cursor )
 wxCursor::wxCursor( const wxCursor &cursor )

+    : wxObject()

 {
     Ref( 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 * 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;
+        }
+    }
+
+    unsigned long keyMaskColor;
+    if (bHasMask)
+    {
+        unsigned char
+            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;
+            }
+        }
+
+        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) )
+        {
+            if (value > nMost)
+            {
+                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 bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
+                             (unsigned char)(colNextMostFreq >> 8),
+                             (unsigned char)(colNextMostFreq) );
+
+    int hotSpotX;
+    int hotSpotY;
+
+    if (image.HasOption(wxCUR_HOTSPOT_X))
+        hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
+    else
+        hotSpotX = 0;
+
+    if (image.HasOption(wxCUR_HOTSPOT_Y))
+        hotSpotY = image.GetOptionInt(wxCUR_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,
+                                mask,
+                                fg.GetColor(), bg.GetColor(),
+                                hotSpotX, hotSpotY
+                             );
+
+    gdk_bitmap_unref( data );
+    gdk_bitmap_unref( mask );
+    delete [] bits;
+    delete [] maskBits;
+}
+
+#endif // wxUSE_IMAGE
+

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


@@ -153,6 +335,16 @@ extern wxCursor g_globalCursor;
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 
 static wxCursor  gs_savedCursor;
 static int       gs_busyCount = 0;
 

+const wxCursor &wxBusyCursor::GetStoredCursor()
+{
+    return gs_savedCursor;
+}
+
+const wxCursor wxBusyCursor::GetBusyCursor()
+{
+    return wxCursor(wxCURSOR_WATCH);
+}
+

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


@@ -161,7 +353,8 @@ void wxEndBusyCursor()
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
 
     wxSetCursor( gs_savedCursor );
     gs_savedCursor = wxNullCursor;
 

-    wxYield();
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();

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


@@ -176,7 +369,10 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
 
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 
 
     wxSetCursor( wxCursor(wxCURSOR_WATCH) );
 

-    wxYield();
+    if (wxTheApp)
+        wxTheApp->SendIdleEvents();
+
+    gdk_flush();

 }
 
 bool wxIsBusy()
 }
 
 bool wxIsBusy()