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

Stop messing with process groups

Browse Source 
We can be launched by gnome-session now, which implies gdb must be
attached from outside, and the Ctrl-C problem is gone.

https://bugzilla.gnome.org/show_bug.cgi?id=706421
This commit is contained in:
Giovanni Campagna 2013-08-09 17:56:24 +02:00
parent 227fb56103
commit b5f3238f6f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <fcntl.h>
#include <unistd.h>
#include <wayland-server.h> #include <wayland-server.h>

8
src/wayland/meta-xwayland.c
View File

@ -269,7 +269,7 @@ bind_to_unix_socket (int display)
} }
static void static void
uncloexec_and_setpgid (gpointer user_data) uncloexec (gpointer user_data)
{ {
int fd = GPOINTER_TO_INT (user_data); int fd = GPOINTER_TO_INT (user_data);
@ -278,10 +278,6 @@ uncloexec_and_setpgid (gpointer user_data)
int flags = fcntl (fd, F_GETFD); int flags = fcntl (fd, F_GETFD);
if (flags != -1) if (flags != -1)
fcntl (fd, F_SETFD, flags & ~FD_CLOEXEC); fcntl (fd, F_SETFD, flags & ~FD_CLOEXEC);
/* Put this process in a background process group, so that Ctrl-C
goes to mutter only */
setpgid (0, 0);
} }
static void static void
@ -402,7 +398,7 @@ meta_xwayland_start (MetaWaylandCompositor *compositor)
G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDOUT_TO_DEV_NULL |
G_SPAWN_STDERR_TO_DEV_NULL, G_SPAWN_STDERR_TO_DEV_NULL,
uncloexec_and_setpgid, uncloexec,
GINT_TO_POINTER (sp[1]), GINT_TO_POINTER (sp[1]),
&pid, &pid,
&error)) &error))