brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Public API around MetaCompWindow actor

Browse Source 
Added accessors for xwindow, window type and workspace number.
This commit is contained in:
Tomas Frydrych 2008-10-07 14:52:21 +01:00
parent 93c316f3b8
commit cc50d99712
2 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,31 +140,8 @@ typedef struct _MetaCompScreen
} MetaCompScreen; } MetaCompScreen;
/* /*
* MetaCompWindow object (ClutterGroup sub-class) * MetaCompWindow implementation
*/ */
#define META_TYPE_COMP_WINDOW (meta_comp_window_get_type ())
#define META_COMP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_COMP_WINDOW, MetaCompWindow))
#define META_COMP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_COMP_WINDOW, MetaCompWindowClass))
#define IS_META_COMP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_COMP_WINDOW_TYPE))
#define META_IS_COMP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_COMP_WINDOW))
#define META_COMP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_COMP_WINDOW, MetaCompWindowClass))
typedef struct _MetaCompWindow MetaCompWindow;
typedef struct _MetaCompWindowClass MetaCompWindowClass;
typedef struct _MetaCompWindowPrivate MetaCompWindowPrivate;
struct _MetaCompWindowClass
{
ClutterGroupClass parent_class;
};
struct _MetaCompWindow
{
ClutterGroup parent;
MetaCompWindowPrivate *priv;
};
struct _MetaCompWindowPrivate struct _MetaCompWindowPrivate
{ {
XWindowAttributes attrs; XWindowAttributes attrs;
@ -227,11 +204,9 @@ static void meta_comp_window_get_property (GObject *object,
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void meta_comp_window_get_window_type (MetaCompWindow *self); static void meta_comp_window_query_window_type (MetaCompWindow *self);
static void meta_comp_window_detach (MetaCompWindow *self); static void meta_comp_window_detach (MetaCompWindow *self);
GType meta_comp_window_get_type (void);
G_DEFINE_TYPE (MetaCompWindow, meta_comp_window, CLUTTER_TYPE_GROUP); G_DEFINE_TYPE (MetaCompWindow, meta_comp_window, CLUTTER_TYPE_GROUP);
static void static void
@ -316,7 +291,7 @@ meta_comp_window_constructed (GObject *object)
Display *xdisplay = meta_display_get_xdisplay (display); Display *xdisplay = meta_display_get_xdisplay (display);
XRenderPictFormat *format; XRenderPictFormat *format;
meta_comp_window_get_window_type (self); meta_comp_window_query_window_type (self);
#ifdef HAVE_SHAPE #ifdef HAVE_SHAPE
/* Listen for ShapeNotify events on the window */ /* Listen for ShapeNotify events on the window */
@ -511,7 +486,7 @@ find_window_for_child_window_in_display (MetaDisplay *display, Window xwindow)
} }
static void static void
meta_comp_window_get_window_type (MetaCompWindow *self) meta_comp_window_query_window_type (MetaCompWindow *self)
{ {
MetaCompWindowPrivate *priv = self->priv; MetaCompWindowPrivate *priv = self->priv;
MetaScreen *screen = priv->screen; MetaScreen *screen = priv->screen;
@ -706,6 +681,43 @@ meta_comp_window_has_shadow (MetaCompWindow *self)
return FALSE; return FALSE;
} }
Window
meta_comp_window_get_x_window (MetaCompWindow *mcw)
{
if (!mcw)
return None;
return mcw->priv->xwindow;
}
MetaCompWindowType
meta_comp_window_get_window_type (MetaCompWindow *mcw)
{
if (!mcw)
return 0;
return mcw->priv->type;
}
gint
meta_comp_window_get_workspace (MetaCompWindow *mcw)
{
MetaCompWindowPrivate *priv;
MetaWorkspace *workspace;
if (!mcw)
return -1;
priv = mcw->priv;
if (!priv->window || meta_window_is_on_all_workspaces (priv->window))
return -1;
workspace = meta_window_get_workspace (priv->window);
return meta_workspace_index (workspace);
}
static void repair_win (MetaCompWindow *cw); static void repair_win (MetaCompWindow *cw);
static void map_win (MetaCompWindow *cw); static void map_win (MetaCompWindow *cw);
static void unmap_win (MetaCompWindow *cw); static void unmap_win (MetaCompWindow *cw);
@ -1626,7 +1638,7 @@ process_property_notify (MetaCompositorClutter *compositor,
if (!cw) if (!cw)
return; return;
meta_comp_window_get_window_type (cw); meta_comp_window_query_window_type (cw);
return; return;
} }
} }

32
src/compositor/compositor-clutter.h
View File

@ -32,4 +32,36 @@ MetaCompositor *meta_compositor_clutter_new (MetaDisplay *display);
void meta_compositor_clutter_window_effect_completed (ClutterActor *actor, gulong event); void meta_compositor_clutter_window_effect_completed (ClutterActor *actor, gulong event);
/*
* MetaCompWindow object (ClutterGroup sub-class)
*/
#define META_TYPE_COMP_WINDOW (meta_comp_window_get_type ())
#define META_COMP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_COMP_WINDOW, MetaCompWindow))
#define META_COMP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_COMP_WINDOW, MetaCompWindowClass))
#define IS_META_COMP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_COMP_WINDOW_TYPE))
#define META_IS_COMP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_COMP_WINDOW))
#define META_COMP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_COMP_WINDOW, MetaCompWindowClass))
typedef struct _MetaCompWindow MetaCompWindow;
typedef struct _MetaCompWindowClass MetaCompWindowClass;
typedef struct _MetaCompWindowPrivate MetaCompWindowPrivate;
struct _MetaCompWindowClass
{
ClutterGroupClass parent_class;
};
struct _MetaCompWindow
{
ClutterGroup parent;
MetaCompWindowPrivate *priv;
};
GType meta_comp_window_get_type (void);
Window meta_comp_window_get_x_window (MetaCompWindow *mcw);
MetaCompWindowType meta_comp_window_get_window_type (MetaCompWindow *mcw);
gint meta_comp_window_get_workspace (MetaCompWindow *mcw);
#endif #endif