]> Pileus Git - ~andy/gtk/blobdiff - gdk/x11/gdkscreen-x11.c
x11: Don't keep an "in_init" variable
[~andy/gtk] / gdk / x11 / gdkscreen-x11.c
index b5767b58f41bc3ae0047e970a10a7ab987d274a6..ac0b84319a204c8a6cada9d9a45c97349374a15c 100644 (file)
@@ -47,8 +47,6 @@
 #include <X11/extensions/Xfixes.h>
 #endif
 
-#include "gdksettings.c"
-
 static void         gdk_x11_screen_dispose     (GObject                  *object);
 static void         gdk_x11_screen_finalize    (GObject                  *object);
 static void        init_randr_support         (GdkScreen         *screen);
@@ -137,7 +135,7 @@ _gdk_x11_screen_events_uninit (GdkScreen *screen)
 
   if (x11_screen->xsettings_client)
     {
-      xsettings_client_destroy (x11_screen->xsettings_client);
+      _gdk_x11_xsettings_client_destroy (x11_screen->xsettings_client);
       x11_screen->xsettings_client = NULL;
     }
 }
@@ -779,12 +777,179 @@ init_xfree_xinerama (GdkScreen *screen)
   return FALSE;
 }
 
+static gboolean
+init_solaris_xinerama_indices (GdkX11Screen *x11_screen)
+{
+#ifdef HAVE_SOLARIS_XINERAMA
+  XRectangle    x_monitors[MAXFRAMEBUFFERS];
+  unsigned char hints[16];
+  gint          result;
+  gint          monitor_num;
+  gint          x_n_monitors;
+  gint          i;
+
+  if (!XineramaGetState (x11_screen->xdisplay, x11_screen->screen_num))
+    return FALSE;
+
+  result = XineramaGetInfo (x11_screen->xdisplay, x11_screen->screen_num,
+                            x_monitors, hints, &x_n_monitors);
+
+  if (result == 0)
+    return FALSE;
+
+
+  for (monitor_num = 0; monitor_num < x11_screen->n_monitors; ++monitor_num)
+    {
+      for (i = 0; i < x_n_monitors; ++i)
+        {
+          if (x11_screen->monitors[monitor_num].geometry.x == x_monitors[i].x &&
+             x11_screen->monitors[monitor_num].geometry.y == x_monitors[i].y &&
+             x11_screen->monitors[monitor_num].geometry.width == x_monitors[i].width &&
+             x11_screen->monitors[monitor_num].geometry.height == x_monitors[i].height)
+           {
+             g_hash_table_insert (x11_screen->xinerama_matches,
+                                  GINT_TO_POINTER (monitor_num),
+                                  GINT_TO_POINTER (i));
+           }
+        }
+    }
+  return TRUE;
+#endif /* HAVE_SOLARIS_XINERAMA */
+
+  return FALSE;
+}
+
+static gboolean
+init_xfree_xinerama_indices (GdkX11Screen *x11_screen)
+{
+#ifdef HAVE_XFREE_XINERAMA
+  XineramaScreenInfo *x_monitors;
+  gint                monitor_num;
+  gint                x_n_monitors;
+  gint                i;
+
+  if (!XineramaIsActive (x11_screen->xdisplay))
+    return FALSE;
+
+  x_monitors = XineramaQueryScreens (x11_screen->xdisplay, &x_n_monitors);
+  if (x_n_monitors <= 0 || x_monitors == NULL)
+    {
+      if (x_monitors)
+       XFree (x_monitors);
+
+      return FALSE;
+    }
+
+  for (monitor_num = 0; monitor_num < x11_screen->n_monitors; ++monitor_num)
+    {
+      for (i = 0; i < x_n_monitors; ++i)
+        {
+          if (x11_screen->monitors[monitor_num].geometry.x == x_monitors[i].x_org &&
+             x11_screen->monitors[monitor_num].geometry.y == x_monitors[i].y_org &&
+             x11_screen->monitors[monitor_num].geometry.width == x_monitors[i].width &&
+             x11_screen->monitors[monitor_num].geometry.height == x_monitors[i].height)
+           {
+             g_hash_table_insert (x11_screen->xinerama_matches,
+                                  GINT_TO_POINTER (monitor_num),
+                                  GINT_TO_POINTER (i));
+           }
+        }
+    }
+  XFree (x_monitors);
+  return TRUE;
+#endif /* HAVE_XFREE_XINERAMA */
+
+  return FALSE;
+}
+
+static void
+init_xinerama_indices (GdkX11Screen *x11_screen)
+{
+  int opcode, firstevent, firsterror;
+
+  x11_screen->xinerama_matches = g_hash_table_new (g_direct_hash, g_direct_equal);
+  if (XQueryExtension (x11_screen->xdisplay, "XINERAMA",
+                      &opcode, &firstevent, &firsterror))
+    {
+      x11_screen->xinerama_matches = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+      /* Solaris Xinerama first, then XFree/Xorg Xinerama
+       * to match the order in init_multihead()
+       */
+      if (init_solaris_xinerama_indices (x11_screen) == FALSE)
+        init_xfree_xinerama_indices (x11_screen);
+    }
+}
+
+gint
+_gdk_x11_screen_get_xinerama_index (GdkScreen *screen,
+                                   gint       monitor_num)
+{
+  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
+  gpointer val;
+
+  g_return_val_if_fail (monitor_num < x11_screen->n_monitors, -1);
+
+  if (x11_screen->xinerama_matches == NULL)
+    init_xinerama_indices (x11_screen);
+
+  if (g_hash_table_lookup_extended (x11_screen->xinerama_matches, GINT_TO_POINTER (monitor_num), NULL, &val))
+    return (GPOINTER_TO_INT(val));
+
+  return -1;
+}
+
+void
+_gdk_x11_screen_get_edge_monitors (GdkScreen *screen,
+                                   gint      *top,
+                                   gint      *bottom,
+                                   gint      *left,
+                                   gint      *right)
+{
+  GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
+  gint          top_most_pos = HeightOfScreen (GDK_X11_SCREEN (screen)->xscreen);
+  gint          left_most_pos = WidthOfScreen (GDK_X11_SCREEN (screen)->xscreen);
+  gint          bottom_most_pos = 0;
+  gint          right_most_pos = 0;
+  gint          monitor_num;
+
+  for (monitor_num = 0; monitor_num < x11_screen->n_monitors; monitor_num++)
+    {
+      gint monitor_x = x11_screen->monitors[monitor_num].geometry.x;
+      gint monitor_y = x11_screen->monitors[monitor_num].geometry.y;
+      gint monitor_max_x = monitor_x + x11_screen->monitors[monitor_num].geometry.width;
+      gint monitor_max_y = monitor_y + x11_screen->monitors[monitor_num].geometry.height;
+
+      if (left && left_most_pos > monitor_x)
+       {
+         left_most_pos = monitor_x;
+         *left = monitor_num;
+       }
+      if (right && right_most_pos < monitor_max_x)
+       {
+         right_most_pos = monitor_max_x;
+         *right = monitor_num;
+       }
+      if (top && top_most_pos > monitor_y)
+       {
+         top_most_pos = monitor_y;
+         *top = monitor_num;
+       }
+      if (bottom && bottom_most_pos < monitor_max_y)
+       {
+         bottom_most_pos = monitor_max_y;
+         *bottom = monitor_num;
+       }
+    }
+}
+
 static void
 deinit_multihead (GdkScreen *screen)
 {
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
 
   free_monitors (x11_screen->monitors, x11_screen->n_monitors);
+  g_clear_pointer (&x11_screen->xinerama_matches, g_hash_table_destroy);
 
   x11_screen->n_monitors = 0;
   x11_screen->monitors = NULL;
@@ -930,6 +1095,7 @@ init_randr_support (GdkScreen *screen)
 {
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
 
+  /* NB: This is also needed for XSettings, so don't remove. */
   XSelectInput (GDK_SCREEN_XDISPLAY (screen),
                 x11_screen->xroot_window,
                 StructureNotifyMask);
@@ -1162,104 +1328,33 @@ gdk_x11_screen_get_window_stack (GdkScreen *screen)
   return ret;
 }
 
-static gboolean
-check_transform (const gchar *xsettings_name,
-                GType        src_type,
-                GType        dest_type)
-{
-  if (!g_value_type_transformable (src_type, dest_type))
-    {
-      g_warning ("Cannot transform xsetting %s of type %s to type %s\n",
-                xsettings_name,
-                g_type_name (src_type),
-                g_type_name (dest_type));
-      return FALSE;
-    }
-  else
-    return TRUE;
-}
-
 static gboolean
 gdk_x11_screen_get_setting (GdkScreen   *screen,
                            const gchar *name,
                            GValue      *value)
 {
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
-  const char *xsettings_name = NULL;
-  XSettingsResult result;
-  XSettingsSetting *setting = NULL;
-  gboolean success = FALSE;
-  gint i;
-  GValue tmp_val = G_VALUE_INIT;
-
-  for (i = 0; i < GDK_SETTINGS_N_ELEMENTS(); i++)
-    if (strcmp (GDK_SETTINGS_GDK_NAME (i), name) == 0)
-      {
-       xsettings_name = GDK_SETTINGS_X_NAME (i);
-       break;
-      }
-
-  if (!xsettings_name)
-    goto out;
+  const GValue *setting;
 
-  result = xsettings_client_get_setting (x11_screen->xsettings_client,
-                                        xsettings_name, &setting);
-  if (result != XSETTINGS_SUCCESS)
+  setting = _gdk_x11_xsettings_client_get_setting (x11_screen->xsettings_client, name);
+  if (setting == NULL)
     goto out;
 
-  switch (setting->type)
+  if (!g_value_type_transformable (G_VALUE_TYPE (setting), G_VALUE_TYPE (value)))
     {
-    case XSETTINGS_TYPE_INT:
-      if (check_transform (xsettings_name, G_TYPE_INT, G_VALUE_TYPE (value)))
-       {
-         g_value_init (&tmp_val, G_TYPE_INT);
-         g_value_set_int (&tmp_val, setting->data.v_int);
-         g_value_transform (&tmp_val, value);
-
-         success = TRUE;
-       }
-      break;
-    case XSETTINGS_TYPE_STRING:
-      if (check_transform (xsettings_name, G_TYPE_STRING, G_VALUE_TYPE (value)))
-       {
-         g_value_init (&tmp_val, G_TYPE_STRING);
-         g_value_set_string (&tmp_val, setting->data.v_string);
-         g_value_transform (&tmp_val, value);
-
-         success = TRUE;
-       }
-      break;
-    case XSETTINGS_TYPE_COLOR:
-      if (!check_transform (xsettings_name, GDK_TYPE_RGBA, G_VALUE_TYPE (value)))
-       {
-         GdkRGBA rgba;
-
-         g_value_init (&tmp_val, GDK_TYPE_RGBA);
-
-         rgba.red = setting->data.v_color.red / 65535.0;
-         rgba.green = setting->data.v_color.green / 65535.0;
-         rgba.blue = setting->data.v_color.blue / 65535.0;
-         rgba.alpha = setting->data.v_color.alpha / 65535.0;
-
-         g_value_set_boxed (&tmp_val, &rgba);
-
-         g_value_transform (&tmp_val, value);
-
-         success = TRUE;
-       }
-      break;
+      g_warning ("Cannot transform xsetting %s of type %s to type %s\n",
+                name,
+                g_type_name (G_VALUE_TYPE (setting)),
+                g_type_name (G_VALUE_TYPE (value)));
+      goto out;
     }
 
-  g_value_unset (&tmp_val);
+  g_value_transform (setting, value);
 
- out:
-  if (setting)
-    xsettings_setting_free (setting);
+  return TRUE;
 
-  if (success)
-    return TRUE;
-  else
-    return _gdk_x11_get_xft_setting (screen, name, value);
+ out:
+  return _gdk_x11_get_xft_setting (screen, name, value);
 }
 
 static void
@@ -1454,144 +1549,12 @@ gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
   return FALSE;
 }
 
