#include "wx/utils.h"
#include "wx/image.h"
#include "wx/colour.h"
+ #include "wx/bitmap.h"
#endif // WX_PRECOMP
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
-#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 wxImage & image )
{
- unsigned char * rgbBits = image.GetData();
int w = image.GetWidth() ;
int h = image.GetHeight();
bool bHasMask = image.HasMask();
- int imagebitcount = (w*h)/8;
+ int hotSpotX, hotSpotY;
+ GetHotSpot(image, hotSpotX, hotSpotY);
+ m_refData = new wxCursorRefData;
+ wxImage image_copy(image);
- if ( gdk_display_supports_cursor_color(gdk_display_get_default()) )
+ GdkDisplay* display = gdk_drawable_get_display(wxGetRootWindow()->window);
+ if (gdk_display_supports_cursor_color(display))
{
- unsigned char rMask = 0,
- gMask = 0,
- bMask = 0;
- if (bHasMask)
+ if (!image.HasAlpha())
{
- 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;
- }
+ // add alpha, so wxBitmap will convert to pixbuf format
+ image_copy.InitAlpha();
}
-
- int hotSpotX, hotSpotY;
- GetHotSpot(image, hotSpotX, hotSpotY);
-
- m_refData = new wxCursorRefData;
+ wxBitmap bitmap(image_copy);
+ wxASSERT(bitmap.HasPixbuf());
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixbuf
(
- gdk_display_get_default(),
- pixbuf,
+ display,
+ bitmap.GetPixbuf(),
hotSpotX, hotSpotY
);
- g_object_unref (pixbuf);
return;
}
- 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++)
+ unsigned long keyMaskColor = 0;
+ GdkPixmap* mask;
+ if (bHasMask)
{
- 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;
- }
+ 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);
}
-
- unsigned long keyMaskColor;
- if (bHasMask)
+ else
{
- unsigned char
- r = image.GetMaskRed(),
- g = image.GetMaskGreen(),
- b = image.GetMaskBlue();
+ 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, 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);
-
- m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursor = gdk_cursor_new_from_pixmap
(
- data,
+ bitmap.GetPixmap(),
mask,
fg.GetColor(), bg.GetColor(),
hotSpotX, hotSpotY
);
- g_object_unref (data);
g_object_unref (mask);
- delete [] bits;
- delete [] maskBits;
}
#endif // wxUSE_IMAGE
projects / wxWidgets.git / blobdiff