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

window: Remove support for _NET_WM_PID

Browse Source 
We have the client pid API that works on both Wayland and X11 nowadays,
so the _NET_WM_PID property is no longer needed, remove it.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1180
This commit is contained in:
Jonas Dreßler 2020-04-06 20:04:09 +02:00 committed by Florian Müllner
parent dac09a8e23
commit c971d6ea1f
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/window-private.h
View File

@ -201,8 +201,6 @@ struct _MetaWindow
char *gtk_app_menu_object_path; char *gtk_app_menu_object_path;
char *gtk_menubar_object_path; char *gtk_menubar_object_path;
int net_wm_pid;
Window xtransient_for; Window xtransient_for;
Window xgroup_leader; Window xgroup_leader;
Window xclient_leader; Window xclient_leader;

2
src/core/window.c
View File

@ -1149,8 +1149,6 @@ _meta_window_shared_new (MetaDisplay *display,
window->is_remote = FALSE; window->is_remote = FALSE;
window->startup_id = NULL; window->startup_id = NULL;
window->net_wm_pid = -1;
window->xtransient_for = None; window->xtransient_for = None;
window->xclient_leader = None; window->xclient_leader = None;

22
src/x11/window-props.c
View File

@ -428,27 +428,6 @@ reload_wm_window_role (MetaWindow *window,
window->role = g_strdup (value->v.str); window->role = g_strdup (value->v.str);
} }
static void
reload_net_wm_pid (MetaWindow *window,
MetaPropValue *value,
gboolean initial)
{
if (value->type != META_PROP_VALUE_INVALID)
{
uint32_t cardinal = (int) value->v.cardinal;
if (cardinal <= 0)
meta_warning ("Application set a bogus _NET_WM_PID %u\n",
cardinal);
else
{
window->net_wm_pid = cardinal;
meta_verbose ("Window has _NET_WM_PID %d\n",
window->net_wm_pid);
}
}
}
static void static void
reload_net_wm_user_time (MetaWindow *window, reload_net_wm_user_time (MetaWindow *window,
MetaPropValue *value, MetaPropValue *value,
@ -1855,7 +1834,6 @@ meta_x11_display_init_window_prop_hooks (MetaX11Display *x11_display)
{ x11_display->atom_WM_CLIENT_MACHINE, META_PROP_VALUE_STRING, reload_wm_client_machine, LOAD_INIT | INCLUDE_OR }, { x11_display->atom_WM_CLIENT_MACHINE, META_PROP_VALUE_STRING, reload_wm_client_machine, LOAD_INIT | INCLUDE_OR },
{ x11_display->atom__NET_WM_NAME, META_PROP_VALUE_UTF8, reload_net_wm_name, LOAD_INIT | INCLUDE_OR }, { x11_display->atom__NET_WM_NAME, META_PROP_VALUE_UTF8, reload_net_wm_name, LOAD_INIT | INCLUDE_OR },
{ XA_WM_CLASS, META_PROP_VALUE_CLASS_HINT, reload_wm_class, LOAD_INIT | INCLUDE_OR }, { XA_WM_CLASS, META_PROP_VALUE_CLASS_HINT, reload_wm_class, LOAD_INIT | INCLUDE_OR },
{ x11_display->atom__NET_WM_PID, META_PROP_VALUE_CARDINAL, reload_net_wm_pid, LOAD_INIT | INCLUDE_OR },
{ XA_WM_NAME, META_PROP_VALUE_TEXT_PROPERTY, reload_wm_name, LOAD_INIT | INCLUDE_OR }, { XA_WM_NAME, META_PROP_VALUE_TEXT_PROPERTY, reload_wm_name, LOAD_INIT | INCLUDE_OR },
{ x11_display->atom__MUTTER_HINTS, META_PROP_VALUE_TEXT_PROPERTY, reload_mutter_hints, LOAD_INIT | INCLUDE_OR }, { x11_display->atom__MUTTER_HINTS, META_PROP_VALUE_TEXT_PROPERTY, reload_mutter_hints, LOAD_INIT | INCLUDE_OR },
{ x11_display->atom__NET_WM_OPAQUE_REGION, META_PROP_VALUE_CARDINAL_LIST, reload_opaque_region, LOAD_INIT | INCLUDE_OR }, { x11_display->atom__NET_WM_OPAQUE_REGION, META_PROP_VALUE_CARDINAL_LIST, reload_opaque_region, LOAD_INIT | INCLUDE_OR },