mirror of
https://github.com/brl/mutter.git
synced 2025-03-17 16:55:03 +00:00
d978ab1890
meta_display_ping_window() does nothing when check-alive-timeout is set to 0, but meta_window_check_alive_on_event() was relying on it to reset the events_during_ping. Without this events_during_ping was just counting up until the threshold was reached and the window was marked as not alive, preventing further pointer events from being sent to the window. Fix this by not doing anything in meta_window_check_alive_on_event() if check-alive-timeout is 0, similar to meta_display_ping_window(). Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3142 Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3367>
155 lines
4.0 KiB
C
155 lines
4.0 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
/* Mutter window deletion */
|
|
|
|
/*
|
|
* Copyright (C) 2001, 2002 Havoc Pennington
|
|
* Copyright (C) 2004 Elijah Newren
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#define _XOPEN_SOURCE /* for kill() */
|
|
|
|
#define MAX_QUEUED_EVENTS 400
|
|
|
|
#include "config.h"
|
|
|
|
#include <errno.h>
|
|
|
|
#include "compositor/compositor-private.h"
|
|
#include "core/util-private.h"
|
|
#include "core/window-private.h"
|
|
#include "meta/meta-x11-errors.h"
|
|
#include "meta/workspace.h"
|
|
|
|
static void
|
|
close_dialog_response_cb (MetaCloseDialog *dialog,
|
|
MetaCloseDialogResponse response,
|
|
MetaWindow *window)
|
|
{
|
|
if (response == META_CLOSE_DIALOG_RESPONSE_FORCE_CLOSE)
|
|
meta_window_kill (window);
|
|
else
|
|
meta_window_ensure_close_dialog_timeout (window);
|
|
}
|
|
|
|
static void
|
|
meta_window_maybe_ensure_close_dialog (MetaWindow *window)
|
|
{
|
|
MetaDisplay *display;
|
|
|
|
if (window->close_dialog)
|
|
return;
|
|
|
|
display = window->display;
|
|
window->close_dialog = meta_compositor_create_close_dialog (display->compositor,
|
|
window);
|
|
if (!window->close_dialog)
|
|
return;
|
|
g_signal_connect (window->close_dialog, "response",
|
|
G_CALLBACK (close_dialog_response_cb), window);
|
|
}
|
|
|
|
void
|
|
meta_window_show_close_dialog (MetaWindow *window)
|
|
{
|
|
meta_window_maybe_ensure_close_dialog (window);
|
|
|
|
if (!window->close_dialog)
|
|
return;
|
|
|
|
meta_close_dialog_show (window->close_dialog);
|
|
|
|
if (window->display &&
|
|
!meta_compositor_get_current_window_drag (window->display->compositor) &&
|
|
window == window->display->focus_window)
|
|
meta_close_dialog_focus (window->close_dialog);
|
|
}
|
|
|
|
void
|
|
meta_window_hide_close_dialog (MetaWindow *window)
|
|
{
|
|
if (window->close_dialog)
|
|
meta_close_dialog_hide (window->close_dialog);
|
|
}
|
|
|
|
void
|
|
meta_window_check_alive (MetaWindow *window,
|
|
guint32 timestamp)
|
|
{
|
|
meta_display_ping_window (window, timestamp);
|
|
}
|
|
|
|
void
|
|
meta_window_check_alive_on_event (MetaWindow *window,
|
|
uint32_t timestamp)
|
|
{
|
|
unsigned int check_alive_timeout;
|
|
|
|
if (!meta_window_can_ping (window))
|
|
return;
|
|
|
|
check_alive_timeout = meta_prefs_get_check_alive_timeout ();
|
|
if (check_alive_timeout == 0)
|
|
return;
|
|
|
|
meta_display_ping_window (window, timestamp);
|
|
|
|
window->events_during_ping++;
|
|
|
|
if (window->events_during_ping > MAX_QUEUED_EVENTS)
|
|
meta_window_set_alive (window, FALSE);
|
|
}
|
|
|
|
void
|
|
meta_window_delete (MetaWindow *window,
|
|
guint32 timestamp)
|
|
{
|
|
META_WINDOW_GET_CLASS (window)->delete (window, timestamp);
|
|
|
|
meta_window_check_alive (window, timestamp);
|
|
}
|
|
|
|
void
|
|
meta_window_kill (MetaWindow *window)
|
|
{
|
|
pid_t pid = meta_window_get_pid (window);
|
|
|
|
if (pid > 0)
|
|
{
|
|
meta_topic (META_DEBUG_WINDOW_OPS,
|
|
"Killing %s with kill()",
|
|
window->desc);
|
|
|
|
if (kill (pid, 9) == 0)
|
|
return;
|
|
|
|
meta_topic (META_DEBUG_WINDOW_OPS,
|
|
"Failed to signal %s: %s",
|
|
window->desc, strerror (errno));
|
|
}
|
|
|
|
META_WINDOW_GET_CLASS (window)->kill (window);
|
|
}
|
|
|
|
void
|
|
meta_window_free_delete_dialog (MetaWindow *window)
|
|
{
|
|
if (window->close_dialog &&
|
|
meta_close_dialog_is_visible (window->close_dialog))
|
|
meta_close_dialog_hide (window->close_dialog);
|
|
g_clear_object (&window->close_dialog);
|
|
}
|