Commit of cursor framework. Cursors now defined in source/blender/src/cursors.c and

[blender.git] / intern / ghost / intern / GHOST_WindowX11.cpp

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 7b6fa2aa42af428fb0ec84b6b4a9ae208243beec..e4122992378f29654456cd8c7ec788bcf3a44535 100755 (executable)
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -684,6 +684,24 @@ setWindowCustomCursorShape(
        int hotX, 
        int hotY
 ){
+
+setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*)mask, 
+                                                                       16, 16, hotX, hotY, 0, 1);
+
+}
+
+       GHOST_TSuccess
+GHOST_WindowX11::
+setWindowCustomCursorShape(    
+       GHOST_TUns8 *bitmap, 
+       GHOST_TUns8 *mask, 
+       int sizex, 
+       int sizey, 
+       int hotX, 
+       int hotY, 
+       int fg_color, 
+       int bg_color
+){
        Pixmap bitmap_pix, mask_pix;
        XColor fg, bg;
        
@@ -696,8 +714,8 @@ setWindowCustomCursorShape(
                XFreeCursor(m_display, m_custom_cursor);
        }
 
-       bitmap_pix = XCreateBitmapFromData(m_display,  m_window, (char*) bitmap, 16, 16);
-       mask_pix = XCreateBitmapFromData(m_display, m_window, (char*) mask, 16, 16);
+       bitmap_pix = XCreateBitmapFromData(m_display,  m_window, (char*) bitmap, sizex, sizey);
+       mask_pix = XCreateBitmapFromData(m_display, m_window, (char*) mask, sizex, sizey);
                
        m_custom_cursor = XCreatePixmapCursor(m_display, bitmap_pix, mask_pix, &fg, &bg, hotX, hotY);
        XDefineCursor(m_display, m_window, m_custom_cursor);