mirror of
https://github.com/brl/mutter.git
synced 2024-12-22 19:12:04 +00:00
2006-06-02 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-element.h: Add missing _depth() declarations * clutter/clutter-main.c: * clutter/clutter-main.h: * clutter/clutter-private.h: * clutter/clutter-stage.c: * clutter/clutter-stage.h: Rejig GL setup as for stage to support an offscreen property. Offscreen support is however a little borked.
This commit is contained in:
parent
6c471cb7e1
commit
ba09979db0
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
|||||||
|
2006-06-02 Matthew Allum <mallum@openedhand.com>
|
||||||
|
|
||||||
|
* clutter/clutter-element.h:
|
||||||
|
Add missing _depth() declarations
|
||||||
|
|
||||||
|
* clutter/clutter-main.c:
|
||||||
|
* clutter/clutter-main.h:
|
||||||
|
* clutter/clutter-private.h:
|
||||||
|
* clutter/clutter-stage.c:
|
||||||
|
* clutter/clutter-stage.h:
|
||||||
|
Rejig GL setup as for stage to support an offscreen property.
|
||||||
|
Offscreen support is however a little borked.
|
||||||
|
|
||||||
2006-06-01 Matthew Allum <mallum@openedhand.com>
|
2006-06-01 Matthew Allum <mallum@openedhand.com>
|
||||||
|
|
||||||
* clutter/clutter-element.c:
|
* clutter/clutter-element.c:
|
||||||
|
@ -256,6 +256,14 @@ clutter_element_raise_top (ClutterElement *self);
|
|||||||
void
|
void
|
||||||
clutter_element_lower_bottom (ClutterElement *self);
|
clutter_element_lower_bottom (ClutterElement *self);
|
||||||
|
|
||||||
|
void
|
||||||
|
clutter_element_set_depth (ClutterElement *self,
|
||||||
|
gint depth);
|
||||||
|
|
||||||
|
gint
|
||||||
|
clutter_element_get_depth (ClutterElement *self);
|
||||||
|
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -233,6 +233,9 @@ clutter_redraw ()
|
|||||||
static GTimer *timer = NULL;
|
static GTimer *timer = NULL;
|
||||||
static guint timer_n_frames = 0;
|
static guint timer_n_frames = 0;
|
||||||
|
|
||||||
|
/* FIXME: Should move all this into stage...
|
||||||
|
*/
|
||||||
|
|
||||||
CLUTTER_DBG("@@@ Redraw enter @@@");
|
CLUTTER_DBG("@@@ Redraw enter @@@");
|
||||||
|
|
||||||
clutter_threads_enter();
|
clutter_threads_enter();
|
||||||
@ -255,7 +258,14 @@ clutter_redraw ()
|
|||||||
|
|
||||||
clutter_element_paint(CLUTTER_ELEMENT(stage));
|
clutter_element_paint(CLUTTER_ELEMENT(stage));
|
||||||
|
|
||||||
|
if (clutter_stage_get_xwindow (stage))
|
||||||
|
{
|
||||||
glXSwapBuffers(ctx->xdpy, clutter_stage_get_xwindow (stage));
|
glXSwapBuffers(ctx->xdpy, clutter_stage_get_xwindow (stage));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
glFlush();
|
||||||
|
}
|
||||||
|
|
||||||
if (clutter_want_fps())
|
if (clutter_want_fps())
|
||||||
{
|
{
|
||||||
@ -321,23 +331,27 @@ clutter_root_xwindow(void)
|
|||||||
return ClutterCntx.xwin_root;
|
return ClutterCntx.xwin_root;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
XVisualInfo*
|
||||||
|
clutter_xvisual(void)
|
||||||
|
{
|
||||||
|
return ClutterCntx.xvinfo;
|
||||||
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
clutter_want_debug(void)
|
clutter_want_debug(void)
|
||||||
{
|
{
|
||||||
return __clutter_has_debug;
|
return __clutter_has_debug;
|
||||||
}
|
}
|
||||||
|
|
||||||
GLXContext
|
void
|
||||||
clutter_gl_context(void)
|
clutter_gl_context_set_indirect (gboolean indirect)
|
||||||
{
|
{
|
||||||
return ClutterCntx.gl_context;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
clutter_init(int *argc, char ***argv)
|
clutter_init(int *argc, char ***argv)
|
||||||
{
|
{
|
||||||
XVisualInfo *vinfo;
|
|
||||||
|
|
||||||
int gl_attributes[] =
|
int gl_attributes[] =
|
||||||
{
|
{
|
||||||
GLX_RGBA,
|
GLX_RGBA,
|
||||||
@ -374,7 +388,7 @@ clutter_init(int *argc, char ***argv)
|
|||||||
ClutterCntx.xscreen = DefaultScreen(ClutterCntx.xdpy);
|
ClutterCntx.xscreen = DefaultScreen(ClutterCntx.xdpy);
|
||||||
ClutterCntx.xwin_root = RootWindow(ClutterCntx.xdpy, ClutterCntx.xscreen);
|
ClutterCntx.xwin_root = RootWindow(ClutterCntx.xdpy, ClutterCntx.xscreen);
|
||||||
|
|
||||||
if ((vinfo = glXChooseVisual(ClutterCntx.xdpy,
|
if ((ClutterCntx.xvinfo = glXChooseVisual(ClutterCntx.xdpy,
|
||||||
ClutterCntx.xscreen,
|
ClutterCntx.xscreen,
|
||||||
gl_attributes)) == NULL)
|
gl_attributes)) == NULL)
|
||||||
{
|
{
|
||||||
@ -382,8 +396,6 @@ clutter_init(int *argc, char ***argv)
|
|||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
ClutterCntx.gl_context = glXCreateContext(ClutterCntx.xdpy, vinfo, 0, True);
|
|
||||||
|
|
||||||
ClutterCntx.font_map = PANGO_FT2_FONT_MAP (pango_ft2_font_map_new ());
|
ClutterCntx.font_map = PANGO_FT2_FONT_MAP (pango_ft2_font_map_new ());
|
||||||
|
|
||||||
pango_ft2_font_map_set_resolution (ClutterCntx.font_map, 96.0, 96.0);
|
pango_ft2_font_map_set_resolution (ClutterCntx.font_map, 96.0, 96.0);
|
||||||
|
@ -80,8 +80,8 @@ clutter_xscreen (void);
|
|||||||
Window
|
Window
|
||||||
clutter_root_xwindow (void);
|
clutter_root_xwindow (void);
|
||||||
|
|
||||||
GLXContext
|
XVisualInfo*
|
||||||
clutter_gl_context (void);
|
clutter_xvisual(void);
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
clutter_want_debug (void);
|
clutter_want_debug (void);
|
||||||
|
@ -52,8 +52,8 @@ typedef struct ClutterMainContext
|
|||||||
Window xwin_root;
|
Window xwin_root;
|
||||||
int xscreen;
|
int xscreen;
|
||||||
GC xgc;
|
GC xgc;
|
||||||
|
XVisualInfo *xvinfo;
|
||||||
PangoFT2FontMap *font_map;
|
PangoFT2FontMap *font_map;
|
||||||
GLXContext gl_context;
|
|
||||||
GMutex *gl_lock;
|
GMutex *gl_lock;
|
||||||
guint update_idle;
|
guint update_idle;
|
||||||
ClutterStage *stage;
|
ClutterStage *stage;
|
||||||
|
@ -38,9 +38,13 @@ static ClutterElementClass *parent_class;
|
|||||||
struct ClutterStagePrivate
|
struct ClutterStagePrivate
|
||||||
{
|
{
|
||||||
Window xwin;
|
Window xwin;
|
||||||
gint xwin_width, xwin_height;
|
Pixmap xpixmap;
|
||||||
|
GLXPixmap glxpixmap;
|
||||||
|
gint xwin_width, xwin_height; /* FIXME target_width / height */
|
||||||
gboolean want_fullscreen;
|
gboolean want_fullscreen;
|
||||||
|
gboolean want_offscreen;
|
||||||
gboolean hide_cursor;
|
gboolean hide_cursor;
|
||||||
|
GLXContext gl_context;
|
||||||
ClutterColor color;
|
ClutterColor color;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -48,6 +52,7 @@ enum
|
|||||||
{
|
{
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_FULLSCREEN,
|
PROP_FULLSCREEN,
|
||||||
|
PROP_OFFSCREEN,
|
||||||
PROP_HIDE_CURSOR
|
PROP_HIDE_CURSOR
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -198,6 +203,7 @@ sync_gl_viewport (ClutterStage *stage)
|
|||||||
static void
|
static void
|
||||||
clutter_stage_show (ClutterElement *self)
|
clutter_stage_show (ClutterElement *self)
|
||||||
{
|
{
|
||||||
|
if (clutter_stage_get_xwindow (CLUTTER_STAGE(self)))
|
||||||
XMapWindow (clutter_xdisplay(),
|
XMapWindow (clutter_xdisplay(),
|
||||||
clutter_stage_get_xwindow (CLUTTER_STAGE(self)));
|
clutter_stage_get_xwindow (CLUTTER_STAGE(self)));
|
||||||
}
|
}
|
||||||
@ -205,6 +211,7 @@ clutter_stage_show (ClutterElement *self)
|
|||||||
static void
|
static void
|
||||||
clutter_stage_hide (ClutterElement *self)
|
clutter_stage_hide (ClutterElement *self)
|
||||||
{
|
{
|
||||||
|
if (clutter_stage_get_xwindow (CLUTTER_STAGE(self)))
|
||||||
XUnmapWindow (clutter_xdisplay(),
|
XUnmapWindow (clutter_xdisplay(),
|
||||||
clutter_stage_get_xwindow (CLUTTER_STAGE(self)));
|
clutter_stage_get_xwindow (CLUTTER_STAGE(self)));
|
||||||
}
|
}
|
||||||
@ -218,8 +225,28 @@ clutter_stage_unrealize (ClutterElement *element)
|
|||||||
stage = CLUTTER_STAGE(element);
|
stage = CLUTTER_STAGE(element);
|
||||||
priv = stage->priv;
|
priv = stage->priv;
|
||||||
|
|
||||||
|
if (priv->want_offscreen)
|
||||||
|
{
|
||||||
|
if (priv->glxpixmap)
|
||||||
|
{
|
||||||
|
glXDestroyGLXPixmap (clutter_xdisplay(), priv->glxpixmap);
|
||||||
|
priv->glxpixmap = None;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (priv->xpixmap)
|
||||||
|
{
|
||||||
|
XFreePixmap (clutter_xdisplay(), priv->xpixmap);
|
||||||
|
priv->xpixmap = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (clutter_stage_get_xwindow (CLUTTER_STAGE(element)))
|
||||||
|
{
|
||||||
XDestroyWindow (clutter_xdisplay(), priv->xwin);
|
XDestroyWindow (clutter_xdisplay(), priv->xwin);
|
||||||
priv->xwin = None;
|
priv->xwin = None;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -232,6 +259,31 @@ clutter_stage_realize (ClutterElement *element)
|
|||||||
|
|
||||||
priv = stage->priv;
|
priv = stage->priv;
|
||||||
|
|
||||||
|
if (priv->want_offscreen)
|
||||||
|
{
|
||||||
|
priv->xpixmap = XCreatePixmap (clutter_xdisplay(),
|
||||||
|
clutter_root_xwindow(),
|
||||||
|
priv->xwin_width, priv->xwin_height,
|
||||||
|
clutter_xvisual()->depth);
|
||||||
|
|
||||||
|
priv->glxpixmap = glXCreateGLXPixmap(clutter_xdisplay(),
|
||||||
|
clutter_xvisual(),
|
||||||
|
priv->xpixmap);
|
||||||
|
sync_fullscreen (stage);
|
||||||
|
|
||||||
|
if (priv->gl_context)
|
||||||
|
glXDestroyContext (clutter_xdisplay(), priv->gl_context);
|
||||||
|
|
||||||
|
/* indirect */
|
||||||
|
priv->gl_context = glXCreateContext (clutter_xdisplay(),
|
||||||
|
clutter_xvisual(),
|
||||||
|
0,
|
||||||
|
False);
|
||||||
|
|
||||||
|
glXMakeCurrent(clutter_xdisplay(), priv->glxpixmap, priv->gl_context);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
priv->xwin = XCreateSimpleWindow(clutter_xdisplay(),
|
priv->xwin = XCreateSimpleWindow(clutter_xdisplay(),
|
||||||
clutter_root_xwindow(),
|
clutter_root_xwindow(),
|
||||||
0, 0,
|
0, 0,
|
||||||
@ -246,14 +298,24 @@ clutter_stage_realize (ClutterElement *element)
|
|||||||
|ExposureMask
|
|ExposureMask
|
||||||
|KeyPressMask
|
|KeyPressMask
|
||||||
|KeyReleaseMask
|
|KeyReleaseMask
|
||||||
|ButtonPressMask /* FIXME: Make optional ? */
|
|ButtonPressMask
|
||||||
|ButtonReleaseMask
|
|ButtonReleaseMask
|
||||||
|PropertyChangeMask);
|
|PropertyChangeMask);
|
||||||
|
|
||||||
sync_fullscreen (stage);
|
sync_fullscreen (stage);
|
||||||
sync_cursor_visible (stage);
|
sync_cursor_visible (stage);
|
||||||
|
|
||||||
glXMakeCurrent(clutter_xdisplay(), priv->xwin, clutter_gl_context());
|
if (priv->gl_context)
|
||||||
|
glXDestroyContext (clutter_xdisplay(), priv->gl_context);
|
||||||
|
|
||||||
|
priv->gl_context = glXCreateContext (clutter_xdisplay(),
|
||||||
|
clutter_xvisual(),
|
||||||
|
0,
|
||||||
|
True);
|
||||||
|
|
||||||
|
glXMakeCurrent(clutter_xdisplay(), priv->xwin, priv->gl_context);
|
||||||
|
}
|
||||||
|
|
||||||
sync_gl_viewport (stage);
|
sync_gl_viewport (stage);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -298,6 +360,14 @@ clutter_stage_request_coords (ClutterElement *self,
|
|||||||
priv->xwin,
|
priv->xwin,
|
||||||
priv->xwin_width,
|
priv->xwin_width,
|
||||||
priv->xwin_height);
|
priv->xwin_height);
|
||||||
|
|
||||||
|
if (priv->xpixmap)
|
||||||
|
{
|
||||||
|
/* Need to recreate to resize */
|
||||||
|
clutter_element_unrealize(self);
|
||||||
|
clutter_element_realize(self);
|
||||||
|
}
|
||||||
|
|
||||||
sync_gl_viewport (stage);
|
sync_gl_viewport (stage);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,6 +421,14 @@ clutter_stage_set_property (GObject *object,
|
|||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
|
case PROP_OFFSCREEN:
|
||||||
|
if (priv->want_offscreen != g_value_get_boolean (value))
|
||||||
|
{
|
||||||
|
clutter_element_unrealize(CLUTTER_ELEMENT(stage));
|
||||||
|
priv->want_offscreen = g_value_get_boolean (value);
|
||||||
|
clutter_element_realize(CLUTTER_ELEMENT(stage));
|
||||||
|
}
|
||||||
|
break;
|
||||||
case PROP_FULLSCREEN:
|
case PROP_FULLSCREEN:
|
||||||
if (priv->want_fullscreen != g_value_get_boolean (value))
|
if (priv->want_fullscreen != g_value_get_boolean (value))
|
||||||
{
|
{
|
||||||
@ -385,6 +463,9 @@ clutter_stage_get_property (GObject *object,
|
|||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
|
case PROP_OFFSCREEN:
|
||||||
|
g_value_set_boolean (value, priv->want_offscreen);
|
||||||
|
break;
|
||||||
case PROP_FULLSCREEN:
|
case PROP_FULLSCREEN:
|
||||||
g_value_set_boolean (value, priv->want_fullscreen);
|
g_value_set_boolean (value, priv->want_fullscreen);
|
||||||
break;
|
break;
|
||||||
@ -432,6 +513,15 @@ clutter_stage_class_init (ClutterStageClass *klass)
|
|||||||
FALSE,
|
FALSE,
|
||||||
G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
|
G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
|
||||||
|
|
||||||
|
g_object_class_install_property
|
||||||
|
(gobject_class, PROP_OFFSCREEN,
|
||||||
|
g_param_spec_boolean ("offscreen",
|
||||||
|
"Offscreen",
|
||||||
|
"Make Clutter stage offscreen",
|
||||||
|
FALSE,
|
||||||
|
G_PARAM_CONSTRUCT | G_PARAM_READWRITE));
|
||||||
|
|
||||||
|
|
||||||
g_object_class_install_property
|
g_object_class_install_property
|
||||||
(gobject_class, PROP_HIDE_CURSOR,
|
(gobject_class, PROP_HIDE_CURSOR,
|
||||||
g_param_spec_boolean ("hide-cursor",
|
g_param_spec_boolean ("hide-cursor",
|
||||||
@ -573,7 +663,7 @@ clutter_stage_pick (ClutterStage *stage, gint x, gint y)
|
|||||||
{
|
{
|
||||||
ClutterElement *found = NULL;
|
ClutterElement *found = NULL;
|
||||||
GLuint buff[64] = {0};
|
GLuint buff[64] = {0};
|
||||||
GLint hits, view[4], i;
|
GLint hits, view[4];
|
||||||
|
|
||||||
glSelectBuffer(64, buff);
|
glSelectBuffer(64, buff);
|
||||||
glGetIntegerv(GL_VIEWPORT, view);
|
glGetIntegerv(GL_VIEWPORT, view);
|
||||||
@ -606,6 +696,8 @@ clutter_stage_pick (ClutterStage *stage, gint x, gint y)
|
|||||||
if (hits != 0)
|
if (hits != 0)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
int i;
|
||||||
|
|
||||||
for (i=0; i<hits; i++)
|
for (i=0; i<hits; i++)
|
||||||
g_print ("Hit at %i\n", buff[i * 4 + 3]);
|
g_print ("Hit at %i\n", buff[i * 4 + 3]);
|
||||||
*/
|
*/
|
||||||
|
@ -102,6 +102,13 @@ clutter_stage_set_color (ClutterStage *stage,
|
|||||||
ClutterColor
|
ClutterColor
|
||||||
clutter_stage_get_color (ClutterStage *stage);
|
clutter_stage_get_color (ClutterStage *stage);
|
||||||
|
|
||||||
|
GdkPixbuf*
|
||||||
|
clutter_stage_snapshot (ClutterStage *stage,
|
||||||
|
gint x,
|
||||||
|
gint y,
|
||||||
|
guint width,
|
||||||
|
guint height);
|
||||||
|
|
||||||
ClutterElement*
|
ClutterElement*
|
||||||
clutter_stage_pick (ClutterStage *stage, gint x, gint y);
|
clutter_stage_pick (ClutterStage *stage, gint x, gint y);
|
||||||
|
|
||||||
|
@ -854,9 +854,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
|
|||||||
PIXEL_FORMAT,
|
PIXEL_FORMAT,
|
||||||
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
|
G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
texture_signals[SIGNAL_SIZE_CHANGE] =
|
texture_signals[SIGNAL_SIZE_CHANGE] =
|
||||||
g_signal_new ("size-change",
|
g_signal_new ("size-change",
|
||||||
G_TYPE_FROM_CLASS (gobject_class),
|
G_TYPE_FROM_CLASS (gobject_class),
|
||||||
@ -876,7 +873,6 @@ clutter_texture_class_init (ClutterTextureClass *klass)
|
|||||||
g_cclosure_marshal_VOID__VOID,
|
g_cclosure_marshal_VOID__VOID,
|
||||||
G_TYPE_NONE,
|
G_TYPE_NONE,
|
||||||
0);
|
0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user