-static void
-refcounted_grab_server (Display *xdisplay)
-{
-  GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay);
-
-  gdk_x11_display_grab (display);
-}
-
-static void
-refcounted_ungrab_server (Display *xdisplay)
-{
-  GdkDisplay *display = gdk_x11_lookup_xdisplay (xdisplay);
-
-  gdk_x11_display_ungrab (display);
-}
-
-static GdkFilterReturn
-gdk_xsettings_client_event_filter (GdkXEvent *xevent,
-                                  GdkEvent  *event,
-                                  gpointer   data)
-{
-  GdkX11Screen *screen = data;
-
-  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
-    return GDK_FILTER_REMOVE;
-  else
-    return GDK_FILTER_CONTINUE;
-}
-
-static Bool
-gdk_xsettings_watch_cb (Window   window,
-                       Bool     is_start,
-                       long     mask,
-                       void    *cb_data)
-{
-  GdkWindow *gdkwin;
-  GdkScreen *screen = cb_data;
-
-  gdkwin = gdk_x11_window_lookup_for_display (gdk_screen_get_display (screen), window);
-
-  if (is_start)
-    {
-      if (gdkwin)
-       g_object_ref (gdkwin);
-      else
-       {
-         gdkwin = gdk_x11_window_foreign_new_for_display (gdk_screen_get_display (screen), window);
-         
-         /* gdk_window_foreign_new_for_display() can fail and return NULL if the
-          * window has already been destroyed.
-          */
-         if (!gdkwin)
-           return False;
-       }
-
-      gdk_window_add_filter (gdkwin, gdk_xsettings_client_event_filter, screen);
-    }
-  else
-    {
-      if (!gdkwin)
-       {
-         /* gdkwin should not be NULL here, since if starting the watch succeeded
-          * we have a reference on the window. It might mean that the caller didn't
-          * remove the watch when it got a DestroyNotify event. Or maybe the
-          * caller ignored the return value when starting the watch failed.
-          */
-         g_warning ("gdk_xsettings_watch_cb(): Couldn't find window to unwatch");
-         return False;
-       }
-      
-      gdk_window_remove_filter (gdkwin, gdk_xsettings_client_event_filter, screen);
-      g_object_unref (gdkwin);
-    }
-
-  return True;
-}
-
-static void
-gdk_xsettings_notify_cb (const char       *name,
-                        XSettingsAction   action,
-                        XSettingsSetting *setting,
-                        void             *data)
-{
-  GdkEvent new_event;
-  GdkScreen *screen = data;
-  GdkX11Screen *x11_screen = data;
-  int i;
-
-  if (x11_screen->xsettings_in_init)
-    return;
-  
-  new_event.type = GDK_SETTING;
-  new_event.setting.window = gdk_screen_get_root_window (screen);
-  new_event.setting.send_event = FALSE;
-  new_event.setting.name = NULL;
-
-  for (i = 0; i < GDK_SETTINGS_N_ELEMENTS() ; i++)
-    if (strcmp (GDK_SETTINGS_X_NAME (i), name) == 0)
-      {
-       new_event.setting.name = (char*) GDK_SETTINGS_GDK_NAME (i);
-       break;
-      }
-  
-  if (!new_event.setting.name)
-    return;
-  
-  switch (action)
-    {
-    case XSETTINGS_ACTION_NEW:
-      new_event.setting.action = GDK_SETTING_ACTION_NEW;
-      break;
-    case XSETTINGS_ACTION_CHANGED:
-      new_event.setting.action = GDK_SETTING_ACTION_CHANGED;
-      break;
-    case XSETTINGS_ACTION_DELETED:
-      new_event.setting.action = GDK_SETTING_ACTION_DELETED;
-      break;
-    }
-
-  gdk_event_put (&new_event);
-}
-
 void
 _gdk_x11_screen_init_events (GdkScreen *screen)
 {
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
 
-  /* Keep a flag to avoid extra notifies that we don't need
-   */
-  x11_screen->xsettings_in_init = TRUE;
-  x11_screen->xsettings_client = xsettings_client_new_with_grab_funcs (x11_screen->xdisplay,
-                                                                      x11_screen->screen_num,
-                                                                      gdk_xsettings_notify_cb,
-                                                                      gdk_xsettings_watch_cb,
-                                                                      screen,
-                                                                       refcounted_grab_server,
-                                                                       refcounted_ungrab_server);
-  x11_screen->xsettings_in_init = FALSE;
+  x11_screen->xsettings_client = _gdk_x11_xsettings_client_new (screen);
 }
 
 /**