]> Pileus Git - ~andy/gtk/blobdiff - gdk/broadway/gdkcursor-broadway.c
Change FSF Address
[~andy/gtk] / gdk / broadway / gdkcursor-broadway.c
index 28e64fe9a97397962bec85b5b0407d0469d8bce7..92acbdaee6272f680e5de9e12c82211803bdec2b 100644 (file)
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -31,6 +29,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "gdkcursor.h"
+#include "gdkcursorprivate.h"
 
 #include "gdkprivate-broadway.h"
 #include "gdkdisplay-broadway.h"
 #include <string.h>
 #include <errno.h>
 
-
-/* Called by gdk_display_x11_finalize to flush any cached cursors
- * for a dead display.
- */
-void
-_gdk_x11_cursor_display_finalize (GdkDisplay *display)
+struct _GdkBroadwayCursor
 {
-}
+  GdkCursor cursor;
+};
 
-GdkCursor*
-gdk_cursor_new_for_display (GdkDisplay    *display,
-                           GdkCursorType  cursor_type)
+struct _GdkBroadwayCursorClass
 {
-  GdkCursorPrivate *private;
-  GdkCursor *cursor;
+  GdkCursorClass cursor_class;
+};
 
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+/*** GdkBroadwayCursor ***/
 
-  private = g_new (GdkCursorPrivate, 1);
-  private->display = display;
+G_DEFINE_TYPE (GdkBroadwayCursor, gdk_broadway_cursor, GDK_TYPE_CURSOR)
 
-  cursor = (GdkCursor *) private;
-  cursor->type = cursor_type;
-  cursor->ref_count = 1;
+static GdkPixbuf* gdk_broadway_cursor_get_image (GdkCursor *cursor);
 
-  return cursor;
+static void
+gdk_broadway_cursor_finalize (GObject *object)
+{
+  G_OBJECT_CLASS (gdk_broadway_cursor_parent_class)->finalize (object);
 }
 
-void
-_gdk_cursor_destroy (GdkCursor *cursor)
+static void
+gdk_broadway_cursor_class_init (GdkBroadwayCursorClass *xcursor_class)
 {
-  GdkCursorPrivate *private;
+  GdkCursorClass *cursor_class = GDK_CURSOR_CLASS (xcursor_class);
+  GObjectClass *object_class = G_OBJECT_CLASS (xcursor_class);
 
-  g_return_if_fail (cursor != NULL);
-  g_return_if_fail (cursor->ref_count == 0);
-
-  private = (GdkCursorPrivate *) cursor;
+  object_class->finalize = gdk_broadway_cursor_finalize;
 
-  g_free (private);
+  cursor_class->get_image = gdk_broadway_cursor_get_image;
 }
 
+static void
+gdk_broadway_cursor_init (GdkBroadwayCursor *cursor)
+{
+}
 
-/**
- * gdk_cursor_get_display:
- * @cursor: a #GdkCursor.
- *
- * Returns the display on which the #GdkCursor is defined.
- *
- * Returns: the #GdkDisplay associated to @cursor
- *
- * Since: 2.2
+/* Called by gdk_display_broadway_finalize to flush any cached cursors
+ * for a dead display.
  */
+void
+_gdk_broadway_cursor_display_finalize (GdkDisplay *display)
+{
+}
 
-GdkDisplay *
-gdk_cursor_get_display (GdkCursor *cursor)
+GdkCursor*
+_gdk_broadway_display_get_cursor_for_type (GdkDisplay    *display,
+                                          GdkCursorType  cursor_type)
 {
-  g_return_val_if_fail (cursor != NULL, NULL);
+  GdkBroadwayCursor *private;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
+
+  private = g_object_new (GDK_TYPE_BROADWAY_CURSOR,
+                          "cursor-type", cursor_type,
+                          "display", display,
+                         NULL);
 
-  return ((GdkCursorPrivate *)cursor)->display;
+  return GDK_CURSOR (private);
 }
 
