X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4daa4d665a4297b112f5ab279cc2aa2b4653b6f4..088ddc4e370d808a2f7e923b671856c303dfa45c:/src/motif/cursor.cpp diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp index 9709ba21f8..66b2925bec 100644 --- a/src/motif/cursor.cpp +++ b/src/motif/cursor.cpp @@ -9,15 +9,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "cursor.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/cursor.h" -#include "wx/gdicmn.h" -#include "wx/icon.h" #include "wx/app.h" #include "wx/utils.h" +#include "wx/list.h" +#include "wx/window.h" #if wxUSE_IMAGE #include "wx/image.h" #endif @@ -33,25 +36,49 @@ #include "wx/motif/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap) -IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject) +// Cursor for one display, so we can choose the correct one for +// the current display. +class wxXCursor +{ +public: + WXDisplay* m_display; + WXCursor m_cursor; +}; + +WX_DECLARE_LIST(wxXCursor, wxXCursorList); +#include "wx/listimpl.cpp" +WX_DEFINE_LIST(wxXCursorList); + +class WXDLLEXPORT wxCursorRefData: public wxObjectRefData +{ + friend class WXDLLEXPORT wxCursor; +public: + wxCursorRefData(); + ~wxCursorRefData(); + + wxXCursorList m_cursors; // wxXCursor objects, one per display + wxStockCursor m_cursorId; // wxWidgets standard cursor id +}; + +#define M_CURSORDATA ((wxCursorRefData *)m_refData) +#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) + +IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxObject) wxCursorRefData::wxCursorRefData() { - m_width = 32; m_height = 32; m_cursorId = wxCURSOR_NONE; } wxCursorRefData::~wxCursorRefData() { - wxNode* node = m_cursors.First(); + wxXCursorList::compatibility_iterator node = m_cursors.GetFirst(); while (node) { - wxXCursor* c = (wxXCursor*) node->Data(); - // TODO: how to delete cursor? - // XDestroyCursor((Display*) c->m_display, (Cursor) c->m_cursor); // ?? + wxXCursor* c = node->GetData(); + XFreeCursor((Display*) c->m_display, (Cursor) c->m_cursor); delete c; - node = node->Next(); + node = node->GetNext(); } } @@ -74,22 +101,21 @@ wxCursor::wxCursor(const wxImage & image) 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; + bits[i] = bits[i] & cMask; + cMask = (cMask << 1) | 1; } } - unsigned long keyMaskColor; if (bHasMask) { unsigned char @@ -102,78 +128,31 @@ wxCursor::wxCursor(const wxImage & image) maskBits[i] = 0x0; i8 = i * 8; - cMask = 1; + cMask = 0x1; for (j=0; j<8; j++) { 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; + cMask = (cMask << 1); } } - - keyMaskColor = (r << 16) | (g << 8) | b; } else // no mask { 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); + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X)) + hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X); else hotSpotX = 0; - if (image.HasOption(wxCUR_HOTSPOT_Y)) - hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y); + if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y)) + hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y); else hotSpotY = 0; @@ -181,87 +160,56 @@ end of color code hotSpotX = 0; if (hotSpotY < 0 || hotSpotY >= h) hotSpotY = 0; - - m_refData = new wxCursorRefData; + + Create( (const char*)bits, w, h, hotSpotX, hotSpotY, + (const char*)maskBits ); + + delete[] bits; + delete[] maskBits; +} +#endif + +void wxCursor::Create(const char bits[], int width, int height, + int hotSpotX, int hotSpotY, const char maskBits[]) +{ + if( !m_refData ) + 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, + RootWindow (dpy, screen_num), + (char*) bits, width, height, 1 , 0 , 1); Pixmap mask_pixmap = None; if (maskBits != NULL) { mask_pixmap = XCreatePixmapFromBitmapData (dpy, - RootWindow (dpy, DefaultScreen(dpy)), - (char*) maskBits, w, h, + RootWindow (dpy, screen_num), + (char*) maskBits, width, height, 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); + Create( (WXPixmap)pixmap, (WXPixmap)mask_pixmap, 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[]) +void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap, + int hotSpotX, int hotSpotY) { - m_refData = new wxCursorRefData; + if( !m_refData ) + m_refData = new wxCursorRefData; Display *dpy = (Display*) wxGetDisplay(); int screen_num = DefaultScreen (dpy); - Pixmap pixmap = XCreatePixmapFromBitmapData (dpy, - RootWindow (dpy, DefaultScreen(dpy)), - (char*) bits, width, height, - 1 , 0 , 1); - - Pixmap mask_pixmap = None; - if (maskBits != NULL) - { - mask_pixmap = XCreatePixmapFromBitmapData (dpy, - RootWindow (dpy, DefaultScreen(dpy)), - (char*) maskBits, width, height, - 1 , 0 , 1); - } - XColor foreground_color; XColor background_color; foreground_color.pixel = BlackPixel(dpy, screen_num); @@ -271,19 +219,13 @@ wxCursor::wxCursor(const char bits[], int width, int height, XQueryColor(dpy, cmap, &background_color); Cursor cursor = XCreatePixmapCursor (dpy, - pixmap, - mask_pixmap, + (Pixmap)pixmap, + (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; @@ -291,14 +233,15 @@ wxCursor::wxCursor(const char bits[], int width, int height, 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; } } +wxCursor::wxCursor(const char bits[], int width, int height, + int hotSpotX, int hotSpotY, const char maskBits[]) +{ + Create(bits, width, height, hotSpotX, hotSpotY, maskBits); +} + wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY) { // Must be an XBM file @@ -309,33 +252,17 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY) int hotX = -1, hotY = -1; unsigned int w, h; - Pixmap pixmap; + Pixmap pixmap = None, mask_pixmap = None; Display *dpy = (Display*) wxGetDisplay(); int screen_num = DefaultScreen (dpy); - int value = XReadBitmapFile (dpy, RootWindow (dpy, DefaultScreen (dpy)), - (char*) (const char*) name, &w, &h, &pixmap, &hotX, &hotY); - - M_BITMAPDATA->m_width = w; - M_BITMAPDATA->m_height = h; - M_BITMAPDATA->m_depth = 1; + int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num), + wxConstCast(name.c_str(), char), + &w, &h, &pixmap, &hotX, &hotY); - if ((value == BitmapFileInvalid) || - (value == BitmapOpenFailed) || - (value == BitmapNoMemory)) - { - } - else + if (value == BitmapSuccess) { - 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); - // TODO: how do we determine whether hotX, hotY were read correctly? if (hotX < 0 || hotY < 0) { @@ -348,27 +275,10 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY) hotY = 0; } - Pixmap mask_pixmap = None; - Cursor cursor = XCreatePixmapCursor (dpy, - pixmap, - mask_pixmap, - &foreground_color, - &background_color, - hotX, - hotY); + Create( (WXPixmap)pixmap, (WXPixmap)mask_pixmap, hotX, hotY ); XFreePixmap( dpy, 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; - } } - } // Cursors by stock number @@ -376,39 +286,29 @@ wxCursor::wxCursor(wxStockCursor id) { m_refData = new wxCursorRefData; M_CURSORDATA->m_cursorId = id; - M_CURSORDATA->m_ok = TRUE; - - WXDisplay* display = wxGetDisplay(); - if (!display) - return; - - WXCursor cursor = GetXCursor(display); - if (cursor) - { - wxXCursor* c = new wxXCursor; - c->m_cursor = cursor; - c->m_display = wxGetDisplay(); - M_CURSORDATA->m_cursors.Append(c); - M_CURSORDATA->m_ok = TRUE; - } } wxCursor::~wxCursor() { } +bool wxCursor::Ok() const +{ + return m_refData != NULL; +} + // Motif-specific: create/get a cursor for the current display -WXCursor wxCursor::GetXCursor(WXDisplay* display) +WXCursor wxCursor::GetXCursor(WXDisplay* display) const { if (!M_CURSORDATA) return (WXCursor) 0; - wxNode* node = M_CURSORDATA->m_cursors.First(); + wxXCursorList::compatibility_iterator node = M_CURSORDATA->m_cursors.GetFirst(); while (node) { - wxXCursor* c = (wxXCursor*) node->Data(); + wxXCursor* c = 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. @@ -433,185 +333,83 @@ WXCursor wxCursor::GetXCursor(WXDisplay* display) } // Make a cursor from standard id -WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) +WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) const { Display* dpy = (Display*) display; Cursor cursor = (Cursor) 0; + int x_cur = -1; switch (id) { - case wxCURSOR_WAIT: - { - cursor = XCreateFontCursor (dpy, XC_watch); - break; - } - case wxCURSOR_CROSS: - { - cursor = XCreateFontCursor (dpy, XC_crosshair); - break; - } - case wxCURSOR_CHAR: - { - // Nothing - break; - } - case wxCURSOR_HAND: - { - cursor = XCreateFontCursor (dpy, XC_hand1); - break; - } - case wxCURSOR_BULLSEYE: - { - cursor = XCreateFontCursor (dpy, XC_target); - break; - } - case wxCURSOR_PENCIL: - { - cursor = XCreateFontCursor (dpy, XC_pencil); - break; - } - case wxCURSOR_MAGNIFIER: - { - cursor = XCreateFontCursor (dpy, XC_sizing); - break; - } - case wxCURSOR_IBEAM: - { - cursor = XCreateFontCursor (dpy, XC_xterm); - break; - } - case wxCURSOR_NO_ENTRY: - { - cursor = XCreateFontCursor (dpy, XC_pirate); - break; - } - case wxCURSOR_LEFT_BUTTON: - { - cursor = XCreateFontCursor (dpy, XC_leftbutton); - break; - } - case wxCURSOR_RIGHT_BUTTON: - { - cursor = XCreateFontCursor (dpy, XC_rightbutton); - break; - } - case wxCURSOR_MIDDLE_BUTTON: - { - cursor = XCreateFontCursor (dpy, XC_middlebutton); - break; - } - case wxCURSOR_QUESTION_ARROW: - { - cursor = XCreateFontCursor (dpy, XC_question_arrow); - break; - } - case wxCURSOR_SIZING: - { - cursor = XCreateFontCursor (dpy, XC_sizing); - break; - } - case wxCURSOR_WATCH: - { - cursor = XCreateFontCursor (dpy, XC_watch); - break; - } - case wxCURSOR_SPRAYCAN: - { - cursor = XCreateFontCursor (dpy, XC_spraycan); - break; - } - case wxCURSOR_PAINT_BRUSH: - { - cursor = XCreateFontCursor (dpy, XC_spraycan); - break; - } - case wxCURSOR_SIZENWSE: - case wxCURSOR_SIZENESW: - { - // Not available in X - cursor = XCreateFontCursor (dpy, XC_crosshair); - break; - } - case wxCURSOR_SIZEWE: - { - cursor = XCreateFontCursor (dpy, XC_sb_h_double_arrow); - break; - } - case wxCURSOR_SIZENS: - { - cursor = XCreateFontCursor (dpy, XC_sb_v_double_arrow); - break; - } - case wxCURSOR_POINT_LEFT: - { - cursor = XCreateFontCursor (dpy, XC_sb_left_arrow); - break; - } - case wxCURSOR_POINT_RIGHT: - { - cursor = XCreateFontCursor (dpy, XC_sb_right_arrow); - break; - } + case wxCURSOR_WAIT: x_cur = XC_watch; break; + case wxCURSOR_CROSS: x_cur = XC_crosshair; break; + case wxCURSOR_CHAR: return (WXCursor)cursor; break; + case wxCURSOR_HAND: x_cur = XC_hand1; break; + case wxCURSOR_BULLSEYE: x_cur = XC_target; break; + case wxCURSOR_PENCIL: x_cur = XC_pencil; break; + case wxCURSOR_MAGNIFIER: x_cur = XC_sizing; break; + case wxCURSOR_IBEAM: x_cur = XC_xterm; break; + case wxCURSOR_NO_ENTRY: x_cur = XC_pirate; break; + case wxCURSOR_LEFT_BUTTON: x_cur = XC_leftbutton; break; + case wxCURSOR_RIGHT_BUTTON: x_cur = XC_rightbutton; break; + case wxCURSOR_MIDDLE_BUTTON: x_cur = XC_middlebutton; break; + case wxCURSOR_QUESTION_ARROW: x_cur = XC_question_arrow; break; + case wxCURSOR_SIZING: x_cur = XC_sizing; break; + case wxCURSOR_WATCH: x_cur = XC_watch; break; + case wxCURSOR_SPRAYCAN: x_cur = XC_spraycan; break; + case wxCURSOR_PAINT_BRUSH: x_cur = XC_spraycan; break; + case wxCURSOR_SIZENWSE: + case wxCURSOR_SIZENESW: x_cur = XC_crosshair; break; + case wxCURSOR_SIZEWE: x_cur = XC_sb_h_double_arrow; break; + case wxCURSOR_SIZENS: x_cur = XC_sb_v_double_arrow; break; + case wxCURSOR_POINT_LEFT: x_cur = XC_sb_left_arrow; break; + case wxCURSOR_POINT_RIGHT: x_cur = XC_sb_right_arrow; break; // (JD Huggins) added more stock cursors for X // X-only cursors BEGIN - case wxCURSOR_CROSS_REVERSE: - { - cursor = XCreateFontCursor(dpy, XC_cross_reverse); - break; - } - case wxCURSOR_DOUBLE_ARROW: - { - cursor = XCreateFontCursor(dpy, XC_double_arrow); - break; - } - case wxCURSOR_BASED_ARROW_UP: - { - cursor = XCreateFontCursor(dpy, XC_based_arrow_up); - break; - } - case wxCURSOR_BASED_ARROW_DOWN: - { - cursor = XCreateFontCursor(dpy, XC_based_arrow_down); - break; - } - default: - case wxCURSOR_ARROW: - { - cursor = XCreateFontCursor (dpy, XC_top_left_arrow); - break; - } - case wxCURSOR_BLANK: - { - GC gc; - XGCValues gcv; - Pixmap empty_pixmap; - XColor blank_color; - - empty_pixmap = XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)), - 16, 16, 1); - gcv.function = GXxor; - gc = XCreateGC (dpy, - empty_pixmap, - GCFunction, - &gcv); - XCopyArea (dpy, + case wxCURSOR_CROSS_REVERSE: x_cur = XC_cross_reverse; break; + case wxCURSOR_DOUBLE_ARROW: x_cur = XC_double_arrow; break; + case wxCURSOR_BASED_ARROW_UP: x_cur = XC_based_arrow_up; break; + case wxCURSOR_BASED_ARROW_DOWN: x_cur = XC_based_arrow_down; break; + case wxCURSOR_BLANK: + { + GC gc; + XGCValues gcv; + Pixmap empty_pixmap; + XColor blank_color; + + empty_pixmap = + XCreatePixmap (dpy, RootWindow (dpy, DefaultScreen (dpy)), + 16, 16, 1); + gcv.function = GXxor; + gc = XCreateGC (dpy, + empty_pixmap, + GCFunction, + &gcv); + XCopyArea (dpy, empty_pixmap, empty_pixmap, gc, 0, 0, 16, 16, 0, 0); - XFreeGC (dpy, gc); - cursor = XCreatePixmapCursor (dpy, - empty_pixmap, - empty_pixmap, - &blank_color, - &blank_color, - 8, 8); - - break; - } + XFreeGC (dpy, gc); + cursor = XCreatePixmapCursor (dpy, + empty_pixmap, + empty_pixmap, + &blank_color, + &blank_color, + 8, 8); + + break; + } + case wxCURSOR_ARROW: + default: x_cur = XC_top_left_arrow; break; } + + if( x_cur == -1 ) + return (WXCursor)cursor; + + cursor = XCreateFontCursor (dpy, x_cur); return (WXCursor) cursor; } @@ -657,9 +455,10 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor) XFlush (display); - for(wxNode *node = win->GetChildren().First (); node; node = node->Next()) + for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node; + node = node->GetNext()) { - wxWindow *child = (wxWindow *) node->Data (); + wxWindow *child = node->GetData (); wxXSetBusyCursor (child, cursor); } } @@ -670,9 +469,10 @@ void wxBeginBusyCursor(wxCursor *cursor) wxBusyCursorCount++; if (wxBusyCursorCount == 1) { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) + for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node; + node = node->GetNext()) { - wxWindow *win = (wxWindow *) node->Data (); + wxWindow *win = node->GetData (); wxXSetBusyCursor (win, cursor); } } @@ -687,15 +487,16 @@ void wxEndBusyCursor() wxBusyCursorCount--; if (wxBusyCursorCount == 0) { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) + for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node; + node = node->GetNext()) { - wxWindow *win = (wxWindow *) node->Data (); + wxWindow *win = node->GetData (); wxXSetBusyCursor (win, NULL); } } } -// TRUE if we're between the above two calls +// true if we're between the above two calls bool wxIsBusy() { return (wxBusyCursorCount > 0);