AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-29 15:01:23 +00:00
Code Issues Projects Releases Wiki Activity

x11: Use _gdk_x11_get_xatom_for_display_printf()

Browse Source 
instead of keeping the atom around all the time
This commit is contained in:
Benjamin Otte 2013-02-18 17:16:57 +01:00
parent 13eeb6ca33
commit 3eef3290ad
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/x11/xsettings-client.c
View File

@ -29,6 +29,7 @@
#include <gdk/x11/gdkx11property.h> #include <gdk/x11/gdkx11property.h>
#include <gdk/x11/gdkx11screen.h> #include <gdk/x11/gdkx11screen.h>
#include <gdk/x11/gdkx11window.h> #include <gdk/x11/gdkx11window.h>
#include <gdk/x11/gdkprivate-x11.h>
#include <gdk/x11/gdkscreen-x11.h> #include <gdk/x11/gdkscreen-x11.h>
#include <gdkinternals.h> #include <gdkinternals.h>
@ -65,7 +66,6 @@ struct _XSettingsClient
GdkScreen *screen; GdkScreen *screen;
GdkWindow *manager_window; GdkWindow *manager_window;
Atom selection_atom;
GHashTable *settings; /* string of GDK settings name => XSettingsSetting */ GHashTable *settings; /* string of GDK settings name => XSettingsSetting */
}; };
@ -454,6 +454,12 @@ read_settings (XSettingsClient *client,
g_hash_table_unref (old_list); g_hash_table_unref (old_list);
} }
static Atom
get_selection_atom (GdkScreen *screen)
{
return _gdk_x11_get_xatom_for_display_printf (gdk_screen_get_display (screen), "_XSETTINGS_S%d", gdk_x11_screen_get_screen_number (screen));
}
static GdkFilterReturn static GdkFilterReturn
gdk_xsettings_manager_window_filter (GdkXEvent *xevent, gdk_xsettings_manager_window_filter (GdkXEvent *xevent,
GdkEvent *event, GdkEvent *event,
@ -478,8 +484,7 @@ check_manager_window (XSettingsClient *client,
gdk_x11_display_grab (display); gdk_x11_display_grab (display);
manager_window_xid = XGetSelectionOwner (xdisplay, manager_window_xid = XGetSelectionOwner (xdisplay, get_selection_atom (client->screen));
client->selection_atom);
client->manager_window = gdk_x11_window_foreign_new_for_display (display, client->manager_window = gdk_x11_window_foreign_new_for_display (display,
manager_window_xid); manager_window_xid);
/* XXX: Can't use gdk_window_set_events() here because the first call to this /* XXX: Can't use gdk_window_set_events() here because the first call to this
@ -518,7 +523,7 @@ gdk_xsettings_root_window_filter (GdkXEvent *xevent,
*/ */
if (xev->xany.type == ClientMessage && if (xev->xany.type == ClientMessage &&
xev->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "MANAGER") && xev->xclient.message_type == gdk_x11_get_xatom_by_name_for_display (display, "MANAGER") &&
xev->xclient.data.l[1] == client->selection_atom) xev->xclient.data.l[1] == get_selection_atom (client->screen))
{ {
check_manager_window (client, TRUE); check_manager_window (client, TRUE);
return GDK_FILTER_REMOVE; return GDK_FILTER_REMOVE;
@ -555,7 +560,6 @@ XSettingsClient *
_gdk_x11_xsettings_client_new (GdkScreen *screen) _gdk_x11_xsettings_client_new (GdkScreen *screen)
{ {
XSettingsClient *client; XSettingsClient *client;
char *selection_atom_name;
client = g_new (XSettingsClient, 1); client = g_new (XSettingsClient, 1);
if (!client) if (!client)
@ -565,10 +569,6 @@ _gdk_x11_xsettings_client_new (GdkScreen *screen)
client->manager_window = None; client->manager_window = None;
client->settings = NULL; client->settings = NULL;
selection_atom_name = g_strdup_printf ("_XSETTINGS_S%d", gdk_x11_screen_get_screen_number (screen));
client->selection_atom = gdk_x11_get_xatom_by_name_for_display (gdk_screen_get_display (screen), selection_atom_name);
g_free (selection_atom_name);
gdk_window_add_filter (gdk_screen_get_root_window (screen), gdk_xsettings_root_window_filter, screen); gdk_window_add_filter (gdk_screen_get_root_window (screen), gdk_xsettings_root_window_filter, screen);
check_manager_window (client, FALSE); check_manager_window (client, FALSE);