/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.cpp
+// Name: src/gtk/cursor.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#include "wx/wxprec.h"
#include "wx/cursor.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/image.h"
+ #include "wx/colour.h"
+ #include "wx/bitmap.h"
+#endif // WX_PRECOMP
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// 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;
};
wxCursorRefData::~wxCursorRefData()
{
- if (m_cursor) gdk_cursor_destroy( m_cursor );
+ if (m_cursor) gdk_cursor_unref( m_cursor );
}
//-----------------------------------------------------------------------------
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
+#define M_CURSORDATA wx_static_cast(wxCursorRefData*, m_refData)
-IMPLEMENT_DYNAMIC_CLASS(wxCursor,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)
wxCursor::wxCursor()
{
-
}
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,
&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;
wxCursor::wxCursor(const char bits[], int width, int height,
int hotSpotX, int hotSpotY,
- const char maskBits[], wxColour *fg, wxColour *bg)
+ const char maskBits[], const wxColour *fg, const wxColour *bg)
{
if (!maskBits)
maskBits = bits;
data, mask, fg->GetColor(), bg->GetColor(),
hotSpotX, hotSpotY );
- gdk_bitmap_unref( data );
- gdk_bitmap_unref( mask );
+ g_object_unref (data);
+ g_object_unref (mask);
}
+#if wxUSE_IMAGE
-wxCursor::wxCursor( const wxCursor &cursor )
- : wxObject()
+static void GetHotSpot(const wxImage& image, int& x, int& y)
{
- Ref( cursor );
-}
+ if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+ x = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+ else
+ x = 0;
-#if wxUSE_IMAGE
+ 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; i<imagebitcount; i++)
+ GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window);
+ 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<imagebitcount; i++)
+ // 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)
{
- maskBits[i] = 0x0;
- i8 = i * 8;
-
- cMask = 1;
- for (j=0; j<8; j++)
+ //if average value is > 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; i<imagebitcount; i++)
- maskBits[i] = 0xFF;
-
- // init it to avoid compiler warnings
- keyMaskColor = 0;
}
+ wxBitmap bitmap(image_copy, 1);
// 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;
entry != histogram.end();
++entry )
{
- value = entry->second.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;
}
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
);
- gdk_bitmap_unref( data );
- gdk_bitmap_unref( mask );
- delete [] bits;
- delete [] maskBits;
+ g_object_unref (mask);
}
#endif // wxUSE_IMAGE
{
}
-wxCursor& wxCursor::operator = ( const wxCursor& cursor )
-{
- if (*this == cursor)
- return (*this);
-
- Ref( cursor );
-
- return *this;
-}
-
-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(*wx_static_cast(const wxCursorRefData *, 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;
wxTheApp->ProcessIdle();
}
-void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
+void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
{
if (gs_busyCount++ > 0)
return;
void wxSetCursor( const wxCursor& cursor )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
g_globalCursor = cursor;
+ wxTheApp->WakeUpIdle();
}
projects / wxWidgets.git / blobdiff