isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-05 12:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

launcher: Remove the "VT-switched lock"

Browse Source 
We'll replace it by pausing the Clutter master clock.
This commit is contained in:
Jasper St. Pierre 2014-03-11 17:33:14 -04:00
parent 550f1989ff
commit 446b75907e
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/backends/native/meta-launcher.c
View File

@ -42,14 +42,9 @@
struct _MetaLauncher struct _MetaLauncher
{ {
GSocket *weston_launch; GSocket *weston_launch;
GSource *weston_launch_source;
gboolean vt_switched; gboolean vt_switched;
GMainContext *nested_context;
GMainLoop *nested_loop;
GSource *inner_source;
GSource *outer_source;
}; };
static void handle_request_vt_switch (MetaLauncher *self); static void handle_request_vt_switch (MetaLauncher *self);
@ -249,8 +244,7 @@ static void
handle_vt_enter (MetaLauncher *launcher) handle_vt_enter (MetaLauncher *launcher)
{ {
g_assert (launcher->vt_switched); g_assert (launcher->vt_switched);
launcher->vt_switched = FALSE;
g_main_loop_quit (launcher->nested_loop);
session_unpause (); session_unpause ();
} }
@ -271,21 +265,12 @@ handle_request_vt_switch (MetaLauncher *launcher)
if (!ok) { if (!ok) {
g_warning ("Failed to acknowledge VT switch: %s", error->message); g_warning ("Failed to acknowledge VT switch: %s", error->message);
g_error_free (error); g_error_free (error);
return; return;
} }
g_assert (!launcher->vt_switched); g_assert (!launcher->vt_switched);
launcher->vt_switched = TRUE; launcher->vt_switched = TRUE;
/* We can't do anything at this point, because we don't
have input devices and we don't have the DRM master,
so let's run a nested busy loop until the VT is reentered */
g_main_loop_run (launcher->nested_loop);
g_assert (launcher->vt_switched);
launcher->vt_switched = FALSE;
session_unpause (); session_unpause ();
} }
@ -352,18 +337,10 @@ meta_launcher_new (void)
self->weston_launch = g_socket_new_from_fd (launch_fd, NULL); self->weston_launch = g_socket_new_from_fd (launch_fd, NULL);
self->nested_context = g_main_context_new (); self->weston_launch_source = g_socket_create_source (self->weston_launch, G_IO_IN, NULL);
self->nested_loop = g_main_loop_new (self->nested_context, FALSE); g_source_set_callback (self->weston_launch_source, (GSourceFunc)on_socket_readable, self, NULL);
g_source_attach (self->weston_launch_source, NULL);
self->outer_source = g_socket_create_source (self->weston_launch, G_IO_IN, NULL); g_source_unref (self->weston_launch_source);
g_source_set_callback (self->outer_source, (GSourceFunc)on_socket_readable, self, NULL);
g_source_attach (self->outer_source, NULL);
g_source_unref (self->outer_source);
self->inner_source = g_socket_create_source (self->weston_launch, G_IO_IN, 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_unref (self->inner_source);
kms_fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error); kms_fd = meta_launcher_open_device (self, "/dev/dri/card0", O_RDWR, &error);
if (error) if (error)
@ -380,14 +357,8 @@ meta_launcher_new (void)
void void
meta_launcher_free (MetaLauncher *launcher) meta_launcher_free (MetaLauncher *launcher)
{ {
g_source_destroy (launcher->outer_source); g_source_destroy (launcher->weston_launch_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_unref (launcher->weston_launch);
g_slice_free (MetaLauncher, launcher); g_slice_free (MetaLauncher, launcher);
} }