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

2007-05-31 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/egl/clutter-backend-egl.c:
        * clutter/egl/clutter-backend-egl.h:
        * clutter/egl/clutter-event-egl.c:
        * clutter/egl/clutter-stage-egl.c:
        * clutter/egl/clutter-stage-egl.h:
        Rename Egl -> EGL
This commit is contained in:
Matthew Allum 2007-05-31 12:35:36 +00:00
parent a0c1a9b66d
commit 4d8bf8f3b8
6 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,13 @@
2007-05-31 Matthew Allum <mallum@openedhand.com> 2007-05-31 Matthew Allum <mallum@openedhand.com>
* clutter/egl/clutter-backend-egl.c:
* clutter/egl/clutter-backend-egl.h:
* clutter/egl/clutter-event-egl.c:
* clutter/egl/clutter-stage-egl.c:
* clutter/egl/clutter-stage-egl.h:
Rename Egl -> EGL
2007-05-31 Matthew Allum <mallum@openedhand.com>
* clutter/glx/clutter-backend-glx.c: * clutter/glx/clutter-backend-glx.c:
* clutter/glx/clutter-backend-glx.h: * clutter/glx/clutter-backend-glx.h:

24
clutter/egl/clutter-backend-egl.c
View File

@ -6,7 +6,7 @@
#include "../clutter-main.h" #include "../clutter-main.h"
#include "../clutter-debug.h" #include "../clutter-debug.h"
static ClutterBackendEgl *backend_singleton = NULL; static ClutterBackendEGL *backend_singleton = NULL;
/* options */ /* options */
static gchar *clutter_display_name = NULL; static gchar *clutter_display_name = NULL;
@ -16,7 +16,7 @@ static gint clutter_screen = 0;
static int TrappedErrorCode = 0; static int TrappedErrorCode = 0;
static int (*old_error_handler) (Display *, XErrorEvent *); static int (*old_error_handler) (Display *, XErrorEvent *);
G_DEFINE_TYPE (ClutterBackendEgl, clutter_backend_egl, CLUTTER_TYPE_BACKEND); G_DEFINE_TYPE (ClutterBackendEGL, clutter_backend_egl, CLUTTER_TYPE_BACKEND);
static gboolean static gboolean
clutter_backend_egl_pre_parse (ClutterBackend *backend, clutter_backend_egl_pre_parse (ClutterBackend *backend,
@ -41,7 +41,7 @@ static gboolean
clutter_backend_egl_post_parse (ClutterBackend *backend, clutter_backend_egl_post_parse (ClutterBackend *backend,
GError **error) GError **error)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
if (clutter_display_name) if (clutter_display_name)
{ {
@ -110,11 +110,11 @@ static gboolean
clutter_backend_egl_init_stage (ClutterBackend *backend, clutter_backend_egl_init_stage (ClutterBackend *backend,
GError **error) GError **error)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
if (!backend_egl->stage) if (!backend_egl->stage)
{ {
ClutterStageEgl *stage_egl; ClutterStageEGL *stage_egl;
ClutterActor *stage; ClutterActor *stage;
stage = g_object_new (CLUTTER_TYPE_STAGE_EGL, NULL); stage = g_object_new (CLUTTER_TYPE_STAGE_EGL, NULL);
@ -169,8 +169,8 @@ static const GOptionEntry entries[] =
static void static void
clutter_backend_egl_redraw (ClutterBackend *backend) clutter_backend_egl_redraw (ClutterBackend *backend)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
ClutterStageEgl *stage_egl; ClutterStageEGL *stage_egl;
stage_egl = CLUTTER_STAGE_EGL(backend_egl->stage); stage_egl = CLUTTER_STAGE_EGL(backend_egl->stage);
@ -201,7 +201,7 @@ clutter_backend_egl_add_options (ClutterBackend *backend,
static ClutterActor * static ClutterActor *
clutter_backend_egl_get_stage (ClutterBackend *backend) clutter_backend_egl_get_stage (ClutterBackend *backend)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
return backend_egl->stage; return backend_egl->stage;
} }
@ -209,7 +209,7 @@ clutter_backend_egl_get_stage (ClutterBackend *backend)
static void static void
clutter_backend_egl_finalize (GObject *gobject) clutter_backend_egl_finalize (GObject *gobject)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (gobject); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (gobject);
g_free (backend_egl->display_name); g_free (backend_egl->display_name);
@ -224,7 +224,7 @@ clutter_backend_egl_finalize (GObject *gobject)
static void static void
clutter_backend_egl_dispose (GObject *gobject) clutter_backend_egl_dispose (GObject *gobject)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (gobject); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (gobject);
_clutter_events_uninit (CLUTTER_BACKEND (backend_egl)); _clutter_events_uninit (CLUTTER_BACKEND (backend_egl));
@ -262,7 +262,7 @@ clutter_backend_egl_constructor (GType gtype,
} }
static void static void
clutter_backend_egl_class_init (ClutterBackendEglClass *klass) clutter_backend_egl_class_init (ClutterBackendEGLClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterBackendClass *backend_class = CLUTTER_BACKEND_CLASS (klass); ClutterBackendClass *backend_class = CLUTTER_BACKEND_CLASS (klass);
@ -281,7 +281,7 @@ clutter_backend_egl_class_init (ClutterBackendEglClass *klass)
} }
static void static void
clutter_backend_egl_init (ClutterBackendEgl *backend_egl) clutter_backend_egl_init (ClutterBackendEGL *backend_egl)
{ {
ClutterBackend *backend = CLUTTER_BACKEND (backend_egl); ClutterBackend *backend = CLUTTER_BACKEND (backend_egl);

14
clutter/egl/clutter-backend-egl.h
View File

@ -33,16 +33,16 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_BACKEND_EGL (clutter_backend_egl_get_type ()) #define CLUTTER_TYPE_BACKEND_EGL (clutter_backend_egl_get_type ())
#define CLUTTER_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEgl)) #define CLUTTER_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEGL))
#define CLUTTER_IS_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_EGL)) #define CLUTTER_IS_BACKEND_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_EGL))
#define CLUTTER_BACKEND_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEglClass)) #define CLUTTER_BACKEND_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEGLClass))
#define CLUTTER_IS_BACKEND_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND_EGL)) #define CLUTTER_IS_BACKEND_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND_EGL))
#define CLUTTER_BACKEND_EGL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEglClass)) #define CLUTTER_BACKEND_EGL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND_EGL, ClutterBackendEGLClass))
typedef struct _ClutterBackendEgl ClutterBackendEgl; typedef struct _ClutterBackendEGL ClutterBackendEGL;
typedef struct _ClutterBackendEglClass ClutterBackendEglClass; typedef struct _ClutterBackendEGLClass ClutterBackendEGLClass;
struct _ClutterBackendEgl struct _ClutterBackendEGL
{ {
ClutterBackend parent_instance; ClutterBackend parent_instance;
@ -65,7 +65,7 @@ struct _ClutterBackendEgl
/*< private >*/ /*< private >*/
}; };
struct _ClutterBackendEglClass struct _ClutterBackendEGLClass
{ {
ClutterBackendClass parent_class; ClutterBackendClass parent_class;
}; };

8
clutter/egl/clutter-event-egl.c
View File

@ -90,7 +90,7 @@ _clutter_events_init (ClutterBackend *backend)
{ {
GSource *source; GSource *source;
ClutterEventSource *event_source; ClutterEventSource *event_source;
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
int connection_number; int connection_number;
connection_number = ConnectionNumber (backend_egl->xdpy); connection_number = ConnectionNumber (backend_egl->xdpy);
@ -113,7 +113,7 @@ _clutter_events_init (ClutterBackend *backend)
void void
_clutter_events_uninit (ClutterBackend *backend) _clutter_events_uninit (ClutterBackend *backend)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
if (backend_egl->event_source) if (backend_egl->event_source)
{ {
@ -171,7 +171,7 @@ clutter_event_translate (ClutterBackend *backend,
ClutterEvent *event, ClutterEvent *event,
XEvent *xevent) XEvent *xevent)
{ {
ClutterBackendEgl *backend_egl; ClutterBackendEGL *backend_egl;
ClutterStage *stage; ClutterStage *stage;
gboolean res; gboolean res;
Window xwindow, stage_xwindow; Window xwindow, stage_xwindow;
@ -294,7 +294,7 @@ clutter_event_translate (ClutterBackend *backend,
static void static void
events_queue (ClutterBackend *backend) events_queue (ClutterBackend *backend)
{ {
ClutterBackendEgl *backend_egl = CLUTTER_BACKEND_EGL (backend); ClutterBackendEGL *backend_egl = CLUTTER_BACKEND_EGL (backend);
ClutterEvent *event; ClutterEvent *event;
XEvent xevent; XEvent xevent;
ClutterMainContext *clutter_context; ClutterMainContext *clutter_context;

24
clutter/egl/clutter-stage-egl.c
View File

@ -17,7 +17,7 @@
#include <X11/extensions/Xfixes.h> #include <X11/extensions/Xfixes.h>
#endif #endif
G_DEFINE_TYPE (ClutterStageEgl, clutter_stage_egl, CLUTTER_TYPE_STAGE); G_DEFINE_TYPE (ClutterStageEGL, clutter_stage_egl, CLUTTER_TYPE_STAGE);
/* This is currently an EGL on X implementation (eg for use with vincent) /* This is currently an EGL on X implementation (eg for use with vincent)
* *
@ -27,7 +27,7 @@ G_DEFINE_TYPE (ClutterStageEgl, clutter_stage_egl, CLUTTER_TYPE_STAGE);
static void static void
clutter_stage_egl_show (ClutterActor *actor) clutter_stage_egl_show (ClutterActor *actor)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (actor); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
if (stage_egl->xwin) if (stage_egl->xwin)
XMapWindow (stage_egl->xdpy, stage_egl->xwin); XMapWindow (stage_egl->xdpy, stage_egl->xwin);
@ -36,7 +36,7 @@ clutter_stage_egl_show (ClutterActor *actor)
static void static void
clutter_stage_egl_hide (ClutterActor *actor) clutter_stage_egl_hide (ClutterActor *actor)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (actor); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
if (stage_egl->xwin) if (stage_egl->xwin)
XUnmapWindow (stage_egl->xdpy, stage_egl->xwin); XUnmapWindow (stage_egl->xdpy, stage_egl->xwin);
@ -45,7 +45,7 @@ clutter_stage_egl_hide (ClutterActor *actor)
static void static void
clutter_stage_egl_unrealize (ClutterActor *actor) clutter_stage_egl_unrealize (ClutterActor *actor)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (actor); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
gboolean was_offscreen; gboolean was_offscreen;
CLUTTER_MARK(); CLUTTER_MARK();
@ -84,7 +84,7 @@ clutter_stage_egl_unrealize (ClutterActor *actor)
static void static void
clutter_stage_egl_realize (ClutterActor *actor) clutter_stage_egl_realize (ClutterActor *actor)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (actor); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (actor);
EGLConfig configs[2]; EGLConfig configs[2];
EGLint config_count; EGLint config_count;
@ -189,7 +189,7 @@ static void
clutter_stage_egl_allocate_coords (ClutterActor *self, clutter_stage_egl_allocate_coords (ClutterActor *self,
ClutterActorBox *box) ClutterActorBox *box)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (self); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
box->x1 = box->y1 = 0; box->x1 = box->y1 = 0;
box->x2 = box->x1 + CLUTTER_UNITS_FROM_INT (stage_egl->xwin_width); box->x2 = box->x1 + CLUTTER_UNITS_FROM_INT (stage_egl->xwin_width);
@ -200,7 +200,7 @@ static void
clutter_stage_egl_request_coords (ClutterActor *self, clutter_stage_egl_request_coords (ClutterActor *self,
ClutterActorBox *box) ClutterActorBox *box)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (self); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
gint new_width, new_height; gint new_width, new_height;
/* FIXME: some how have X configure_notfiys call this ? */ /* FIXME: some how have X configure_notfiys call this ? */
@ -233,7 +233,7 @@ static void
clutter_stage_egl_set_fullscreen (ClutterStage *stage, clutter_stage_egl_set_fullscreen (ClutterStage *stage,
gboolean fullscreen) gboolean fullscreen)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (stage); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (stage);
Atom atom_WM_STATE, atom_WM_STATE_FULLSCREEN; Atom atom_WM_STATE, atom_WM_STATE_FULLSCREEN;
atom_WM_STATE = XInternAtom (stage_egl->xdpy, "_NET_WM_STATE", False); atom_WM_STATE = XInternAtom (stage_egl->xdpy, "_NET_WM_STATE", False);
@ -270,7 +270,7 @@ static void
clutter_stage_egl_set_cursor_visible (ClutterStage *stage, clutter_stage_egl_set_cursor_visible (ClutterStage *stage,
gboolean show_cursor) gboolean show_cursor)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (stage); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (stage);
if (stage_egl->xwin == None) if (stage_egl->xwin == None)
return; return;
@ -331,7 +331,7 @@ clutter_stage_egl_draw_to_pixbuf (ClutterStage *stage,
static void static void
clutter_stage_egl_dispose (GObject *gobject) clutter_stage_egl_dispose (GObject *gobject)
{ {
ClutterStageEgl *stage_egl = CLUTTER_STAGE_EGL (gobject); ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (gobject);
if (stage_egl->xwin) if (stage_egl->xwin)
clutter_actor_unrealize (CLUTTER_ACTOR (stage_egl)); clutter_actor_unrealize (CLUTTER_ACTOR (stage_egl));
@ -340,7 +340,7 @@ clutter_stage_egl_dispose (GObject *gobject)
} }
static void static void
clutter_stage_egl_class_init (ClutterStageEglClass *klass) clutter_stage_egl_class_init (ClutterStageEGLClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass); ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
@ -362,7 +362,7 @@ clutter_stage_egl_class_init (ClutterStageEglClass *klass)
} }
static void static void
clutter_stage_egl_init (ClutterStageEgl *stage) clutter_stage_egl_init (ClutterStageEGL *stage)
{ {
stage->xdpy = NULL; stage->xdpy = NULL;
stage->xwin_root = None; stage->xwin_root = None;

14
clutter/egl/clutter-stage-egl.h
View File

@ -13,16 +13,16 @@
#define CLUTTER_TYPE_STAGE_EGL (clutter_stage_egl_get_type ()) #define CLUTTER_TYPE_STAGE_EGL (clutter_stage_egl_get_type ())
#define CLUTTER_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_EGL, ClutterStageEgl)) #define CLUTTER_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_EGL, ClutterStageEGL))
#define CLUTTER_IS_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_EGL)) #define CLUTTER_IS_STAGE_EGL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_EGL))
#define CLUTTER_STAGE_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_EGL, ClutterStageEglClass)) #define CLUTTER_STAGE_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_STAGE_EGL, ClutterStageEGLClass))
#define CLUTTER_IS_STAGE_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STAGE_EGL)) #define CLUTTER_IS_STAGE_EGL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_STAGE_EGL))
#define CLUTTER_STAGE_EGL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STAGE_EGL, ClutterStageEglClass)) #define CLUTTER_STAGE_EGL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_STAGE_EGL, ClutterStageEGLClass))
typedef struct _ClutterStageEgl ClutterStageEgl; typedef struct _ClutterStageEGL ClutterStageEGL;
typedef struct _ClutterStageEglClass ClutterStageEglClass; typedef struct _ClutterStageEGLClass ClutterStageEGLClass;
struct _ClutterStageEgl struct _ClutterStageEGL
{ {
ClutterStage parent_instance; ClutterStage parent_instance;
@ -39,7 +39,7 @@ struct _ClutterStageEgl
EGLContext egl_context; EGLContext egl_context;
}; };
struct _ClutterStageEglClass struct _ClutterStageEGLClass
{ {
ClutterStageClass parent_class; ClutterStageClass parent_class;
}; };