-GdkPixbuf*
-gdk_cursor_get_image (GdkCursor *cursor)
+static GdkPixbuf*
+gdk_broadway_cursor_get_image (GdkCursor *cursor)
 {
   g_return_val_if_fail (cursor != NULL, NULL);
 
@@ -108,62 +108,45 @@ gdk_cursor_get_image (GdkCursor *cursor)
 }
 
 void
-gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-                                 const gchar *theme,
-                                 const gint   size)
-{
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-}
-
-void
-_gdk_x11_cursor_update_theme (GdkCursor *cursor)
+_gdk_broadway_cursor_update_theme (GdkCursor *cursor)
 {
   g_return_if_fail (cursor != NULL);
 }
 
 GdkCursor *
-gdk_cursor_new_from_pixbuf (GdkDisplay *display,
-                           GdkPixbuf  *pixbuf,
-                           gint        x,
-                           gint        y)
+_gdk_broadway_display_get_cursor_for_pixbuf (GdkDisplay *display,
+                                            GdkPixbuf  *pixbuf,
+                                            gint        x,
+                                            gint        y)
 {
-  GdkCursorPrivate *private;
+  GdkBroadwayCursor *private;
   GdkCursor *cursor;
 
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-
-  private = g_new (GdkCursorPrivate, 1);
-  private->display = display;
-
+  private = g_object_new (GDK_TYPE_BROADWAY_CURSOR, 
+                          "cursor-type", GDK_CURSOR_IS_PIXMAP,
+                          "display", display,
+                          NULL);
   cursor = (GdkCursor *) private;
-  cursor->type = GDK_CURSOR_IS_PIXMAP;
-  cursor->ref_count = 1;
 
   return cursor;
 }
 
 GdkCursor*
-gdk_cursor_new_from_name (GdkDisplay  *display,
-                         const gchar *name)
+_gdk_broadway_display_get_cursor_for_name (GdkDisplay  *display,
+                                          const gchar *name)
 {
-  GdkCursorPrivate *private;
-  GdkCursor *cursor;
+  GdkBroadwayCursor *private;
 
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-
-  private = g_new (GdkCursorPrivate, 1);
-  private->display = display;
+  private = g_object_new (GDK_TYPE_BROADWAY_CURSOR,
+                          "cursor-type", GDK_CURSOR_IS_PIXMAP,
+                          "display", display,
+                          NULL);
 
-  cursor = (GdkCursor *) private;
-  cursor->type = GDK_CURSOR_IS_PIXMAP;
-  cursor->ref_count = 1;
-
-  return cursor;
+  return GDK_CURSOR (private);
 }
 
 gboolean
-gdk_display_supports_cursor_alpha (GdkDisplay *display)
+_gdk_broadway_display_supports_cursor_alpha (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
 
@@ -171,25 +154,27 @@ gdk_display_supports_cursor_alpha (GdkDisplay *display)
 }
 
 gboolean
-gdk_display_supports_cursor_color (GdkDisplay *display)
+_gdk_broadway_display_supports_cursor_color (GdkDisplay *display)
 {
   g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
 
   return TRUE;
 }
 
-guint
-gdk_display_get_default_cursor_size (GdkDisplay *display)
+void
+_gdk_broadway_display_get_default_cursor_size (GdkDisplay *display,
+                                              guint      *width,
+                                              guint      *height)
 {
-  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+  g_return_if_fail (GDK_IS_DISPLAY (display));
 
-  return 20;
+  *width = *height = 20;
 }
 
 void
-gdk_display_get_maximal_cursor_size (GdkDisplay *display,
-                                    guint       *width,
-                                    guint       *height)
+_gdk_broadway_display_get_maximal_cursor_size (GdkDisplay *display,
+                                              guint       *width,
+                                              guint       *height)
 {
   g_return_if_fail (GDK_IS_DISPLAY (display));