X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/707440dc36592a083e26493a882efc0d95d91506..f68c6b523c1117c90c1cf690745c807bc024789d:/src/motif/cursor.cpp diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 60cfddfd78..7e7fa61066 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 @@ -41,14 +44,14 @@ wxCursorRefData::wxCursorRefData() wxCursorRefData::~wxCursorRefData() { - wxNode* node = m_cursors.First(); + wxList::Node* node = m_cursors.GetFirst(); while (node) { - wxXCursor* c = (wxXCursor*) node->Data(); + wxXCursor* c = (wxXCursor*) node->GetData(); // TODO: how to delete cursor? // XDestroyCursor((Display*) c->m_display, (Cursor) c->m_cursor); // ?? delete c; - node = node->Next(); + node = node->GetNext(); } } @@ -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[]) { @@ -218,13 +402,13 @@ WXCursor wxCursor::GetXCursor(WXDisplay* display) { if (!M_CURSORDATA) return (WXCursor) 0; - wxNode* node = M_CURSORDATA->m_cursors.First(); + wxList::Node* node = M_CURSORDATA->m_cursors.GetFirst(); while (node) { - wxXCursor* c = (wxXCursor*) node->Data(); + wxXCursor* c = (wxXCursor*) node->GetData(); if (c->m_display == display) return c->m_cursor; - node = node->Next(); + node = node->GetNext(); } // No cursor for this display, so let's see if we're an id-type cursor. @@ -473,9 +657,10 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor) XFlush (display); - for(wxNode *node = win->GetChildren().First (); node; node = node->Next()) + for(wxWindowList::Node *node = win->GetChildren().GetFirst (); node; + node = node->GetNext()) { - wxWindow *child = (wxWindow *) node->Data (); + wxWindow *child = node->GetData (); wxXSetBusyCursor (child, cursor); } } @@ -486,9 +671,10 @@ void wxBeginBusyCursor(wxCursor *cursor) wxBusyCursorCount++; if (wxBusyCursorCount == 1) { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) + for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node; + node = node->GetNext()) { - wxWindow *win = (wxWindow *) node->Data (); + wxWindow *win = node->GetData (); wxXSetBusyCursor (win, cursor); } } @@ -503,9 +689,10 @@ void wxEndBusyCursor() wxBusyCursorCount--; if (wxBusyCursorCount == 0) { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) + for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node; + node = node->GetNext()) { - wxWindow *win = (wxWindow *) node->Data (); + wxWindow *win = node->GetData (); wxXSetBusyCursor (win, NULL); } }