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

meta-weston-launch: Don't use a GObject here

Browse Source 
We don't need a complicated API anymore.
This commit is contained in:
Jasper St. Pierre 2013-12-31 18:03:31 -05:00
parent ebe6e3180e
commit 1d3dbea20c
3 changed files with 18 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/meta-wayland.c
View File

@ -751,7 +751,7 @@ meta_wayland_finalize (void)
compositor = meta_wayland_compositor_get_default (); compositor = meta_wayland_compositor_get_default ();
meta_xwayland_stop (compositor); meta_xwayland_stop (compositor);
g_clear_object (&compositor->launcher); meta_launcher_free (compositor->launcher);
} }
gboolean gboolean

82
src/wayland/meta-weston-launch.c
View File

@ -43,18 +43,8 @@
#include "meta-weston-launch.h" #include "meta-weston-launch.h"
struct _MetaLauncherClass
{
GObjectClass parent_class;
void (*enter) (MetaLauncher *);
void (*leave) (MetaLauncher *);
};
struct _MetaLauncher struct _MetaLauncher
{ {
GObject parent;
GSocket *weston_launch; GSocket *weston_launch;
gboolean vt_switched; gboolean vt_switched;
@ -66,16 +56,6 @@ struct _MetaLauncher
GSource *outer_source; GSource *outer_source;
}; };
enum {
SIGNAL_ENTER,
SIGNAL_LEAVE,
SIGNAL_LAST
};
static int signals[SIGNAL_LAST];
G_DEFINE_TYPE (MetaLauncher, meta_launcher, G_TYPE_OBJECT);
static void handle_request_vt_switch (MetaLauncher *self); static void handle_request_vt_switch (MetaLauncher *self);
static gboolean static gboolean
@ -239,22 +219,6 @@ meta_launcher_open_input_device (MetaLauncher *self,
return ret; return ret;
} }
static void
meta_launcher_finalize (GObject *object)
{
MetaLauncher *launcher = META_LAUNCHER (object);
g_source_destroy (launcher->outer_source);
g_source_destroy (launcher->inner_source);
g_main_loop_unref (launcher->nested_loop);
g_main_context_unref (launcher->nested_context);
g_object_unref (launcher->weston_launch);
G_OBJECT_CLASS (meta_launcher_parent_class)->finalize (object);
}
static void static void
meta_launcher_enter (MetaLauncher *launcher) meta_launcher_enter (MetaLauncher *launcher)
{ {
@ -302,7 +266,7 @@ handle_request_vt_switch (MetaLauncher *launcher)
GError *error; GError *error;
gboolean ok; gboolean ok;
g_signal_emit (launcher, signals[SIGNAL_LEAVE], 0); meta_launcher_leave (launcher);
message.opcode = WESTON_LAUNCHER_CONFIRM_VT_SWITCH; message.opcode = WESTON_LAUNCHER_CONFIRM_VT_SWITCH;
@ -326,7 +290,7 @@ handle_request_vt_switch (MetaLauncher *launcher)
g_assert (launcher->vt_switched); g_assert (launcher->vt_switched);
launcher->vt_switched = FALSE; launcher->vt_switched = FALSE;
g_signal_emit (launcher, signals[SIGNAL_ENTER], 0); meta_launcher_enter (launcher);
} }
static gboolean static gboolean
@ -378,9 +342,10 @@ env_get_fd (const char *env)
return g_ascii_strtoll (value, NULL, 10); return g_ascii_strtoll (value, NULL, 10);
} }
static void MetaLauncher *
meta_launcher_init (MetaLauncher *self) meta_launcher_new (void)
{ {
MetaLauncher *self = g_slice_new0 (MetaLauncher);
int launch_fd; int launch_fd;
launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK"); launch_fd = env_get_fd ("WESTON_LAUNCHER_SOCK");
@ -403,37 +368,20 @@ meta_launcher_init (MetaLauncher *self)
g_source_set_callback (self->inner_source, (GSourceFunc)on_socket_readable, self, NULL); g_source_set_callback (self->inner_source, (GSourceFunc)on_socket_readable, self, NULL);
g_source_attach (self->inner_source, self->nested_context); g_source_attach (self->inner_source, self->nested_context);
g_source_unref (self->inner_source); g_source_unref (self->inner_source);
return self;
} }
static void void
meta_launcher_class_init (MetaLauncherClass *klass) meta_launcher_free (MetaLauncher *launcher)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); g_source_destroy (launcher->outer_source);
g_source_destroy (launcher->inner_source);
object_class->finalize = meta_launcher_finalize; g_main_loop_unref (launcher->nested_loop);
g_main_context_unref (launcher->nested_context);
klass->enter = meta_launcher_enter; g_object_unref (launcher->weston_launch);
klass->leave = meta_launcher_leave;
signals[SIGNAL_ENTER] = g_signal_new ("enter", g_slice_free (MetaLauncher, launcher);
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MetaLauncherClass, enter),
NULL, NULL, /* accumulator */
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
signals[SIGNAL_LEAVE] = g_signal_new ("leave",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (MetaLauncherClass, leave),
NULL, NULL, /* accumulator */
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
MetaLauncher *
meta_launcher_new (void)
{
return g_object_new (META_TYPE_LAUNCHER, NULL);
} }

11
src/wayland/meta-weston-launch.h
View File

@ -23,19 +23,10 @@
#include <glib-object.h> #include <glib-object.h>
#include "weston-launch.h" #include "weston-launch.h"
#define META_TYPE_LAUNCHER (meta_launcher_get_type())
#define META_LAUNCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_LAUNCHER, MetaLauncher))
#define META_LAUNCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_LAUNCHER, MetaLauncherClass))
#define META_IS_LAUNCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_LAUNCHER))
#define META_IS_LAUNCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_LAUNCHER))
#define META_LAUNCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_LAUNCHER, MetaLauncherClass))
typedef struct _MetaLauncher MetaLauncher; typedef struct _MetaLauncher MetaLauncher;
typedef struct _MetaLauncherClass MetaLauncherClass;
GType meta_launcher_get_type (void) G_GNUC_CONST;
MetaLauncher *meta_launcher_new (void); MetaLauncher *meta_launcher_new (void);
void meta_launcher_free (MetaLauncher *self);
gboolean meta_launcher_set_drm_fd (MetaLauncher *self, gboolean meta_launcher_set_drm_fd (MetaLauncher *self,
int drm_fd, int drm_fd,