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

delete: Share some code between X11 and wayland

Browse Source 
In order to kill a window, on both X11 and wayland we first try to
kill(3) the corresponding process, so we can add the newly added
get_client_pid() method to share that code.

https://bugzilla.gnome.org/show_bug.cgi?id=772613
This commit is contained in:
Florian Müllner 2016-10-08 17:32:27 +02:00
parent 1fab6e69b7
commit e9944350d3
3 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/delete.c
View File

@ -185,6 +185,22 @@ meta_window_delete (MetaWindow *window,
void void
meta_window_kill (MetaWindow *window) meta_window_kill (MetaWindow *window)
{ {
pid_t pid = meta_window_get_client_pid (window);
if (pid > 0)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Killing %s with kill()\n",
window->desc);
if (kill (pid, 9) == 0)
return;
meta_topic (META_DEBUG_WINDOW_OPS,
"Failed to signal %s: %s\n",
window->desc, strerror (errno));
}
META_WINDOW_GET_CLASS (window)->kill (window); META_WINDOW_GET_CLASS (window)->kill (window);
} }

18
src/wayland/meta-window-wayland.c
View File

@ -106,24 +106,6 @@ meta_window_wayland_kill (MetaWindow *window)
{ {
MetaWaylandSurface *surface = window->surface; MetaWaylandSurface *surface = window->surface;
struct wl_resource *resource = surface->resource; struct wl_resource *resource = surface->resource;
pid_t pid;
uid_t uid;
gid_t gid;
wl_client_get_credentials (wl_resource_get_client (resource), &pid, &uid, &gid);
if (pid > 0)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Killing %s with kill()\n",
window->desc);
if (kill (pid, 9) == 0)
return;
meta_topic (META_DEBUG_WINDOW_OPS,
"Failed to signal %s: %s\n",
window->desc, strerror (errno));
}
/* Send the client an unrecoverable error to kill the client. */ /* Send the client an unrecoverable error to kill the client. */
wl_resource_post_error (resource, wl_resource_post_error (resource,

17
src/x11/window-x11.c
View File

@ -704,23 +704,6 @@ meta_window_x11_delete (MetaWindow *window,
static void static void
meta_window_x11_kill (MetaWindow *window) meta_window_x11_kill (MetaWindow *window)
{ {
meta_topic (META_DEBUG_WINDOW_OPS,
"Killing %s brutally\n",
window->desc);
if (!meta_window_is_remote (window) &&
window->net_wm_pid > 0)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Killing %s with kill()\n",
window->desc);
if (kill (window->net_wm_pid, 9) < 0)
meta_topic (META_DEBUG_WINDOW_OPS,
"Failed to signal %s: %s\n",
window->desc, strerror (errno));
}
meta_topic (META_DEBUG_WINDOW_OPS, meta_topic (META_DEBUG_WINDOW_OPS,
"Disconnecting %s with XKillClient()\n", "Disconnecting %s with XKillClient()\n",
window->desc); window->desc);