callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

quartz: turn quartz GdkCursor into GObject

Browse Source
This commit is contained in:
Kristian Rietveld
2010-12-22 10:45:07 +01:00
parent bd1ff477ca
commit 3ace122563
2 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
gdk/quartz/gdkcursor-quartz.c
View File

@ -22,27 +22,51 @@
#include "gdkdisplay.h" #include "gdkdisplay.h"
#include "gdkcursor.h" #include "gdkcursor.h"
#include "gdkcursorprivate.h"
#include "gdkprivate-quartz.h" #include "gdkprivate-quartz.h"
#include "xcursors.h" #include "xcursors.h"
static GType gdk_quartz_cursor_get_type (void);
#define GDK_TYPE_QUARTZ_CURSOR (gdk_quartz_cursor_get_type ())
#define GDK_QUARTZ_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_QUARTZ_CURSOR, GdkQuartzCursor))
#define GDK_QUARTZ_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_QUARTZ_CURSOR, GdkQuartzCursorClass))
#define GDK_IS_QUARTZ_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_QUARTZ_CURSOR))
#define GDK_IS_QUARTZ_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_QUARTZ_CURSOR))
#define GDK_QUARTZ_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_QUARTZ_CURSOR, GdkQuartzCursorClass))
typedef struct _GdkQuartzCursor GdkQuartzCursor;
typedef struct _GdkQuartzCursorClass GdkQuartzCursorClass;
struct _GdkQuartzCursor
{
GdkCursor cursor;
NSCursor *nscursor;
};
struct _GdkQuartzCursorClass
{
GdkCursorClass cursor_class;
};
static GdkCursor *cached_xcursors[G_N_ELEMENTS (xcursors)]; static GdkCursor *cached_xcursors[G_N_ELEMENTS (xcursors)];
static GdkCursor * static GdkCursor *
gdk_quartz_cursor_new_from_nscursor (NSCursor *nscursor, gdk_quartz_cursor_new_from_nscursor (NSCursor *nscursor,
GdkCursorType cursor_type) GdkCursorType cursor_type)
{ {
GdkCursorPrivate *private; GdkQuartzCursor *private;
GdkCursor *cursor;
private = g_new (GdkCursorPrivate, 1); private = g_object_new (GDK_TYPE_QUARTZ_CURSOR,
"cursor-type", cursor_type,
"display", _gdk_display,
NULL);
private->nscursor = nscursor; private->nscursor = nscursor;
cursor = (GdkCursor *)private; return GDK_CURSOR (private);
cursor->type = cursor_type;
cursor->ref_count = 1;
return cursor;
} }
static GdkCursor * static GdkCursor *
@ -335,20 +359,37 @@ _gdk_quartz_display_get_cursor_for_name (GdkDisplay *display,
return NULL; return NULL;
} }
void G_DEFINE_TYPE (GdkQuartzCursor, gdk_quartz_cursor, GDK_TYPE_CURSOR)
_gdk_cursor_destroy (GdkCursor *cursor)
static GdkPixbuf *gdk_quartz_cursor_get_image (GdkCursor *cursor);
static void
gdk_quartz_cursor_finalize (GObject *object)
{ {
GdkCursorPrivate *private; GdkQuartzCursor *private = GDK_QUARTZ_CURSOR (object);
g_return_if_fail (cursor != NULL); if (private->nscursor)
g_return_if_fail (cursor->ref_count == 0); [private->nscursor release];
private->nscursor = NULL;
private = (GdkCursorPrivate *)cursor;
[private->nscursor release];
g_free (private);
} }
static void
gdk_quartz_cursor_class_init (GdkQuartzCursorClass *quartz_cursor_class)
{
GdkCursorClass *cursor_class = GDK_CURSOR_CLASS (quartz_cursor_class);
GObjectClass *object_class = G_OBJECT_CLASS (quartz_cursor_class);
object_class->finalize = gdk_quartz_cursor_finalize;
cursor_class->get_image = gdk_quartz_cursor_get_image;
}
static void
gdk_quartz_cursor_init (GdkQuartzCursor *cursor)
{
}
gboolean gboolean
_gdk_quartz_display_supports_cursor_alpha (GdkDisplay *display) _gdk_quartz_display_supports_cursor_alpha (GdkDisplay *display)
{ {
@ -381,8 +422,8 @@ _gdk_quartz_display_get_maximal_cursor_size (GdkDisplay *display,
*height = 65536; *height = 65536;
} }
GdkPixbuf * static GdkPixbuf *
gdk_cursor_get_image (GdkCursor *cursor) gdk_quartz_cursor_get_image (GdkCursor *cursor)
{ {
/* FIXME: Implement */ /* FIXME: Implement */
return NULL; return NULL;

6
gdk/quartz/gdkprivate-quartz.h
View File

@ -44,12 +44,6 @@ struct _GdkVisualClass
GObjectClass parent_class; GObjectClass parent_class;
}; };
struct _GdkCursorPrivate
{
GdkCursor cursor;
NSCursor *nscursor;
};
struct _GdkDragContextPrivate struct _GdkDragContextPrivate
{ {
id <NSDraggingInfo> dragging_info; id <NSDraggingInfo> dragging_info;