isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-10 16:16:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make MetaShapedTexture a subclass of ClutterGLXTexturePixmap and use

Browse Source 
it for window actors.
This commit is contained in:
Neil Roberts 2008-09-24 21:48:02 +01:00
parent 0bbe8b8004
commit 19d338cb50
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compositor/compositor-clutter.c
View File

@ -19,6 +19,7 @@
#include "compositor-clutter.h" #include "compositor-clutter.h"
#include "compositor-clutter-plugin-manager.h" #include "compositor-clutter-plugin-manager.h"
#include "xprops.h" #include "xprops.h"
#include "shaped-texture.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xlibint.h> #include <X11/Xlibint.h>
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
@ -347,7 +348,7 @@ meta_comp_window_constructed (GObject *object)
clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->shadow); clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->shadow);
} }
priv->actor = clutter_glx_texture_pixmap_new (); priv->actor = meta_shaped_texture_new ();
clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor); clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor);
} }

3
src/compositor/shaped-texture.c
View File

@ -24,6 +24,7 @@
*/ */
#include <clutter/clutter-texture.h> #include <clutter/clutter-texture.h>
#include <clutter/glx/clutter-glx.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <string.h> #include <string.h>
@ -39,7 +40,7 @@ static void meta_shaped_texture_pick (ClutterActor *actor,
static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex); static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture, G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
CLUTTER_TYPE_TEXTURE); CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
#define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \ #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \ (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \

5
src/compositor/shaped-texture.h
View File

@ -27,6 +27,7 @@
#define __META_SHAPED_TEXTURE_H__ #define __META_SHAPED_TEXTURE_H__
#include <clutter/clutter-texture.h> #include <clutter/clutter-texture.h>
#include <clutter/glx/clutter-glx.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -57,12 +58,12 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;
struct _MetaShapedTextureClass struct _MetaShapedTextureClass
{ {
ClutterTextureClass parent_class; ClutterGLXTexturePixmapClass parent_class;
}; };
struct _MetaShapedTexture struct _MetaShapedTexture
{ {
ClutterTexture parent; ClutterGLXTexturePixmap parent;
MetaShapedTexturePrivate *priv; MetaShapedTexturePrivate *priv;
}; };