isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 15:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

x11-display: Get _NET_WM_NAME from context

Browse Source 
It's equivalent to the name that was passed when the context was
created.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
Jonas Ådahl 2021-03-03 22:12:01 +01:00
parent d3b7d8df0d
commit 7d0aaa14d1
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/meta-context-private.h
View File

@ -45,6 +45,8 @@ struct _MetaContextClass
void (* notify_ready) (MetaContext *context); void (* notify_ready) (MetaContext *context);
}; };
const char * meta_context_get_name (MetaContext *context);
MetaWaylandCompositor * meta_context_get_wayland_compositor (MetaContext *context); MetaWaylandCompositor * meta_context_get_wayland_compositor (MetaContext *context);
#endif /* META_CONTEXT_PRIVATE_H */ #endif /* META_CONTEXT_PRIVATE_H */

8
src/core/meta-context.c
View File

@ -117,6 +117,14 @@ meta_context_notify_ready (MetaContext *context)
META_CONTEXT_GET_CLASS (context)->notify_ready (context); META_CONTEXT_GET_CLASS (context)->notify_ready (context);
} }
const char *
meta_context_get_name (MetaContext *context)
{
MetaContextPrivate *priv = meta_context_get_instance_private (context);
return priv->name;
}
/** /**
* meta_context_get_backend: * meta_context_get_backend:
* @context: The #MetaContext * @context: The #MetaContext

3
src/meta/main.h
View File

@ -29,9 +29,6 @@
META_EXPORT META_EXPORT
gboolean meta_get_replace_current_wm (void); /* Actually defined in util.c */ gboolean meta_get_replace_current_wm (void); /* Actually defined in util.c */
META_EXPORT
void meta_set_wm_name (const char *wm_name);
META_EXPORT META_EXPORT
void meta_set_gnome_wm_keybindings (const char *wm_keybindings); void meta_set_gnome_wm_keybindings (const char *wm_keybindings);

19
src/x11/meta-x11-display.c
View File

@ -83,7 +83,6 @@ typedef struct _MetaX11DisplayLogicalMonitorData
static GdkDisplay *prepared_gdk_display = NULL; static GdkDisplay *prepared_gdk_display = NULL;
static const char *gnome_wm_keybindings = "Mutter"; static const char *gnome_wm_keybindings = "Mutter";
static const char *net_wm_name = "Mutter";
static char *get_screen_name (Display *xdisplay, static char *get_screen_name (Display *xdisplay,
int number); int number);
@ -730,6 +729,7 @@ static void
init_leader_window (MetaX11Display *x11_display, init_leader_window (MetaX11Display *x11_display,
guint32 *timestamp) guint32 *timestamp)
{ {
MetaContext *context = meta_display_get_context (x11_display->display);
gulong data[1]; gulong data[1];
XEvent event; XEvent event;
@ -746,7 +746,7 @@ init_leader_window (MetaX11Display *x11_display,
meta_prop_set_utf8_string_hint (x11_display, meta_prop_set_utf8_string_hint (x11_display,
x11_display->leader_window, x11_display->leader_window,
x11_display->atom__NET_WM_NAME, x11_display->atom__NET_WM_NAME,
net_wm_name); meta_context_get_name (context));
meta_prop_set_utf8_string_hint (x11_display, meta_prop_set_utf8_string_hint (x11_display,
x11_display->leader_window, x11_display->leader_window,
@ -1004,21 +1004,6 @@ set_work_area_hint (MetaDisplay *display,
g_free (data); g_free (data);
} }
/**
* meta_set_wm_name: (skip)
* @wm_name: value for _NET_WM_NAME
*
* Set the value to use for the _NET_WM_NAME property. To take effect,
* it is necessary to call this function before meta_init().
*/
void
meta_set_wm_name (const char *wm_name)
{
g_return_if_fail (meta_get_display () == NULL);
net_wm_name = wm_name;
}
/** /**
* meta_set_gnome_wm_keybindings: (skip) * meta_set_gnome_wm_keybindings: (skip)
* @wm_keybindings: value for _GNOME_WM_KEYBINDINGS * @wm_keybindings: value for _GNOME_WM_KEYBINDINGS