summaryrefslogtreecommitdiff
path: root/gdk/directfb
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2010-07-22 03:55:27 +0200
committerBenjamin Otte <otte@redhat.com>2010-08-10 21:02:29 +0200
commit6a48a042c7a2f61707eeb1f7bfa6438f63be7c04 (patch)
treee62a50902838edcc890dd2cdf86e708aa099d8b6 /gdk/directfb
parent0fa7d810e7091e721f381898b9ac138f5c2b97fc (diff)
downloadgtk+-6a48a042c7a2f61707eeb1f7bfa6438f63be7c04.tar.gz
API: remove GdkGC
XXX: Some traces in the win32 code are left. I suppose they'd best be replaced using Cairo.
Diffstat (limited to 'gdk/directfb')
-rw-r--r--gdk/directfb/Makefile.am1
-rw-r--r--gdk/directfb/gdkgc-directfb.c386
-rw-r--r--gdk/directfb/gdkprivate-directfb.h25
3 files changed, 0 insertions, 412 deletions
diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am
index a11f9debac..bfc477109b 100644
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@@ -27,7 +27,6 @@ libgdk_directfb_la_SOURCES = \
gdkdisplay-directfb.h \
gdkdrawable-directfb.c \
gdkevents-directfb.c \
- gdkgc-directfb.c \
gdkgeometry-directfb.c \
gdkglobals-directfb.c \
gdkim-directfb.c \
diff --git a/gdk/directfb/gdkgc-directfb.c b/gdk/directfb/gdkgc-directfb.c
deleted file mode 100644
index a69652369e..0000000000
--- a/gdk/directfb/gdkgc-directfb.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * 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 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
- * 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.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
- * file for a list of people on the GTK+ Team.
- */
-
-/*
- * GTK+ DirectFB backend
- * Copyright (C) 2001-2002 convergence integrated media GmbH
- * Copyright (C) 2002-2004 convergence GmbH
- * Written by Denis Oliver Kropp <dok@convergence.de> and
- * Sven Neumann <sven@convergence.de>
- */
-
-#undef GDK_DISABLE_DEPRECATED
-
-#include "config.h"
-#include "gdk.h"
-
-#include <string.h>
-
-#include "gdkdirectfb.h"
-#include "gdkprivate-directfb.h"
-
-#include "gdkgc.h"
-#include "gdkpixmap.h"
-
-static void gdk_directfb_gc_get_values (GdkGC *gc,
- GdkGCValues *values);
-static void gdk_directfb_gc_set_values (GdkGC *gc,
- GdkGCValues *values,
- GdkGCValuesMask values_mask);
-static void gdk_directfb_gc_set_dashes (GdkGC *gc,
- gint dash_offset,
- gint8 dash_list[],
- gint n);
-
-
-static void gdk_gc_directfb_finalize (GObject *object);
-
-G_DEFINE_TYPE (GdkGCDirectFB, _gdk_gc_directfb, GDK_TYPE_GC)
-
-static void
-_gdk_gc_directfb_init (GdkGCDirectFB *directfb_gc)
-{
-}
-
-static void
-_gdk_gc_directfb_class_init (GdkGCDirectFBClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GdkGCClass *gc_class = GDK_GC_CLASS (klass);
-
- object_class->finalize = gdk_gc_directfb_finalize;
-
- gc_class->get_values = gdk_directfb_gc_get_values;
- gc_class->set_values = gdk_directfb_gc_set_values;
- gc_class->set_dashes = gdk_directfb_gc_set_dashes;
-}
-
-static void
-gdk_gc_directfb_finalize (GObject *object)
-{
- GdkGCDirectFB *directfb_gc = GDK_GC_DIRECTFB (object);
-
- if (directfb_gc->clip_region.numRects)
- temp_region_deinit (&directfb_gc->clip_region);
- if (directfb_gc->values.clip_mask)
- g_object_unref (directfb_gc->values.clip_mask);
- if (directfb_gc->values.stipple)
- g_object_unref (directfb_gc->values.stipple);
- if (directfb_gc->values.tile)
- g_object_unref (directfb_gc->values.tile);
-
- G_OBJECT_CLASS (_gdk_gc_directfb_parent_class)->finalize (object);
-}
-
-
-GdkGC *
-_gdk_directfb_gc_new (GdkDrawable *drawable,
- GdkGCValues *values,
- GdkGCValuesMask values_mask)
-{
- GdkGC *gc;
- GdkGCDirectFB *private;
-
- /* NOTICE that the drawable here has to be the impl drawable, not the
- publicly visible drawable. */
- g_return_val_if_fail (GDK_IS_DRAWABLE_IMPL_DIRECTFB (drawable), NULL);
-
- gc = GDK_GC (g_object_new (_gdk_gc_directfb_get_type (), NULL));
-
- _gdk_gc_init (gc, drawable, values, values_mask);
-
- private = GDK_GC_DIRECTFB (gc);
-#if 0
- private->values.background.pixel = 0;
- private->values.background.red =
- private->values.background.green =
- private->values.background.blue = 0;
-
- private->values.foreground.pixel = 0;
- private->values.foreground.red =
- private->values.foreground.green =
- private->values.foreground.blue = 0;
-#endif
-
- private->values.cap_style = GDK_CAP_BUTT;
-
- gdk_directfb_gc_set_values (gc, values, values_mask);
-
- return gc;
-}
-
-static void
-gdk_directfb_gc_get_values (GdkGC *gc,
- GdkGCValues *values)
-{
- *values = GDK_GC_DIRECTFB (gc)->values;
-}
-
-#if 0
-void
-_gdk_windowing_gc_get_foreground (GdkGC *gc,
- GdkColor *color)
-{
- GdkGCDirectFB *private;
- private = GDK_GC_DIRECTFB (gc);
- *color =private->values.foreground;
-
-
-}
-#endif
-
-static void
-gdk_directfb_gc_set_values (GdkGC *gc,
- GdkGCValues *values,
- GdkGCValuesMask values_mask)
-{
- GdkGCDirectFB *private = GDK_GC_DIRECTFB (gc);
-
- if (values_mask & GDK_GC_FOREGROUND)
- {
- private->values.foreground = values->foreground;
- private->values_mask |= GDK_GC_FOREGROUND;
- }
-
- if (values_mask & GDK_GC_BACKGROUND)
- {
- private->values.background = values->background;
- private->values_mask |= GDK_GC_BACKGROUND;
- }
-
- if (values_mask & GDK_GC_FUNCTION)
- {
- private->values.function = values->function;
- private->values_mask |= GDK_GC_FUNCTION;
- }
-
- if (values_mask & GDK_GC_FILL)
- {
- private->values.fill = values->fill;
- private->values_mask |= GDK_GC_FILL;
- }
-
- if (values_mask & GDK_GC_TILE)
- {
- GdkPixmap *oldpm = private->values.tile;
-
- if (values->tile)
- g_assert (GDK_PIXMAP_OBJECT (values->tile)->depth > 1);
-
- private->values.tile = values->tile ? g_object_ref (values->tile) : NULL;
- private->values_mask |= GDK_GC_TILE;
-
- if (oldpm)
- g_object_unref (oldpm);
- }
-
- if (values_mask & GDK_GC_STIPPLE)
- {
- GdkPixmap *oldpm = private->values.stipple;
-
- if (values->stipple)
- g_assert (GDK_PIXMAP_OBJECT (values->stipple)->depth == 1);
-
- private->values.stipple = (values->stipple ?
- g_object_ref (values->stipple) : NULL);
- private->values_mask |= GDK_GC_STIPPLE;
-
- if (oldpm)
- g_object_unref (oldpm);
- }
-
- if (values_mask & GDK_GC_CLIP_MASK)
- {
- GdkPixmap *oldpm = private->values.clip_mask;
-
- private->values.clip_mask = (values->clip_mask ?
- g_object_ref (values->clip_mask) : NULL);
- private->values_mask |= GDK_GC_CLIP_MASK;
-
- if (oldpm)
- g_object_unref (oldpm);
-
- temp_region_reset (&private->clip_region);
- }
-
- if (values_mask & GDK_GC_SUBWINDOW)
- {
- private->values.subwindow_mode = values->subwindow_mode;
- private->values_mask |= GDK_GC_SUBWINDOW;
- }
-
- if (values_mask & GDK_GC_TS_X_ORIGIN)
- {
- private->values.ts_x_origin = values->ts_x_origin;
- private->values_mask |= GDK_GC_TS_X_ORIGIN;
- }
-
- if (values_mask & GDK_GC_TS_Y_ORIGIN)
- {
- private->values.ts_y_origin = values->ts_y_origin;
- private->values_mask |= GDK_GC_TS_Y_ORIGIN;
- }
-
- if (values_mask & GDK_GC_CLIP_X_ORIGIN)
- {
- private->values.clip_x_origin = GDK_GC (gc)->clip_x_origin = values->clip_x_origin;
- private->values_mask |= GDK_GC_CLIP_X_ORIGIN;
- }
-
- if (values_mask & GDK_GC_CLIP_Y_ORIGIN)
- {
- private->values.clip_y_origin = GDK_GC (gc)->clip_y_origin = values->clip_y_origin;
- private->values_mask |= GDK_GC_CLIP_Y_ORIGIN;
- }
-
- if (values_mask & GDK_GC_EXPOSURES)
- {
- private->values.graphics_exposures = values->graphics_exposures;
- private->values_mask |= GDK_GC_EXPOSURES;
- }
-
- if (values_mask & GDK_GC_LINE_WIDTH)
- {
- private->values.line_width = values->line_width;
- private->values_mask |= GDK_GC_LINE_WIDTH;
- }
-
- if (values_mask & GDK_GC_LINE_STYLE)
- {
- private->values.line_style = values->line_style;
- private->values_mask |= GDK_GC_LINE_STYLE;
- }
-
- if (values_mask & GDK_GC_CAP_STYLE)
- {
- private->values.cap_style = values->cap_style;
- private->values_mask |= GDK_GC_CAP_STYLE;
- }
-
- if (values_mask & GDK_GC_JOIN_STYLE)
- {
- private->values.join_style = values->join_style;
- private->values_mask |= GDK_GC_JOIN_STYLE;
- }
-}
-
-static void
-gdk_directfb_gc_set_dashes (GdkGC *gc,
- gint dash_offset,
- gint8 dash_list[],
- gint n)
-{
- g_warning ("gdk_directfb_gc_set_dashes not implemented");
-}
-
-static void
-gc_unset_clip_mask (GdkGC *gc)
-{
- GdkGCDirectFB *data = GDK_GC_DIRECTFB (gc);
-
- if (data->values.clip_mask)
- {
- g_object_unref (data->values.clip_mask);
- data->values.clip_mask = NULL;
- data->values_mask &= ~ GDK_GC_CLIP_MASK;
- }
-}
-
-
-void
-_gdk_windowing_gc_set_clip_region (GdkGC *gc,
- const cairo_region_t *region,
- gboolean reset_origin)
-{
- GdkGCDirectFB *data;
-
- g_return_if_fail (gc != NULL);
-
- data = GDK_GC_DIRECTFB (gc);
-
- if (region == &data->clip_region)
- return;
-
- if (region)
- temp_region_init_copy (&data->clip_region, region);
- else
- temp_region_reset (&data->clip_region);
-
- if (reset_origin)
- {
- gc->clip_x_origin = 0;
- gc->clip_y_origin = 0;
- data->values.clip_x_origin = 0;
- data->values.clip_y_origin = 0;
- }
-
- gc_unset_clip_mask (gc);
-}
-
-void
-_gdk_windowing_gc_copy (GdkGC *dst_gc,
- GdkGC *src_gc)
-{
- GdkGCDirectFB *dst_private;
-
- g_return_if_fail (dst_gc != NULL);
- g_return_if_fail (src_gc != NULL);
-
- dst_private = GDK_GC_DIRECTFB (dst_gc);
-
- temp_region_reset(&dst_private->clip_region);
-
- if (dst_private->values_mask & GDK_GC_TILE)
- g_object_unref (dst_private->values.tile);
- if (dst_private->values_mask & GDK_GC_STIPPLE)
- g_object_unref (dst_private->values.stipple);
- if (dst_private->values_mask & GDK_GC_CLIP_MASK)
- g_object_unref (dst_private->values.clip_mask);
-
- *dst_gc = *src_gc;
- if (dst_private->values_mask & GDK_GC_TILE)
- g_object_ref (dst_private->values.tile);
- if (dst_private->values_mask & GDK_GC_STIPPLE)
- g_object_ref (dst_private->values.stipple);
- if (dst_private->values_mask & GDK_GC_CLIP_MASK)
- g_object_ref (dst_private->values.clip_mask);
-}
-
-/**
- * gdk_gc_get_screen:
- * @gc: a #GdkGC.
- *
- * Gets the #GdkScreen for which @gc was created
- *
- * Returns: the #GdkScreen for @gc.
- *
- * Since: 2.2
- */
-GdkScreen *
-gdk_gc_get_screen (GdkGC *gc)
-{
- g_return_val_if_fail (GDK_IS_GC_DIRECTFB (gc), NULL);
-
- return _gdk_screen;
-}
diff --git a/gdk/directfb/gdkprivate-directfb.h b/gdk/directfb/gdkprivate-directfb.h
index 9929998f40..bc351253fd 100644
--- a/gdk/directfb/gdkprivate-directfb.h
+++ b/gdk/directfb/gdkprivate-directfb.h
@@ -198,31 +198,6 @@ typedef struct
DFBSurfacePixelFormat format;
} GdkVisualDirectFB;
-#define GDK_TYPE_GC_DIRECTFB (_gdk_gc_directfb_get_type ())
-#define GDK_GC_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_DIRECTFB, GdkGCDirectFB))
-#define GDK_IS_GC_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC_DIRECTFB))
-
-typedef struct
-{
- GdkGC parent_instance;
-
- cairo_region_t clip_region;
-
- GdkGCValuesMask values_mask;
- GdkGCValues values;
-} GdkGCDirectFB;
-
-typedef struct
-{
- GdkGCClass parent_class;
-} GdkGCDirectFBClass;
-
-GType _gdk_gc_directfb_get_type (void);
-
-GdkGC * _gdk_directfb_gc_new (GdkDrawable *drawable,
- GdkGCValues *values,
- GdkGCValuesMask values_mask);
-
void gdk_directfb_event_windows_add (GdkWindow *window);
void gdk_directfb_event_windows_remove (GdkWindow *window);