* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#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);
static GdkDisplay *
gdk_x11_screen_get_display (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
return GDK_X11_SCREEN (screen)->display;
}
static gint
gdk_x11_screen_get_width (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return WidthOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
gdk_x11_screen_get_height (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return HeightOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
gdk_x11_screen_get_width_mm (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return WidthMMOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
gdk_x11_screen_get_height_mm (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return HeightMMOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
gdk_x11_screen_get_number (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return GDK_X11_SCREEN (screen)->screen_num;
}
static GdkWindow *
gdk_x11_screen_get_root_window (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
return GDK_X11_SCREEN (screen)->root_window;
}
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;
}
}
static gint
gdk_x11_screen_get_n_monitors (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return GDK_X11_SCREEN (screen)->n_monitors;
}
static gint
gdk_x11_screen_get_primary_monitor (GdkScreen *screen)
{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
-
return GDK_X11_SCREEN (screen)->primary_monitor;
}
static gint
-gdk_x11_screen_get_monitor_width_mm (GdkScreen *screen,
- gint monitor_num)
+gdk_x11_screen_get_monitor_width_mm (GdkScreen *screen,
+ gint monitor_num)
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
- g_return_val_if_fail (monitor_num >= 0, -1);
- g_return_val_if_fail (monitor_num < x11_screen->n_monitors, -1);
-
return x11_screen->monitors[monitor_num].width_mm;
}
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
- g_return_val_if_fail (monitor_num >= 0, -1);
- g_return_val_if_fail (monitor_num < x11_screen->n_monitors, -1);
-
return x11_screen->monitors[monitor_num].height_mm;
}
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- g_return_val_if_fail (monitor_num >= 0, NULL);
- g_return_val_if_fail (monitor_num < x11_screen->n_monitors, NULL);
-
return g_strdup (x11_screen->monitors[monitor_num].output_name);
}
{
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- g_return_if_fail (GDK_IS_SCREEN (screen));
- g_return_if_fail (monitor_num >= 0);
- g_return_if_fail (monitor_num < x11_screen->n_monitors);
-
if (dest)
*dest = x11_screen->monitors[monitor_num].geometry;
}
-static GdkVisual *
-gdk_x11_screen_get_rgba_visual (GdkScreen *screen)
+static int
+get_current_desktop (GdkScreen *screen)
{
- GdkX11Screen *x11_screen;
+ Display *display;
+ Window win;
+ Atom current_desktop, type;
+ int format;
+ unsigned long n_items, bytes_after;
+ unsigned char *data_return = NULL;
+ int workspace = 0;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+ if (!gdk_x11_screen_supports_net_wm_hint (screen,
+ gdk_atom_intern_static_string ("_NET_CURRENT_DESKTOP")))
+ return workspace;
- x11_screen = GDK_X11_SCREEN (screen);
+ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+ win = XRootWindow (display, GDK_SCREEN_XNUMBER (screen));
+
+ current_desktop = XInternAtom (display, "_NET_CURRENT_DESKTOP", True);
+
+ XGetWindowProperty (display,
+ win,
+ current_desktop,
+ 0, G_MAXLONG,
+ False, XA_CARDINAL,
+ &type, &format, &n_items, &bytes_after,
+ &data_return);
+
+ if (type == XA_CARDINAL && format == 32 && n_items > 0)
+ workspace = (int) data_return[0];
+
+ if (data_return)
+ XFree (data_return);
+
+ return workspace;
+}
+
+static void
+get_work_area (GdkScreen *screen,
+ GdkRectangle *area)
+{
+ Atom workarea;
+ Atom type;
+ Window win;
+ int format;
+ gulong num;
+ gulong leftovers;
+ gulong max_len = 4 * 32;
+ guchar *ret_workarea;
+ long *workareas;
+ int result;
+ int disp_screen;
+ int desktop;
+ Display *display;
+
+ display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+ disp_screen = GDK_SCREEN_XNUMBER (screen);
+ workarea = XInternAtom (display, "_NET_WORKAREA", True);
+
+ /* Defaults in case of error */
+ area->x = 0;
+ area->y = 0;
+ area->width = gdk_screen_get_width (screen);
+ area->height = gdk_screen_get_height (screen);
+
+ if (!gdk_x11_screen_supports_net_wm_hint (screen,
+ gdk_atom_intern_static_string ("_NET_WORKAREA")))
+ return;
+
+ if (workarea == None)
+ return;
+
+ win = XRootWindow (display, disp_screen);
+ result = XGetWindowProperty (display,
+ win,
+ workarea,
+ 0,
+ max_len,
+ False,
+ AnyPropertyType,
+ &type,
+ &format,
+ &num,
+ &leftovers,
+ &ret_workarea);
+ if (result != Success ||
+ type == None ||
+ format == 0 ||
+ leftovers ||
+ num % 4 != 0)
+ return;
+
+ desktop = get_current_desktop (screen);
+
+ workareas = (long *) ret_workarea;
+ area->x = workareas[desktop * 4];
+ area->y = workareas[desktop * 4 + 1];
+ area->width = workareas[desktop * 4 + 2];
+ area->height = workareas[desktop * 4 + 3];
+
+ XFree (ret_workarea);
+}
+
+static void
+gdk_x11_screen_get_monitor_workarea (GdkScreen *screen,
+ gint monitor_num,
+ GdkRectangle *dest)
+{
+ GdkRectangle workarea;
+
+ gdk_x11_screen_get_monitor_geometry (screen, monitor_num, dest);
+
+ /* The EWMH constrains workarea to be a rectangle, so it
+ * can't adequately deal with L-shaped monitor arrangements.
+ * As a workaround, we ignore the workarea for anything
+ * but the primary monitor. Since that is where the 'desktop
+ * chrome' usually lives, this works ok in practice.
+ */
+ if (monitor_num == GDK_X11_SCREEN (screen)->primary_monitor)
+ {
+ get_work_area (screen, &workarea);
+ if (gdk_rectangle_intersect (dest, &workarea, &workarea))
+ *dest = workarea;
+ }
+}
+
+static GdkVisual *
+gdk_x11_screen_get_rgba_visual (GdkScreen *screen)
+{
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
return x11_screen->rgba_visual;
}
/**
* gdk_x11_screen_get_xscreen:
- * @screen: (type GdkX11Screen): a #GdkScreen.
- * @returns: (transfer none): an Xlib <type>Screen*</type>
+ * @screen: (type GdkX11Screen): a #GdkScreen
*
* Returns the screen of a #GdkScreen.
*
+ * Returns: (transfer none): an Xlib <type>Screen*</type>
+ *
* Since: 2.2
*/
Screen *
/**
* gdk_x11_screen_get_screen_number:
- * @screen: (type GdkX11Screen): a #GdkScreen.
- * @returns: the position of @screen among the screens of
- * its display.
+ * @screen: (type GdkX11Screen): a #GdkScreen
*
* Returns the index of a #GdkScreen.
*
+ * Returns: the position of @screen among the screens
+ * of its display
+ *
* Since: 2.2
*/
int
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;
static gboolean
gdk_x11_screen_is_composited (GdkScreen *screen)
{
- GdkX11Screen *x11_screen;
-
- g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
-
- x11_screen = GDK_X11_SCREEN (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
return x11_screen->is_composited;
}
{
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);
{
const gchar *old_display;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
old_display = gdk_display_get_name (gdk_screen_get_display (screen));
return substitute_screen_number (old_display,
static GdkWindow *
gdk_x11_screen_get_active_window (GdkScreen *screen)
{
- GdkX11Screen *x11_screen;
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
GdkWindow *ret = NULL;
Atom type_return;
gint format_return;
gulong bytes_after_return;
guchar *data = NULL;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
if (!gdk_x11_screen_supports_net_wm_hint (screen,
gdk_atom_intern_static_string ("_NET_ACTIVE_WINDOW")))
return NULL;
- x11_screen = GDK_X11_SCREEN (screen);
-
if (XGetWindowProperty (x11_screen->xdisplay, x11_screen->xroot_window,
gdk_x11_get_xatom_by_name_for_display (x11_screen->display,
"_NET_ACTIVE_WINDOW"),
static GList *
gdk_x11_screen_get_window_stack (GdkScreen *screen)
{
- GdkX11Screen *x11_screen;
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
GList *ret = NULL;
Atom type_return;
gint format_return;
gulong bytes_after_return;
guchar *data = NULL;
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
if (!gdk_x11_screen_supports_net_wm_hint (screen,
gdk_atom_intern_static_string ("_NET_CLIENT_LIST_STACKING")))
return NULL;
- x11_screen = GDK_X11_SCREEN (screen);
-
if (XGetWindowProperty (x11_screen->xdisplay, x11_screen->xroot_window,
gdk_x11_get_xatom_by_name_for_display (x11_screen->display,
"_NET_CLIENT_LIST_STACKING"),
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 GValue *setting;
- const char *xsettings_name = NULL;
- XSettingsResult result;
- XSettingsSetting *setting = NULL;
- GdkX11Screen *x11_screen;
- gboolean success = FALSE;
- gint i;
- GValue tmp_val = { 0, };
-
- g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
-
- x11_screen = GDK_X11_SCREEN (screen);
-
- 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;
-
- 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_COLOR, G_VALUE_TYPE (value)))
- {
- GdkColor color;
-
- g_value_init (&tmp_val, GDK_TYPE_COLOR);
-
- color.pixel = 0;
- color.red = setting->data.v_color.red;
- color.green = setting->data.v_color.green;
- color.blue = setting->data.v_color.blue;
-
- g_value_set_boxed (&tmp_val, &color);
-
- 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
g_free (supported_atoms);
}
-static void
-fetch_net_wm_check_window (GdkScreen *screen)
+static Window
+get_net_supporting_wm_check (GdkX11Screen *screen,
+ Window window)
{
- GdkX11Screen *x11_screen;
GdkDisplay *display;
Atom type;
gint format;
gulong n_items;
gulong bytes_after;
guchar *data;
- Window *xwindow;
+ Window value;
+
+ display = screen->display;
+ type = None;
+ data = NULL;
+ value = None;
+
+ gdk_x11_display_error_trap_push (display);
+ XGetWindowProperty (screen->xdisplay, window,
+ gdk_x11_get_xatom_by_name_for_display (display, "_NET_SUPPORTING_WM_CHECK"),
+ 0, G_MAXLONG, False, XA_WINDOW, &type, &format,
+ &n_items, &bytes_after, &data);
+ gdk_x11_display_error_trap_pop_ignored (display);
+
+ if (type == XA_WINDOW)
+ value = *(Window *)data;
+
+ if (data)
+ XFree (data);
+
+ return value;
+}
+
+static void
+fetch_net_wm_check_window (GdkScreen *screen)
+{
+ GdkX11Screen *x11_screen;
+ GdkDisplay *display;
+ Window window;
GTimeVal tv;
gint error;
display = x11_screen->display;
g_return_if_fail (GDK_X11_DISPLAY (display)->trusted_client);
-
+
+ if (x11_screen->wmspec_check_window != None)
+ return; /* already have it */
+
g_get_current_time (&tv);
if (ABS (tv.tv_sec - x11_screen->last_wmspec_check_time) < 15)
return; /* we've checked recently */
- x11_screen->last_wmspec_check_time = tv.tv_sec;
-
- data = NULL;
- XGetWindowProperty (x11_screen->xdisplay, x11_screen->xroot_window,
- gdk_x11_get_xatom_by_name_for_display (display, "_NET_SUPPORTING_WM_CHECK"),
- 0, G_MAXLONG, False, XA_WINDOW, &type, &format,
- &n_items, &bytes_after, &data);
-
- if (type != XA_WINDOW)
- {
- if (data)
- XFree (data);
- return;
- }
-
- xwindow = (Window *)data;
+ window = get_net_supporting_wm_check (x11_screen, x11_screen->xroot_window);
+ if (window == None)
+ return;
- if (x11_screen->wmspec_check_window == *xwindow)
- {
- XFree (xwindow);
- return;
- }
+ if (window != get_net_supporting_wm_check (x11_screen, window))
+ return;
gdk_x11_display_error_trap_push (display);
/* Find out if this WM goes away, so we can reset everything. */
- XSelectInput (x11_screen->xdisplay, *xwindow, StructureNotifyMask);
+ XSelectInput (x11_screen->xdisplay, window, StructureNotifyMask);
error = gdk_x11_display_error_trap_pop (display);
if (!error)
{
- x11_screen->wmspec_check_window = *xwindow;
+ /* We check the window property again because after XGetWindowProperty()
+ * and before XSelectInput() the window may have been recycled in such a
+ * way that XSelectInput() doesn't fail but the window is no longer what
+ * we want.
+ */
+ if (window != get_net_supporting_wm_check (x11_screen, window))
+ return;
+
+ x11_screen->wmspec_check_window = window;
+ x11_screen->last_wmspec_check_time = tv.tv_sec;
x11_screen->need_refetch_net_supported = TRUE;
x11_screen->need_refetch_wm_name = TRUE;
/* Careful, reentrancy */
- _gdk_x11_screen_window_manager_changed (GDK_SCREEN (x11_screen));
+ _gdk_x11_screen_window_manager_changed (screen);
}
- else if (error == BadWindow)
- {
- /* Leftover property, try again immediately, new wm may be starting up */
- x11_screen->last_wmspec_check_time = 0;
- }
-
- XFree (xwindow);
}
/**
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);
}
/**
screen_class->get_monitor_height_mm = gdk_x11_screen_get_monitor_height_mm;
screen_class->get_monitor_plug_name = gdk_x11_screen_get_monitor_plug_name;
screen_class->get_monitor_geometry = gdk_x11_screen_get_monitor_geometry;
+ screen_class->get_monitor_workarea = gdk_x11_screen_get_monitor_workarea;
screen_class->get_system_visual = _gdk_x11_screen_get_system_visual;
screen_class->get_rgba_visual = gdk_x11_screen_get_rgba_visual;
screen_class->is_composited = gdk_x11_screen_is_composited;
screen_class->list_visuals = _gdk_x11_screen_list_visuals;
signals[WINDOW_MANAGER_CHANGED] =
- g_signal_new (g_intern_static_string ("window_manager_changed"),
+ g_signal_new (g_intern_static_string ("window-manager-changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GdkX11ScreenClass, window_manager_changed),
projects / ~andy / gtk / blobdiff