]> git.saurik.com Git - wxWidgets.git/blobdiff - src/motif/cursor.cpp
Use wxVisualAttributes (partially #if'd out until tested further.)
[wxWidgets.git] / src / motif / cursor.cpp
index 0abb841b46cc6b40fd52089db1d6cd0878dbecb2..76d242f82f87dcbb545c3e76bf68a1fd2f1a5bed 100644 (file)
@@ -9,14 +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/app.h"
 #include "wx/utils.h"
 #include "wx/list.h"
+#include "wx/window.h"
 #if wxUSE_IMAGE
 #include "wx/image.h"
 #endif                                                                      
@@ -68,7 +72,7 @@ wxCursorRefData::wxCursorRefData()
 
 wxCursorRefData::~wxCursorRefData()
 {
-    wxXCursorList::Node* node = m_cursors.GetFirst();
+    wxXCursorList::compatibility_iterator node = m_cursors.GetFirst();
     while (node)
     {
         wxXCursor* c = node->GetData();
@@ -97,18 +101,18 @@ wxCursor::wxCursor(const wxImage & image)
     int i, j, i8; unsigned char c, cMask;
     for (i=0; i<imagebitcount; i++)
     {
-        bits[i] = 0;
+        bits[i] = 0xff;
         i8 = i * 8;
 
-        cMask = 1;
+        cMask = 0xfe; // 11111110
         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;
+                bits[i] = bits[i] & cMask;
+            cMask = (cMask << 1) | 1;
         }
     }
 
@@ -124,12 +128,12 @@ 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);
             }
         }
     }
@@ -142,13 +146,13 @@ wxCursor::wxCursor(const wxImage & image)
     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;
 
@@ -156,81 +160,56 @@ wxCursor::wxCursor(const wxImage & image)
         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);
-    }
 }
-#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);
@@ -240,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;
@@ -263,6 +236,12 @@ wxCursor::wxCursor(const char bits[], int width, int height,
     }
 }
 
+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
@@ -273,30 +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)),
+    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)
         {
@@ -309,26 +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);
-        }
     }
-
 }
 
 // Cursors by stock number
@@ -352,7 +302,7 @@ WXCursor wxCursor::GetXCursor(WXDisplay* display)
 {
     if (!M_CURSORDATA)
         return (WXCursor) 0;
-    wxXCursorList::Node* node = M_CURSORDATA->m_cursors.GetFirst();
+    wxXCursorList::compatibility_iterator node = M_CURSORDATA->m_cursors.GetFirst();
     while (node)
     {
         wxXCursor* c = node->GetData();
@@ -505,7 +455,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 
     XFlush (display);
 
-    for(wxWindowList::Node *node = win->GetChildren().GetFirst (); node; 
+    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node; 
         node = node->GetNext())
     {
         wxWindow *child = node->GetData ();
@@ -519,7 +469,7 @@ void wxBeginBusyCursor(wxCursor *cursor)
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)
     {
-        for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+        for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
             node = node->GetNext())
         {
             wxWindow *win = node->GetData ();
@@ -537,7 +487,7 @@ void wxEndBusyCursor()
     wxBusyCursorCount--;
     if (wxBusyCursorCount == 0)
     {
-        for(wxWindowList::Node *node = wxTopLevelWindows.GetFirst (); node;
+        for(wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst (); node;
             node = node->GetNext())
         {
             wxWindow *win = node->GetData ();