/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.cpp
+// Name: src/gtk/cursor.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "cursor.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#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"
+#endif // WX_PRECOMP
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCursor
public:
wxCursorRefData();
- ~wxCursorRefData();
+ virtual ~wxCursorRefData();
GdkCursor *m_cursor;
};
wxCursorRefData::~wxCursorRefData()
{
- if (m_cursor) gdk_cursor_destroy( m_cursor );
+ if (m_cursor) gdk_cursor_unref( m_cursor );
}
//-----------------------------------------------------------------------------
GdkCursorType gdk_cur = GDK_LEFT_PTR;
switch (cursorId)
{
+ case wxCURSOR_BLANK:
+ {
+ static const gchar bits[] = { 0 };
+ static /* const -- not in GTK1 */ 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,
+ pixmap,
+ &color,
+ &color,
+ 0, 0);
+ }
+ 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_ARROWWAIT:
case wxCURSOR_WAIT:
case wxCURSOR_WATCH: gdk_cur = GDK_WATCH; break;
- case wxCURSOR_SIZING: gdk_cur = GDK_SIZING; break;
+ case wxCURSOR_SIZING: gdk_cur = GDK_FLEUR; break;
case wxCURSOR_SPRAYCAN: gdk_cur = GDK_SPRAYCAN; break;
case wxCURSOR_IBEAM: gdk_cur = GDK_XTERM; break;
case wxCURSOR_PENCIL: gdk_cur = GDK_PENCIL; break;
case wxCURSOR_BASED_ARROW_UP: gdk_cur = GDK_BASED_ARROW_UP; break;
case wxCURSOR_BASED_ARROW_DOWN: gdk_cur = GDK_BASED_ARROW_DOWN; break;
*/
+
default:
wxFAIL_MSG(wxT("unsupported cursor type"));
// will use the standard one
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 (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;
}
-#if wxUSE_IMAGE
-
wxCursor::wxCursor( const wxImage & image )
{
unsigned char * rgbBits = image.GetData();
bool bHasMask = image.HasMask();
int imagebitcount = (w*h)/8;
+ if ( gdk_display_supports_cursor_color(gdk_display_get_default()) )
+ {
+ unsigned char rMask = 0,
+ gMask = 0,
+ bMask = 0;
+ if (bHasMask)
+ {
+ rMask = image.GetMaskRed();
+ gMask = image.GetMaskGreen();
+ bMask = image.GetMaskBlue();
+ }
+
+ GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8, w, h);
+ unsigned char *alpha = image.HasAlpha() ? image.GetAlpha() : NULL;
+ unsigned char *out = gdk_pixbuf_get_pixels(pixbuf);
+ int rowpad = gdk_pixbuf_get_rowstride(pixbuf) - 4 * w;
+ for ( int y = 0; y < h; y++, out += rowpad )
+ {
+ for ( int x = 0; x < w; x++, out += 4, rgbBits += 3 )
+ {
+ out[0] = rgbBits[0];
+ out[1] = rgbBits[1];
+ out[2] = rgbBits[2];
+ if (bHasMask &&
+ out[0] == rMask && out[1] == gMask && out[2] == bMask)
+ out[3] = 0;
+ else
+ out[3] = alpha ? *alpha : 255;
+ if ( alpha )
+ ++alpha;
+ }
+ }
+
+ int hotSpotX, hotSpotY;
+ GetHotSpot(image, hotSpotX, hotSpotY);
+
+ m_refData = new wxCursorRefData;
+ M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
+ (
+ gdk_display_get_default(),
+ pixbuf,
+ hotSpotX, hotSpotY
+ );
+ g_object_unref (pixbuf);
+ return;
+ }
+
unsigned char * bits = new unsigned char [imagebitcount];
unsigned char * maskBits = new unsigned char [imagebitcount];
keyMaskColor = 0;
}
- // 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();
+ // find the most frequent color(s)
wxImageHistogram histogram;
+ image.ComputeHistogram(histogram);
// colors as rrggbb
unsigned long key;
unsigned long value;
- tmpImage.ComputeHistogram(histogram);
-
- long MostFreqCol = 0;
+ long colMostFreq = 0;
unsigned long nMost = 0;
- long NextFreqCol = 0;
+ long colNextMostFreq = 0;
unsigned long nNext = 0;
- wxImageHistogram::iterator entry = histogram.begin();
-
- while ( entry != histogram.end() )
+ for ( wxImageHistogram::iterator entry = histogram.begin();
+ entry != histogram.end();
+ ++entry )
{
value = entry->second.value;
key = entry->first;
if (value > nMost)
{
nMost = value;
- MostFreqCol = key;
+ colMostFreq = key;
}
else if (value > nNext)
{
nNext = value;
- NextFreqCol = key;
+ colNextMostFreq = key;
}
}
}
- wxColour fg = wxColour ( (unsigned char)(MostFreqCol >> 16),
- (unsigned char)(MostFreqCol >> 8),
- (unsigned char)(MostFreqCol) );
+ wxColour fg = wxColour ( (unsigned char)(colMostFreq >> 16),
+ (unsigned char)(colMostFreq >> 8),
+ (unsigned char)(colMostFreq) );
- wxColour bg = wxColour ( (unsigned char)(NextFreqCol >> 16),
- (unsigned char)(NextFreqCol >> 8),
- (unsigned char)(NextFreqCol) );
+ wxColour bg = wxColour ( (unsigned char)(colNextMostFreq >> 16),
+ (unsigned char)(colNextMostFreq >> 8),
+ (unsigned char)(colNextMostFreq) );
- int hotSpotX=0;
- int hotSpotY=0;
+ int fg_intensity = fg.Red() + fg.Green() + fg.Blue();
+ int bg_intensity = bg.Red() + bg.Green() + bg.Blue();
- 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 (bg_intensity > fg_intensity)
+ {
+ //swap fg and bg
+ wxColour tmp = fg;
+ fg = bg;
+ bg = tmp;
+ }
- if (hotSpotX < 0 || hotSpotX >= w)
- hotSpotX = 0;
- if (hotSpotY < 0 || hotSpotY >= h)
- hotSpotY = 0;
+ int hotSpotX, hotSpotY;
+ GetHotSpot(image, hotSpotX, hotSpotY);
- 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 );
+ 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 );
+ 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;
}
{
}
-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
-{
- return m_refData != cursor.m_refData;
-}
-
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
{
return (m_refData != NULL);
}
// 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;
gs_savedCursor = wxNullCursor;
if (wxTheApp)
- wxTheApp->SendIdleEvents();
+ wxTheApp->ProcessIdle();
}
-void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
+void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
{
if (gs_busyCount++ > 0)
return;
wxSetCursor( wxCursor(wxCURSOR_WATCH) );
if (wxTheApp)
- wxTheApp->SendIdleEvents();
+ wxTheApp->ProcessIdle();
gdk_flush();
}
void wxSetCursor( const wxCursor& cursor )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
g_globalCursor = cursor;
+ wxTheApp->WakeUpIdle();
}
projects / wxWidgets.git / blobdiff