diff options
| author | Josh Andler <scislac@gmail.com> | 2006-02-03 19:45:56 +0000 |
|---|---|---|
| committer | scislac <scislac@users.sourceforge.net> | 2006-02-03 19:45:56 +0000 |
| commit | c09ba43ef8f1c3d58c326f39cafaa2ac1b784b7c (patch) | |
| tree | 1457b0f8686a78f1a60f519ea9ebe1762fe5d164 /src/event-context.cpp | |
| parent | implement par_indent in flowtext, no ui yet, done via first character's dx (diff) | |
| download | inkscape-c09ba43ef8f1c3d58c326f39cafaa2ac1b784b7c.tar.gz inkscape-c09ba43ef8f1c3d58c326f39cafaa2ac1b784b7c.zip | |
Applying patch #1415498 by James Kilfiger / zeimusu - Allow color & transparency in mouse pointer
(bzr r68)
Diffstat (limited to 'src/event-context.cpp')
| -rw-r--r-- | src/event-context.cpp | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp index d67572e9c..8291d79a4 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -174,18 +174,35 @@ sp_event_context_update_cursor(SPEventContext *ec) if (w->window) { /* fixme: */ if (ec->cursor_shape) { - GdkBitmap *bitmap = NULL; - GdkBitmap *mask = NULL; - sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, ec->cursor_shape); - if ((bitmap != NULL) && (mask != NULL)) { - if (ec->cursor) - gdk_cursor_unref (ec->cursor); - ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask, - &w->style->black, - &w->style->white, - ec->hot_x, ec->hot_y); - g_object_unref (bitmap); - g_object_unref (mask); + GdkDisplay *display=gdk_display_get_default(); + if ( + gdk_display_supports_cursor_alpha(display) & + gdk_display_supports_cursor_color(display) + ) + { + GdkPixbuf *pixbuf =NULL; + pixbuf=gdk_pixbuf_new_from_xpm_data((const char**)ec->cursor_shape); + if (pixbuf !=NULL) { + ec->cursor = gdk_cursor_new_from_pixbuf(display,pixbuf, + ec->hot_x, + ec->hot_y); + } + } + else + { + GdkBitmap *bitmap = NULL; + GdkBitmap *mask = NULL; + sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, ec->cursor_shape); + if ((bitmap != NULL) && (mask != NULL)) { + if (ec->cursor) + gdk_cursor_unref (ec->cursor); + ec->cursor = gdk_cursor_new_from_pixmap(bitmap, mask, + &w->style->black, + &w->style->white, + ec->hot_x, ec->hot_y); + g_object_unref (bitmap); + g_object_unref (mask); + } } } gdk_window_set_cursor(w->window, ec->cursor); |