diff --git a/src/Makefile.am b/src/Makefile.am index 686d6627f..d28316961 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,6 +77,7 @@ libmutter_la_SOURCES = \ compositor/meta-shadow-factory.c \ compositor/meta-shadow-factory-private.h \ compositor/meta-shaped-texture.c \ + compositor/meta-shaped-texture-private.h \ compositor/meta-texture-rectangle.c \ compositor/meta-texture-rectangle.h \ compositor/meta-texture-tower.c \ diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h new file mode 100644 index 000000000..907596a1e --- /dev/null +++ b/src/compositor/meta-shaped-texture-private.h @@ -0,0 +1,50 @@ +/* + * shaped texture + * + * An actor to draw a texture clipped to a list of rectangles + * + * Authored By Neil Roberts + * + * Copyright (C) 2008 Intel Corporation + * 2013 Red Hat, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program 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 + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ + +#ifndef __META_SHAPED_TEXTURE_PRIVATE_H__ +#define __META_SHAPED_TEXTURE_PRIVATE_H__ + +#include +#ifdef HAVE_WAYLAND +#include "meta-wayland-private.h" +#endif + +ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow); +#ifdef HAVE_WAYLAND +ClutterActor *meta_shaped_texture_new_with_wayland_surface (MetaWaylandSurface *surface); +void meta_shaped_texture_set_wayland_surface (MetaShapedTexture *stex, + MetaWaylandSurface *surface); +MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex); +#endif + +void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex, + Pixmap pixmap); +#ifdef HAVE_WAYLAND +void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture *stex, + MetaWaylandBuffer *buffer); +#endif + +#endif diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c index f0279f95c..4af53ff21 100644 --- a/src/compositor/meta-shaped-texture.c +++ b/src/compositor/meta-shaped-texture.c @@ -33,6 +33,7 @@ #include #include "meta-texture-tower.h" +#include "meta-shaped-texture-private.h" #ifdef HAVE_WAYLAND #include "meta-wayland-private.h" #include diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index f7d61f6ef..5ff27f1d9 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -28,6 +28,7 @@ #include "xprops.h" #include "compositor-private.h" +#include "meta-shaped-texture-private.h" #include "meta-shadow-factory-private.h" #include "meta-window-actor-private.h" #include "meta-texture-rectangle.h" diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h index 2809b25f8..080554198 100644 --- a/src/meta/meta-shaped-texture.h +++ b/src/meta/meta-shaped-texture.h @@ -29,11 +29,6 @@ #include #include -#ifdef HAVE_WAYLAND -#include -#include "meta-wayland-private.h" -#endif - G_BEGIN_DECLS #define META_TYPE_SHAPED_TEXTURE (meta_shaped_texture_get_type()) @@ -69,14 +64,6 @@ struct _MetaShapedTexture GType meta_shaped_texture_get_type (void) G_GNUC_CONST; -ClutterActor *meta_shaped_texture_new_with_xwindow (Window xwindow); -#ifdef HAVE_WAYLAND -ClutterActor *meta_shaped_texture_new_with_wayland_surface (MetaWaylandSurface *surface); -void meta_shaped_texture_set_wayland_surface (MetaShapedTexture *stex, - MetaWaylandSurface *surface); -MetaWaylandSurface *meta_shaped_texture_get_wayland_surface (MetaShapedTexture *stex); -#endif - void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex, gboolean create_mipmaps); @@ -86,13 +73,6 @@ void meta_shaped_texture_update_area (MetaShapedTexture *stex, int width, int height); -void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex, - Pixmap pixmap); -#ifdef HAVE_WAYLAND -void meta_shaped_texture_attach_wayland_buffer (MetaShapedTexture *stex, - MetaWaylandBuffer *buffer); -#endif - CoglTexture * meta_shaped_texture_get_texture (MetaShapedTexture *stex); void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex, diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c index 3ea739919..82dcb20b0 100644 --- a/src/wayland/meta-wayland-seat.c +++ b/src/wayland/meta-wayland-seat.c @@ -35,6 +35,7 @@ #include "meta-wayland-data-device.h" #include "meta-window-actor-private.h" #include "meta/meta-shaped-texture.h" +#include "meta-shaped-texture-private.h" #include "meta-wayland-stage.h" #include "meta-cursor-tracker-private.h"