* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <X11/Xlib.h>
-#include <X11/cursorfont.h>
-
-#include "gdkx.h"
#include "gdkcursor.h"
-#include "gdkprivate.h"
-
+#include "gdkinternals.h"
-GdkCursor*
-gdk_cursor_new (GdkCursorType cursor_type)
+GType
+gdk_cursor_get_type (void)
{
- GdkCursorPrivate *private;
- GdkCursor *cursor;
- Cursor xcursor;
-
- xcursor = XCreateFontCursor (gdk_display, cursor_type);
- private = g_new (GdkCursorPrivate, 1);
- private->xdisplay = gdk_display;
- private->xcursor = xcursor;
- cursor = (GdkCursor*) private;
- cursor->type = cursor_type;
-
- return cursor;
+ static GType our_type = 0;
+
+ if (our_type == 0)
+ our_type = g_boxed_type_register_static ("GdkCursor",
+ (GBoxedCopyFunc)gdk_cursor_ref,
+ (GBoxedFreeFunc)gdk_cursor_unref);
+ return our_type;
}
+/**
+ * gdk_cursor_ref:
+ * @cursor: a #GdkCursor
+ *
+ * Adds a reference to @cursor.
+ *
+ * Return value: Same @cursor that was passed in
+ **/
GdkCursor*
-gdk_cursor_new_from_pixmap (GdkPixmap *source, GdkPixmap *mask, GdkColor *fg, GdkColor *bg, gint x, gint y)
+gdk_cursor_ref (GdkCursor *cursor)
{
- GdkCursorPrivate *private;
- GdkCursor *cursor;
- Pixmap source_pixmap, mask_pixmap;
- Cursor xcursor;
- XColor xfg, xbg;
-
- source_pixmap = GDK_DRAWABLE_XID (source);
- mask_pixmap = GDK_DRAWABLE_XID (mask);
+ g_return_val_if_fail (cursor != NULL, NULL);
+ g_return_val_if_fail (cursor->ref_count > 0, NULL);
- xfg.pixel = fg->pixel;
- xfg.red = fg->red;
- xfg.blue = fg->blue;
- xfg.green = fg->green;
- xbg.pixel = bg->pixel;
- xbg.red = bg->red;
- xbg.blue = bg->blue;
- xbg.green = bg->green;
-
- xcursor = XCreatePixmapCursor (gdk_display, source_pixmap, mask_pixmap, &xfg, &xbg, x, y);
- private = g_new (GdkCursorPrivate, 1);
- private->xdisplay = gdk_display;
- private->xcursor = xcursor;
- cursor = (GdkCursor *) private;
- cursor->type = GDK_CURSOR_IS_PIXMAP;
+ cursor->ref_count += 1;
return cursor;
}
+/**
+ * gdk_cursor_unref:
+ * @cursor: a #GdkCursor
+ *
+ * Removes a reference from @cursor, deallocating the cursor
+ * if no references remain.
+ *
+ **/
void
-gdk_cursor_destroy (GdkCursor *cursor)
+gdk_cursor_unref (GdkCursor *cursor)
{
- GdkCursorPrivate *private;
-
g_return_if_fail (cursor != NULL);
+ g_return_if_fail (cursor->ref_count > 0);
- private = (GdkCursorPrivate *) cursor;
- XFreeCursor (private->xdisplay, private->xcursor);
+ cursor->ref_count -= 1;
- g_free (private);
+ if (cursor->ref_count == 0)
+ _gdk_cursor_destroy (cursor);
}
+