From: Chris Elliott Date: Mon, 1 Jul 2002 20:34:20 +0000 (+0000) Subject: make motif cursor from wxImage X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4daa4d665a4297b112f5ab279cc2aa2b4653b6f4?ds=inline make motif cursor from wxImage git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h index c1d3bce5c3..8ec642b7c9 100644 --- a/include/wx/motif/cursor.h +++ b/include/wx/motif/cursor.h @@ -17,6 +17,11 @@ #endif #include "wx/bitmap.h" +#if wxUSE_IMAGE +#include "wx/image.h" +#endif + + /* Cursor for one display, so we can choose the correct one for * the current display. @@ -61,7 +66,11 @@ public: wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM, int hotSpotX = 0, int hotSpotY = 0); - + +#if wxUSE_IMAGE + wxCursor(const wxImage& image); +#endif + wxCursor(wxStockCursor id); ~wxCursor(); diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 60cfddfd78..9709ba21f8 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -18,6 +18,9 @@ #include "wx/icon.h" #include "wx/app.h" #include "wx/utils.h" +#if wxUSE_IMAGE +#include "wx/image.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -56,6 +59,187 @@ wxCursor::wxCursor() { } +#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 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; isecond.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) ); +end of color code + */ + 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; + + m_refData = new wxCursorRefData; + + Display *dpy = (Display*) wxGetDisplay(); + int screen_num = DefaultScreen (dpy); + + Pixmap pixmap = XCreatePixmapFromBitmapData (dpy, + RootWindow (dpy, DefaultScreen(dpy)), + (char*) bits, w, h, + 1 , 0 , 1); + + Pixmap mask_pixmap = None; + if (maskBits != NULL) + { + mask_pixmap = XCreatePixmapFromBitmapData (dpy, + RootWindow (dpy, DefaultScreen(dpy)), + (char*) maskBits, w, h, + 1 , 0 , 1); + } + + XColor foreground_color; + XColor background_color; + foreground_color.pixel = BlackPixel(dpy, screen_num); + background_color.pixel = WhitePixel(dpy, screen_num); + Colormap cmap = (Colormap) wxTheApp->GetMainColormap((WXDisplay*) dpy); + XQueryColor(dpy, cmap, &foreground_color); + XQueryColor(dpy, cmap, &background_color); + + Cursor cursor = XCreatePixmapCursor (dpy, + pixmap, + mask_pixmap, + &foreground_color, + &background_color, + hotSpotX , + hotSpotY); + + XFreePixmap( dpy, pixmap ); + if (mask_pixmap != None) + { + XFreePixmap( dpy, mask_pixmap ); + } + + if (cursor) + { + wxXCursor *c = new wxXCursor; + + c->m_cursor = (WXCursor) cursor; + c->m_display = (WXDisplay*) dpy; + M_CURSORDATA->m_cursors.Append(c); + M_CURSORDATA->m_ok = TRUE; + } + else + { + M_CURSORDATA->m_ok = TRUE; + } + +} +#endif + wxCursor::wxCursor(const char bits[], int width, int height, int hotSpotX, int hotSpotY, const char maskBits[]) {