x11: Call grab functions directly

[~andy/gtk] / gdk / x11 / xsettings-client.c

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 93d3bc1e5bc1c7132ac169e7ed5db284f5cb6637..da7d55b93a14f9376eeabeddc8b8b1592047bcc5 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -25,7 +25,9 @@
 
 #include "xsettings-client.h"
 
-#include <glib.h>
+#include <gdk/x11/gdkx11display.h>
+#include <gdk/x11/gdkx11screen.h>
+#include <gdk/x11/gdkx11window.h>
 
 #include <limits.h>
 #include <stdio.h>
@@ -37,15 +39,12 @@
 
 struct _XSettingsClient
 {
+  GdkScreen *screen;
   Display *display;
-  int screen;
   XSettingsNotifyFunc notify;
   XSettingsWatchFunc watch;
   void *cb_data;
 
-  XSettingsGrabFunc grab;
-  XSettingsGrabFunc ungrab;
-
   Window manager_window;
   Atom manager_atom;
   Atom selection_atom;
@@ -416,10 +415,7 @@ check_manager_window (XSettingsClient *client)
   if (client->manager_window && client->watch)
     client->watch (client->manager_window, False, 0, client->cb_data);
 
-  if (client->grab)
-    client->grab (client->display);
-  else
-    XGrabServer (client->display);
+  gdk_x11_display_grab (gdk_screen_get_display (client->screen));
 
   client->manager_window = XGetSelectionOwner (client->display,
                                               client->selection_atom);
@@ -427,10 +423,7 @@ check_manager_window (XSettingsClient *client)
     XSelectInput (client->display, client->manager_window,
                  PropertyChangeMask | StructureNotifyMask);
 
-  if (client->ungrab)
-    client->ungrab (client->display);
-  else
-    XUngrabServer (client->display);
+  gdk_x11_display_ungrab (gdk_screen_get_display (client->screen));
   
   XFlush (client->display);
 
@@ -453,13 +446,10 @@ check_manager_window (XSettingsClient *client)
 }
 
 XSettingsClient *
-xsettings_client_new (Display             *display,
-                     int                  screen,
+xsettings_client_new (GdkScreen           *screen,
                      XSettingsNotifyFunc  notify,
                      XSettingsWatchFunc   watch,
-                     void                *cb_data,
-                     XSettingsGrabFunc    grab,
-                     XSettingsGrabFunc    ungrab)
+                     void                *cb_data)
 {
   XSettingsClient *client;
   char buffer[256];
@@ -470,22 +460,20 @@ xsettings_client_new (Display             *display,
   if (!client)
     return NULL;
 
-  client->display = display;
   client->screen = screen;
+  client->display = gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen));
   client->notify = notify;
   client->watch = watch;
   client->cb_data = cb_data;
-  client->grab = grab;
-  client->ungrab = ungrab;
   client->manager_window = None;
   client->settings = NULL;
 
-  sprintf(buffer, "_XSETTINGS_S%d", screen);
+  sprintf(buffer, "_XSETTINGS_S%d", gdk_x11_screen_get_screen_number (screen));
   atom_names[0] = buffer;
   atom_names[1] = "_XSETTINGS_SETTINGS";
   atom_names[2] = "MANAGER";
 
-  XInternAtoms (display, atom_names, 3, False, atoms);
+  XInternAtoms (client->display, atom_names, 3, False, atoms);
 
   client->selection_atom = atoms[0];
   client->xsettings_atom = atoms[1];
@@ -493,10 +481,10 @@ xsettings_client_new (Display             *display,
 
   /* Select on StructureNotify so we get MANAGER events
    */
-  add_events (display, RootWindow (display, screen), StructureNotifyMask);
+  add_events (client->display, gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), StructureNotifyMask);
 
   if (client->watch)
-    client->watch (RootWindow (display, screen), True, StructureNotifyMask,
+    client->watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, StructureNotifyMask,
                   client->cb_data);
 
   check_manager_window (client);
@@ -504,26 +492,11 @@ xsettings_client_new (Display             *display,
   return client;
 }
 
-
-void
-xsettings_client_set_grab_func   (XSettingsClient      *client,
-                                 XSettingsGrabFunc     grab)
-{
-  client->grab = grab;
-}
-
-void
-xsettings_client_set_ungrab_func (XSettingsClient      *client,
-                                 XSettingsGrabFunc     ungrab)
-{
-  client->ungrab = ungrab;
-}
-
 void
 xsettings_client_destroy (XSettingsClient *client)
 {
   if (client->watch)
-    client->watch (RootWindow (client->display, client->screen),
+    client->watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)),
                   False, 0, client->cb_data);
   if (client->manager_window && client->watch)
     client->watch (client->manager_window, False, 0, client->cb_data);
@@ -549,7 +522,7 @@ xsettings_client_process_event (XSettingsClient *client,
    * times when the manager changes from A->B. But manager changes
    * are going to be pretty rare.
    */
-  if (xev->xany.window == RootWindow (client->display, client->screen))
+  if (xev->xany.window == gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)))
     {
       if (xev->xany.type == ClientMessage &&
          xev->xclient.message_type == client->manager_atom &&