callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Consolidate root window event setting in one place

Browse Source 
No need to duplicate things in xsettings code.
This commit is contained in:
Benjamin Otte 2013-02-15 18:20:18 +01:00
parent 9ed7e883f2
commit ed38dbe28f
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/x11/gdkscreen-x11.c
View File

@ -1095,6 +1095,7 @@ init_randr_support (GdkScreen *screen)
{ {
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen); GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
/* NB: This is also needed for XSettings, so don't remove. */
XSelectInput (GDK_SCREEN_XDISPLAY (screen), XSelectInput (GDK_SCREEN_XDISPLAY (screen),
x11_screen->xroot_window, x11_screen->xroot_window,
StructureNotifyMask); StructureNotifyMask);

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

@ -397,17 +397,6 @@ read_settings (XSettingsClient *client)
g_hash_table_unref (old_list); g_hash_table_unref (old_list);
} }
static void
add_events (Display *display,
Window window,
long mask)
{
XWindowAttributes attr;
XGetWindowAttributes (display, window, &attr);
XSelectInput (display, window, attr.your_event_mask | mask);
}
static Bool static Bool
gdk_xsettings_watch (Window window, gdk_xsettings_watch (Window window,
Bool is_start, Bool is_start,
@ -563,10 +552,6 @@ xsettings_client_new (GdkScreen *screen)
client->xsettings_atom = atoms[1]; client->xsettings_atom = atoms[1];
client->manager_atom = atoms[2]; client->manager_atom = atoms[2];
/* Select on StructureNotify so we get MANAGER events
*/
add_events (client->display, gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), StructureNotifyMask);
gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, client->screen); gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, client->screen);
check_manager_window (client); check_manager_window (client);