/*
* gdkscreen-x11.c
- *
- * Copyright 2001 Sun Microsystems Inc.
+ *
+ * Copyright 2001 Sun Microsystems Inc.
*
* Erwann Chenede <erwann.chenede@sun.com>
*
#include "gdksettings.c"
-static void gdk_screen_x11_dispose (GObject *object);
-static void gdk_screen_x11_finalize (GObject *object);
+static void gdk_x11_screen_dispose (GObject *object);
+static void gdk_x11_screen_finalize (GObject *object);
static void init_randr_support (GdkScreen *screen);
static void deinit_multihead (GdkScreen *screen);
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (GdkScreenX11, _gdk_screen_x11, GDK_TYPE_SCREEN)
+G_DEFINE_TYPE (GdkX11Screen, gdk_x11_screen, GDK_TYPE_SCREEN)
typedef struct _NetWmSupportedAtoms NetWmSupportedAtoms;
static void
-_gdk_screen_x11_init (GdkScreenX11 *screen)
+gdk_x11_screen_init (GdkX11Screen *screen)
{
}
static GdkDisplay *
-gdk_screen_x11_get_display (GdkScreen *screen)
+gdk_x11_screen_get_display (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- return GDK_SCREEN_X11 (screen)->display;
+ return GDK_X11_SCREEN (screen)->display;
}
static gint
-gdk_screen_x11_get_width (GdkScreen *screen)
+gdk_x11_screen_get_width (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return WidthOfScreen (GDK_SCREEN_X11 (screen)->xscreen);
+ return WidthOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
-gdk_screen_x11_get_height (GdkScreen *screen)
+gdk_x11_screen_get_height (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return HeightOfScreen (GDK_SCREEN_X11 (screen)->xscreen);
+ return HeightOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
-gdk_screen_x11_get_width_mm (GdkScreen *screen)
+gdk_x11_screen_get_width_mm (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return WidthMMOfScreen (GDK_SCREEN_X11 (screen)->xscreen);
+ return WidthMMOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
-gdk_screen_x11_get_height_mm (GdkScreen *screen)
+gdk_x11_screen_get_height_mm (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return HeightMMOfScreen (GDK_SCREEN_X11 (screen)->xscreen);
+ return HeightMMOfScreen (GDK_X11_SCREEN (screen)->xscreen);
}
static gint
-gdk_screen_x11_get_number (GdkScreen *screen)
+gdk_x11_screen_get_number (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return GDK_SCREEN_X11 (screen)->screen_num;
+ return GDK_X11_SCREEN (screen)->screen_num;
}
static GdkWindow *
-gdk_screen_x11_get_root_window (GdkScreen *screen)
+gdk_x11_screen_get_root_window (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- return GDK_SCREEN_X11 (screen)->root_window;
+ return GDK_X11_SCREEN (screen)->root_window;
}
static void
-_gdk_screen_x11_events_uninit (GdkScreen *screen)
+_gdk_x11_screen_events_uninit (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- if (screen_x11->xsettings_client)
+ if (x11_screen->xsettings_client)
{
- xsettings_client_destroy (screen_x11->xsettings_client);
- screen_x11->xsettings_client = NULL;
+ xsettings_client_destroy (x11_screen->xsettings_client);
+ x11_screen->xsettings_client = NULL;
}
}
static void
-gdk_screen_x11_dispose (GObject *object)
+gdk_x11_screen_dispose (GObject *object)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (object);
int i;
for (i = 0; i < 32; ++i)
{
- if (screen_x11->subwindow_gcs[i])
+ if (x11_screen->subwindow_gcs[i])
{
- XFreeGC (screen_x11->xdisplay, screen_x11->subwindow_gcs[i]);
- screen_x11->subwindow_gcs[i] = 0;
+ XFreeGC (x11_screen->xdisplay, x11_screen->subwindow_gcs[i]);
+ x11_screen->subwindow_gcs[i] = 0;
}
}
- _gdk_screen_x11_events_uninit (GDK_SCREEN (object));
+ _gdk_x11_screen_events_uninit (GDK_SCREEN (object));
- if (screen_x11->root_window)
- _gdk_window_destroy (screen_x11->root_window, TRUE);
+ if (x11_screen->root_window)
+ _gdk_window_destroy (x11_screen->root_window, TRUE);
- G_OBJECT_CLASS (_gdk_screen_x11_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gdk_x11_screen_parent_class)->dispose (object);
- screen_x11->xdisplay = NULL;
- screen_x11->xscreen = NULL;
- screen_x11->screen_num = -1;
- screen_x11->xroot_window = None;
- screen_x11->wmspec_check_window = None;
+ x11_screen->xdisplay = NULL;
+ x11_screen->xscreen = NULL;
+ x11_screen->screen_num = -1;
+ x11_screen->xroot_window = None;
+ x11_screen->wmspec_check_window = None;
}
static void
-gdk_screen_x11_finalize (GObject *object)
+gdk_x11_screen_finalize (GObject *object)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (object);
gint i;
- if (screen_x11->root_window)
- g_object_unref (screen_x11->root_window);
+ if (x11_screen->root_window)
+ g_object_unref (x11_screen->root_window);
/* Visual Part */
- for (i = 0; i < screen_x11->nvisuals; i++)
- g_object_unref (screen_x11->visuals[i]);
- g_free (screen_x11->visuals);
- g_hash_table_destroy (screen_x11->visual_hash);
+ for (i = 0; i < x11_screen->nvisuals; i++)
+ g_object_unref (x11_screen->visuals[i]);
+ g_free (x11_screen->visuals);
+ g_hash_table_destroy (x11_screen->visual_hash);
- g_free (screen_x11->window_manager_name);
+ g_free (x11_screen->window_manager_name);
deinit_multihead (GDK_SCREEN (object));
- G_OBJECT_CLASS (_gdk_screen_x11_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gdk_x11_screen_parent_class)->finalize (object);
}
static gint
-gdk_screen_x11_get_n_monitors (GdkScreen *screen)
+gdk_x11_screen_get_n_monitors (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return GDK_SCREEN_X11 (screen)->n_monitors;
+ return GDK_X11_SCREEN (screen)->n_monitors;
}
static gint
-gdk_screen_x11_get_primary_monitor (GdkScreen *screen)
+gdk_x11_screen_get_primary_monitor (GdkScreen *screen)
{
g_return_val_if_fail (GDK_IS_SCREEN (screen), 0);
- return GDK_SCREEN_X11 (screen)->primary_monitor;
+ return GDK_X11_SCREEN (screen)->primary_monitor;
}
static gint
-gdk_screen_x11_get_monitor_width_mm (GdkScreen *screen,
+gdk_x11_screen_get_monitor_width_mm (GdkScreen *screen,
gint monitor_num)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ 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 < screen_x11->n_monitors, -1);
+ g_return_val_if_fail (monitor_num < x11_screen->n_monitors, -1);
- return screen_x11->monitors[monitor_num].width_mm;
+ return x11_screen->monitors[monitor_num].width_mm;
}
static gint
-gdk_screen_x11_get_monitor_height_mm (GdkScreen *screen,
+gdk_x11_screen_get_monitor_height_mm (GdkScreen *screen,
gint monitor_num)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ 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 < screen_x11->n_monitors, -1);
+ g_return_val_if_fail (monitor_num < x11_screen->n_monitors, -1);
- return screen_x11->monitors[monitor_num].height_mm;
+ return x11_screen->monitors[monitor_num].height_mm;
}
static gchar *
-gdk_screen_x11_get_monitor_plug_name (GdkScreen *screen,
+gdk_x11_screen_get_monitor_plug_name (GdkScreen *screen,
gint monitor_num)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ 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 < screen_x11->n_monitors, NULL);
+ g_return_val_if_fail (monitor_num < x11_screen->n_monitors, NULL);
- return g_strdup (screen_x11->monitors[monitor_num].output_name);
+ return g_strdup (x11_screen->monitors[monitor_num].output_name);
}
/**
- * gdk_x11_screen_get_monitor_output:
+ * gdk_x11_screen_get_monitor_output: (skip)
* @screen: a #GdkScreen
* @monitor_num: number of the monitor, between 0 and gdk_screen_get_n_monitors (screen)
*
gdk_x11_screen_get_monitor_output (GdkScreen *screen,
gint monitor_num)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
g_return_val_if_fail (GDK_IS_SCREEN (screen), None);
g_return_val_if_fail (monitor_num >= 0, None);
- g_return_val_if_fail (monitor_num < screen_x11->n_monitors, None);
+ g_return_val_if_fail (monitor_num < x11_screen->n_monitors, None);
- return screen_x11->monitors[monitor_num].output;
+ return x11_screen->monitors[monitor_num].output;
}
static void
-gdk_screen_x11_get_monitor_geometry (GdkScreen *screen,
+gdk_x11_screen_get_monitor_geometry (GdkScreen *screen,
gint monitor_num,
GdkRectangle *dest)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ 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 < screen_x11->n_monitors);
+ g_return_if_fail (monitor_num < x11_screen->n_monitors);
if (dest)
- *dest = screen_x11->monitors[monitor_num].geometry;
+ *dest = x11_screen->monitors[monitor_num].geometry;
}
static GdkVisual *
-gdk_screen_x11_get_rgba_visual (GdkScreen *screen)
+gdk_x11_screen_get_rgba_visual (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- screen_x11 = GDK_SCREEN_X11 (screen);
+ x11_screen = GDK_X11_SCREEN (screen);
- return screen_x11->rgba_visual;
+ return x11_screen->rgba_visual;
}
/**
Screen *
gdk_x11_screen_get_xscreen (GdkScreen *screen)
{
- return GDK_SCREEN_X11 (screen)->xscreen;
+ return GDK_X11_SCREEN (screen)->xscreen;
}
/**
int
gdk_x11_screen_get_screen_number (GdkScreen *screen)
{
- return GDK_SCREEN_X11 (screen)->screen_num;
+ return GDK_X11_SCREEN (screen)->screen_num;
}
static gboolean
check_is_composited (GdkDisplay *display,
- GdkScreenX11 *screen_x11)
+ GdkX11Screen *x11_screen)
{
- Atom xselection = gdk_x11_atom_to_xatom_for_display (display, screen_x11->cm_selection_atom);
+ Atom xselection = gdk_x11_atom_to_xatom_for_display (display, x11_screen->cm_selection_atom);
Window xwindow;
xwindow = XGetSelectionOwner (GDK_DISPLAY_XDISPLAY (display), xselection);
init_fake_xinerama (GdkScreen *screen)
{
#ifdef G_ENABLE_DEBUG
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
XSetWindowAttributes atts;
Window win;
gint w, h;
/* Fake Xinerama mode by splitting the screen into 4 monitors.
* Also draw a little cross to make the monitor boundaries visible.
*/
- w = WidthOfScreen (screen_x11->xscreen);
- h = HeightOfScreen (screen_x11->xscreen);
-
- screen_x11->n_monitors = 4;
- screen_x11->monitors = g_new0 (GdkX11Monitor, 4);
- init_monitor_geometry (&screen_x11->monitors[0], 0, 0, w / 2, h / 2);
- init_monitor_geometry (&screen_x11->monitors[1], w / 2, 0, w / 2, h / 2);
- init_monitor_geometry (&screen_x11->monitors[2], 0, h / 2, w / 2, h / 2);
- init_monitor_geometry (&screen_x11->monitors[3], w / 2, h / 2, w / 2, h / 2);
+ w = WidthOfScreen (x11_screen->xscreen);
+ h = HeightOfScreen (x11_screen->xscreen);
+
+ x11_screen->n_monitors = 4;
+ x11_screen->monitors = g_new0 (GdkX11Monitor, 4);
+ init_monitor_geometry (&x11_screen->monitors[0], 0, 0, w / 2, h / 2);
+ init_monitor_geometry (&x11_screen->monitors[1], w / 2, 0, w / 2, h / 2);
+ init_monitor_geometry (&x11_screen->monitors[2], 0, h / 2, w / 2, h / 2);
+ init_monitor_geometry (&x11_screen->monitors[3], w / 2, h / 2, w / 2, h / 2);
atts.override_redirect = 1;
atts.background_pixel = WhitePixel(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->screen_num);
+ x11_screen->screen_num);
win = XCreateWindow(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->xroot_window, 0, h / 2, w, 1, 0,
+ x11_screen->xroot_window, 0, h / 2, w, 1, 0,
DefaultDepth(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->screen_num),
+ x11_screen->screen_num),
InputOutput,
DefaultVisual(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->screen_num),
+ x11_screen->screen_num),
CWOverrideRedirect|CWBackPixel,
&atts);
XMapRaised(GDK_SCREEN_XDISPLAY (screen), win);
win = XCreateWindow(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->xroot_window, w/2 , 0, 1, h, 0,
+ x11_screen->xroot_window, w/2 , 0, 1, h, 0,
DefaultDepth(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->screen_num),
+ x11_screen->screen_num),
InputOutput,
DefaultVisual(GDK_SCREEN_XDISPLAY (screen),
- screen_x11->screen_num),
+ x11_screen->screen_num),
CWOverrideRedirect|CWBackPixel,
&atts);
XMapRaised(GDK_SCREEN_XDISPLAY (screen), win);
{
#ifdef HAVE_RANDR
GdkDisplay *display = gdk_screen_get_display (screen);
- GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
Display *dpy = GDK_SCREEN_XDISPLAY (screen);
XRRScreenResources *resources;
RROutput primary_output;
if (!display_x11->have_randr13)
return FALSE;
- resources = XRRGetScreenResourcesCurrent (screen_x11->xdisplay,
- screen_x11->xroot_window);
+ resources = XRRGetScreenResourcesCurrent (x11_screen->xdisplay,
+ x11_screen->xroot_window);
if (!resources)
return FALSE;
g_array_sort (monitors,
(GCompareFunc) monitor_compare_function);
- screen_x11->n_monitors = monitors->len;
- screen_x11->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE);
+ x11_screen->n_monitors = monitors->len;
+ x11_screen->monitors = (GdkX11Monitor *)g_array_free (monitors, FALSE);
- screen_x11->primary_monitor = 0;
+ x11_screen->primary_monitor = 0;
- primary_output = XRRGetOutputPrimary (screen_x11->xdisplay,
- screen_x11->xroot_window);
+ primary_output = XRRGetOutputPrimary (x11_screen->xdisplay,
+ x11_screen->xroot_window);
- for (i = 0; i < screen_x11->n_monitors; ++i)
+ for (i = 0; i < x11_screen->n_monitors; ++i)
{
- if (screen_x11->monitors[i].output == primary_output)
+ if (x11_screen->monitors[i].output == primary_output)
{
- screen_x11->primary_monitor = i;
+ x11_screen->primary_monitor = i;
break;
}
/* No RandR1.3+ available or no primary set, fall back to prefer LVDS as primary if present */
if (primary_output == None &&
- g_ascii_strncasecmp (screen_x11->monitors[i].output_name, "LVDS", 4) == 0)
+ g_ascii_strncasecmp (x11_screen->monitors[i].output_name, "LVDS", 4) == 0)
{
- screen_x11->primary_monitor = i;
+ x11_screen->primary_monitor = i;
break;
}
/* No primary specified and no LVDS found */
- if (screen_x11->monitors[i].output == first_output)
- screen_x11->primary_monitor = i;
+ if (x11_screen->monitors[i].output == first_output)
+ x11_screen->primary_monitor = i;
}
- return screen_x11->n_monitors > 0;
+ return x11_screen->n_monitors > 0;
#endif
return FALSE;
#ifdef HAVE_SOLARIS_XINERAMA
Display *dpy = GDK_SCREEN_XDISPLAY (screen);
int screen_no = gdk_screen_get_number (screen);
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
XRectangle monitors[MAXFRAMEBUFFERS];
unsigned char hints[16];
gint result;
return FALSE;
}
- screen_x11->monitors = g_new0 (GdkX11Monitor, n_monitors);
- screen_x11->n_monitors = n_monitors;
+ x11_screen->monitors = g_new0 (GdkX11Monitor, n_monitors);
+ x11_screen->n_monitors = n_monitors;
for (i = 0; i < n_monitors; i++)
{
- init_monitor_geometry (&screen_x11->monitors[i],
+ init_monitor_geometry (&x11_screen->monitors[i],
monitors[i].x, monitors[i].y,
monitors[i].width, monitors[i].height);
}
- screen_x11->primary_monitor = 0;
+ x11_screen->primary_monitor = 0;
return TRUE;
#endif /* HAVE_SOLARIS_XINERAMA */
{
#ifdef HAVE_XFREE_XINERAMA
Display *dpy = GDK_SCREEN_XDISPLAY (screen);
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
XineramaScreenInfo *monitors;
int i, n_monitors;
return FALSE;
}
- screen_x11->n_monitors = n_monitors;
- screen_x11->monitors = g_new0 (GdkX11Monitor, n_monitors);
+ x11_screen->n_monitors = n_monitors;
+ x11_screen->monitors = g_new0 (GdkX11Monitor, n_monitors);
for (i = 0; i < n_monitors; ++i)
{
- init_monitor_geometry (&screen_x11->monitors[i],
+ init_monitor_geometry (&x11_screen->monitors[i],
monitors[i].x_org, monitors[i].y_org,
monitors[i].width, monitors[i].height);
}
XFree (monitors);
- screen_x11->primary_monitor = 0;
+ x11_screen->primary_monitor = 0;
return TRUE;
#endif /* HAVE_XFREE_XINERAMA */
static void
deinit_multihead (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- free_monitors (screen_x11->monitors, screen_x11->n_monitors);
+ free_monitors (x11_screen->monitors, x11_screen->n_monitors);
- screen_x11->n_monitors = 0;
- screen_x11->monitors = NULL;
+ x11_screen->n_monitors = 0;
+ x11_screen->monitors = NULL;
}
static gboolean
static void
init_multihead (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
int opcode, firstevent, firsterror;
/* There are four different implementations of multihead support:
}
/* No multihead support of any kind for this screen */
- screen_x11->n_monitors = 1;
- screen_x11->monitors = g_new0 (GdkX11Monitor, 1);
- screen_x11->primary_monitor = 0;
+ x11_screen->n_monitors = 1;
+ x11_screen->monitors = g_new0 (GdkX11Monitor, 1);
+ x11_screen->primary_monitor = 0;
- init_monitor_geometry (screen_x11->monitors, 0, 0,
- WidthOfScreen (screen_x11->xscreen),
- HeightOfScreen (screen_x11->xscreen));
+ init_monitor_geometry (x11_screen->monitors, 0, 0,
+ WidthOfScreen (x11_screen->xscreen),
+ HeightOfScreen (x11_screen->xscreen));
}
GdkScreen *
gint screen_number)
{
GdkScreen *screen;
- GdkScreenX11 *screen_x11;
- GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
-
- screen = g_object_new (GDK_TYPE_SCREEN_X11, NULL);
-
- screen_x11 = GDK_SCREEN_X11 (screen);
- screen_x11->display = display;
- screen_x11->xdisplay = display_x11->xdisplay;
- screen_x11->xscreen = ScreenOfDisplay (display_x11->xdisplay, screen_number);
- screen_x11->screen_num = screen_number;
- screen_x11->xroot_window = RootWindow (display_x11->xdisplay,screen_number);
- screen_x11->wmspec_check_window = None;
+ GdkX11Screen *x11_screen;
+ GdkX11Display *display_x11 = GDK_X11_DISPLAY (display);
+
+ screen = g_object_new (GDK_TYPE_X11_SCREEN, NULL);
+
+ x11_screen = GDK_X11_SCREEN (screen);
+ x11_screen->display = display;
+ x11_screen->xdisplay = display_x11->xdisplay;
+ x11_screen->xscreen = ScreenOfDisplay (display_x11->xdisplay, screen_number);
+ x11_screen->screen_num = screen_number;
+ x11_screen->xroot_window = RootWindow (display_x11->xdisplay,screen_number);
+ x11_screen->wmspec_check_window = None;
/* we want this to be always non-null */
- screen_x11->window_manager_name = g_strdup ("unknown");
+ x11_screen->window_manager_name = g_strdup ("unknown");
init_multihead (screen);
init_randr_support (screen);
void
_gdk_x11_screen_setup (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
- screen_x11->cm_selection_atom = make_cm_atom (screen_x11->screen_num);
- gdk_display_request_selection_notification (screen_x11->display,
- screen_x11->cm_selection_atom);
- screen_x11->is_composited = check_is_composited (screen_x11->display, screen_x11);
+ x11_screen->cm_selection_atom = make_cm_atom (x11_screen->screen_num);
+ gdk_display_request_selection_notification (x11_screen->display,
+ x11_screen->cm_selection_atom);
+ x11_screen->is_composited = check_is_composited (x11_screen->display, x11_screen);
}
static gboolean
-gdk_screen_x11_is_composited (GdkScreen *screen)
+gdk_x11_screen_is_composited (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
- screen_x11 = GDK_SCREEN_X11 (screen);
+ x11_screen = GDK_X11_SCREEN (screen);
- return screen_x11->is_composited;
+ return x11_screen->is_composited;
}
static void
-init_randr_support (GdkScreen * screen)
+init_randr_support (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
-
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
+
XSelectInput (GDK_SCREEN_XDISPLAY (screen),
- screen_x11->xroot_window,
- StructureNotifyMask);
+ x11_screen->xroot_window,
+ StructureNotifyMask);
#ifdef HAVE_RANDR
+ if (!GDK_X11_DISPLAY (gdk_screen_get_display (screen))->have_randr12)
+ return;
+
XRRSelectInput (GDK_SCREEN_XDISPLAY (screen),
- screen_x11->xroot_window,
- RRScreenChangeNotifyMask |
- RRCrtcChangeNotifyMask |
- RROutputPropertyNotifyMask);
+ x11_screen->xroot_window,
+ RRScreenChangeNotifyMask
+ | RRCrtcChangeNotifyMask
+ | RROutputPropertyNotifyMask);
#endif
}
static void
process_monitors_change (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
gint n_monitors;
+ gint primary_monitor;
GdkX11Monitor *monitors;
gboolean changed;
- n_monitors = screen_x11->n_monitors;
- monitors = screen_x11->monitors;
+ primary_monitor = x11_screen->primary_monitor;
+ n_monitors = x11_screen->n_monitors;
+ monitors = x11_screen->monitors;
- screen_x11->n_monitors = 0;
- screen_x11->monitors = NULL;
+ x11_screen->n_monitors = 0;
+ x11_screen->monitors = NULL;
init_multihead (screen);
- changed = !compare_monitors (monitors, n_monitors,
- screen_x11->monitors, screen_x11->n_monitors);
+ changed =
+ !compare_monitors (monitors, n_monitors,
+ x11_screen->monitors, x11_screen->n_monitors) ||
+ x11_screen->primary_monitor != primary_monitor;
+
free_monitors (monitors, n_monitors);
height = gdk_screen_get_height (screen);
#ifdef HAVE_RANDR
- display_x11 = GDK_DISPLAY_X11 (gdk_screen_get_display (screen));
+ display_x11 = GDK_X11_DISPLAY (gdk_screen_get_display (screen));
if (display_x11->have_randr13 && event->type == ConfigureNotify)
- {
- g_signal_emit_by_name (screen, "monitors-changed");
- return;
- }
+ return;
XRRUpdateConfiguration (event);
#else
{
#ifdef HAVE_XFIXES
XFixesSelectionNotifyEvent *selection_event = (XFixesSelectionNotifyEvent *)event;
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
- Atom xcm_selection_atom = gdk_x11_atom_to_xatom_for_display (screen_x11->display,
- screen_x11->cm_selection_atom);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
+ Atom xcm_selection_atom = gdk_x11_atom_to_xatom_for_display (x11_screen->display,
+ x11_screen->cm_selection_atom);
if (selection_event->selection == xcm_selection_atom)
{
gboolean composited = selection_event->owner != None;
- if (composited != screen_x11->is_composited)
+ if (composited != x11_screen->is_composited)
{
- screen_x11->is_composited = composited;
+ x11_screen->is_composited = composited;
g_signal_emit_by_name (screen, "composited-changed");
}
}
static gchar *
-gdk_screen_x11_make_display_name (GdkScreen *screen)
+gdk_x11_screen_make_display_name (GdkScreen *screen)
{
const gchar *old_display;
}
static GdkWindow *
-gdk_screen_x11_get_active_window (GdkScreen *screen)
+gdk_x11_screen_get_active_window (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
GdkWindow *ret = NULL;
Atom type_return;
gint format_return;
gdk_atom_intern_static_string ("_NET_ACTIVE_WINDOW")))
return NULL;
- screen_x11 = GDK_SCREEN_X11 (screen);
+ x11_screen = GDK_X11_SCREEN (screen);
- if (XGetWindowProperty (screen_x11->xdisplay, screen_x11->xroot_window,
- gdk_x11_get_xatom_by_name_for_display (screen_x11->display,
+ if (XGetWindowProperty (x11_screen->xdisplay, x11_screen->xroot_window,
+ gdk_x11_get_xatom_by_name_for_display (x11_screen->display,
"_NET_ACTIVE_WINDOW"),
0, 1, False, XA_WINDOW, &type_return,
&format_return, &nitems_return,
{
if ((type_return == XA_WINDOW) && (format_return == 32) && (data))
{
- GdkNativeWindow window = *(GdkNativeWindow *) data;
+ Window window = *(Window *) data;
if (window != None)
{
- ret = gdk_x11_window_foreign_new_for_display (screen_x11->display,
- *(Window *) data);
+ ret = gdk_x11_window_foreign_new_for_display (x11_screen->display,
+ window);
}
}
}
}
static GList *
-gdk_screen_x11_get_window_stack (GdkScreen *screen)
+gdk_x11_screen_get_window_stack (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
GList *ret = NULL;
Atom type_return;
gint format_return;
gdk_atom_intern_static_string ("_NET_CLIENT_LIST_STACKING")))
return NULL;
- screen_x11 = GDK_SCREEN_X11 (screen);
+ x11_screen = GDK_X11_SCREEN (screen);
- if (XGetWindowProperty (screen_x11->xdisplay, screen_x11->xroot_window,
- gdk_x11_get_xatom_by_name_for_display (screen_x11->display,
+ if (XGetWindowProperty (x11_screen->xdisplay, x11_screen->xroot_window,
+ gdk_x11_get_xatom_by_name_for_display (x11_screen->display,
"_NET_CLIENT_LIST_STACKING"),
0, G_MAXLONG, False, XA_WINDOW, &type_return,
&format_return, &nitems_return,
for (i = 0; i < nitems_return; i++)
{
- win = gdk_x11_window_foreign_new_for_display (screen_x11->display,
+ win = gdk_x11_window_foreign_new_for_display (x11_screen->display,
(Window)stack[i]);
if (win != NULL)
return ret;
}
-/* Sends a ClientMessage to all toplevel client windows */
-static gboolean
-gdk_event_send_client_message_to_all_recurse (GdkDisplay *display,
- XEvent *xev,
- guint32 xid,
- guint level)
-{
- Atom type = None;
- int format;
- unsigned long nitems, after;
- unsigned char *data;
- Window *ret_children, ret_root, ret_parent;
- unsigned int ret_nchildren;
- gboolean send = FALSE;
- gboolean found = FALSE;
- gboolean result = FALSE;
- int i;
-
- gdk_x11_display_error_trap_push (display);
-
- if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), xid,
- gdk_x11_get_xatom_by_name_for_display (display, "WM_STATE"),
- 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &after, &data) != Success)
- goto out;
-
- if (type)
- {
- send = TRUE;
- XFree (data);
- }
- else
- {
- /* OK, we're all set, now let's find some windows to send this to */
- if (!XQueryTree (GDK_DISPLAY_XDISPLAY (display), xid,
- &ret_root, &ret_parent,
- &ret_children, &ret_nchildren))
- goto out;
-
- for(i = 0; i < ret_nchildren; i++)
- if (gdk_event_send_client_message_to_all_recurse (display, xev, ret_children[i], level + 1))
- found = TRUE;
-
- XFree (ret_children);
- }
-
- if (send || (!found && (level == 1)))
- {
- xev->xclient.window = xid;
- _gdk_x11_display_send_xevent (display, xid, False, NoEventMask, xev);
- }
-
- result = send || found;
-
- out:
- gdk_x11_display_error_trap_pop_ignored (display);
-
- return result;
-}
-
-static void
-gdk_screen_x11_broadcast_client_message (GdkScreen *screen,
- GdkEvent *event)
-{
- XEvent sev;
- GdkWindow *root_window;
-
- g_return_if_fail (event != NULL);
-
- root_window = gdk_screen_get_root_window (screen);
-
- /* Set up our event to send, with the exception of its target window */
- sev.xclient.type = ClientMessage;
- sev.xclient.display = GDK_WINDOW_XDISPLAY (root_window);
- sev.xclient.format = event->client.data_format;
- memcpy(&sev.xclient.data, &event->client.data, sizeof (sev.xclient.data));
- sev.xclient.message_type =
- gdk_x11_atom_to_xatom_for_display (GDK_WINDOW_DISPLAY (root_window),
- event->client.message_type);
-
- gdk_event_send_client_message_to_all_recurse (gdk_screen_get_display (screen),
- &sev,
- GDK_WINDOW_XID (root_window),
- 0);
-}
-
static gboolean
check_transform (const gchar *xsettings_name,
GType src_type,
}
static gboolean
-gdk_screen_x11_get_setting (GdkScreen *screen,
+gdk_x11_screen_get_setting (GdkScreen *screen,
const gchar *name,
GValue *value)
{
const char *xsettings_name = NULL;
XSettingsResult result;
XSettingsSetting *setting = NULL;
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
gboolean success = FALSE;
gint i;
GValue tmp_val = { 0, };
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
- screen_x11 = GDK_SCREEN_X11 (screen);
+ x11_screen = GDK_X11_SCREEN (screen);
for (i = 0; i < GDK_SETTINGS_N_ELEMENTS(); i++)
if (strcmp (GDK_SETTINGS_GDK_NAME (i), name) == 0)
if (!xsettings_name)
goto out;
- result = xsettings_client_get_setting (screen_x11->xsettings_client,
+ result = xsettings_client_get_setting (x11_screen->xsettings_client,
xsettings_name, &setting);
if (result != XSETTINGS_SUCCESS)
goto out;
static void
fetch_net_wm_check_window (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
GdkDisplay *display;
Atom type;
gint format;
GTimeVal tv;
gint error;
- screen_x11 = GDK_SCREEN_X11 (screen);
- display = screen_x11->display;
+ x11_screen = GDK_X11_SCREEN (screen);
+ display = x11_screen->display;
- g_return_if_fail (GDK_DISPLAY_X11 (display)->trusted_client);
+ g_return_if_fail (GDK_X11_DISPLAY (display)->trusted_client);
g_get_current_time (&tv);
- if (ABS (tv.tv_sec - screen_x11->last_wmspec_check_time) < 15)
+ if (ABS (tv.tv_sec - x11_screen->last_wmspec_check_time) < 15)
return; /* we've checked recently */
- screen_x11->last_wmspec_check_time = tv.tv_sec;
+ x11_screen->last_wmspec_check_time = tv.tv_sec;
data = NULL;
- XGetWindowProperty (screen_x11->xdisplay, screen_x11->xroot_window,
+ 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);
xwindow = (Window *)data;
- if (screen_x11->wmspec_check_window == *xwindow)
+ if (x11_screen->wmspec_check_window == *xwindow)
{
XFree (xwindow);
return;
gdk_x11_display_error_trap_push (display);
/* Find out if this WM goes away, so we can reset everything. */
- XSelectInput (screen_x11->xdisplay, *xwindow, StructureNotifyMask);
+ XSelectInput (x11_screen->xdisplay, *xwindow, StructureNotifyMask);
error = gdk_x11_display_error_trap_pop (display);
if (!error)
{
- screen_x11->wmspec_check_window = *xwindow;
- screen_x11->need_refetch_net_supported = TRUE;
- screen_x11->need_refetch_wm_name = TRUE;
+ x11_screen->wmspec_check_window = *xwindow;
+ x11_screen->need_refetch_net_supported = TRUE;
+ x11_screen->need_refetch_wm_name = TRUE;
/* Careful, reentrancy */
- _gdk_x11_screen_window_manager_changed (GDK_SCREEN (screen_x11));
+ _gdk_x11_screen_window_manager_changed (GDK_SCREEN (x11_screen));
}
else if (error == BadWindow)
{
/* Leftover property, try again immediately, new wm may be starting up */
- screen_x11->last_wmspec_check_time = 0;
+ x11_screen->last_wmspec_check_time = 0;
}
XFree (xwindow);
GdkAtom property)
{
gulong i;
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
NetWmSupportedAtoms *supported_atoms;
GdkDisplay *display;
g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
- screen_x11 = GDK_SCREEN_X11 (screen);
- display = screen_x11->display;
+ x11_screen = GDK_X11_SCREEN (screen);
+ display = x11_screen->display;
- if (!G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
+ if (!G_LIKELY (GDK_X11_DISPLAY (display)->trusted_client))
return FALSE;
supported_atoms = g_object_get_data (G_OBJECT (screen), "gdk-net-wm-supported-atoms");
fetch_net_wm_check_window (screen);
- if (screen_x11->wmspec_check_window == None)
+ if (x11_screen->wmspec_check_window == None)
return FALSE;
- if (screen_x11->need_refetch_net_supported)
+ if (x11_screen->need_refetch_net_supported)
{
/* WM has changed since we last got the supported list,
* refetch it.
gint format;
gulong bytes_after;
- screen_x11->need_refetch_net_supported = FALSE;
+ x11_screen->need_refetch_net_supported = FALSE;
if (supported_atoms->atoms)
XFree (supported_atoms->atoms);
supported_atoms->atoms = NULL;
supported_atoms->n_atoms = 0;
- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), screen_x11->xroot_window,
+ XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), x11_screen->xroot_window,
gdk_x11_get_xatom_by_name_for_display (display, "_NET_SUPPORTED"),
0, G_MAXLONG, False, XA_ATOM, &type, &format,
&supported_atoms->n_atoms, &bytes_after,
GdkEvent *event,
gpointer data)
{
- GdkScreenX11 *screen = data;
+ GdkX11Screen *screen = data;
if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
return GDK_FILTER_REMOVE;
{
GdkEvent new_event;
GdkScreen *screen = data;
- GdkScreenX11 *screen_x11 = data;
+ GdkX11Screen *x11_screen = data;
int i;
- if (screen_x11->xsettings_in_init)
+ if (x11_screen->xsettings_in_init)
return;
new_event.type = GDK_SETTING;
void
_gdk_x11_screen_init_events (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
+ GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
/* Keep a flag to avoid extra notifies that we don't need
*/
- screen_x11->xsettings_in_init = TRUE;
- screen_x11->xsettings_client = xsettings_client_new_with_grab_funcs (screen_x11->xdisplay,
- screen_x11->screen_num,
+ 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);
- screen_x11->xsettings_in_init = FALSE;
+ x11_screen->xsettings_in_init = FALSE;
}
/**
const char*
gdk_x11_screen_get_window_manager_name (GdkScreen *screen)
{
- GdkScreenX11 *screen_x11;
+ GdkX11Screen *x11_screen;
GdkDisplay *display;
- screen_x11 = GDK_SCREEN_X11 (screen);
- display = screen_x11->display;
+ x11_screen = GDK_X11_SCREEN (screen);
+ display = x11_screen->display;
- if (!G_LIKELY (GDK_DISPLAY_X11 (display)->trusted_client))
- return screen_x11->window_manager_name;
+ if (!G_LIKELY (GDK_X11_DISPLAY (display)->trusted_client))
+ return x11_screen->window_manager_name;
fetch_net_wm_check_window (screen);
- if (screen_x11->need_refetch_wm_name)
+ if (x11_screen->need_refetch_wm_name)
{
/* Get the name of the window manager */
- screen_x11->need_refetch_wm_name = FALSE;
+ x11_screen->need_refetch_wm_name = FALSE;
- g_free (screen_x11->window_manager_name);
- screen_x11->window_manager_name = g_strdup ("unknown");
+ g_free (x11_screen->window_manager_name);
+ x11_screen->window_manager_name = g_strdup ("unknown");
- if (screen_x11->wmspec_check_window != None)
+ if (x11_screen->wmspec_check_window != None)
{
Atom type;
gint format;
gdk_x11_display_error_trap_push (display);
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
- screen_x11->wmspec_check_window,
+ x11_screen->wmspec_check_window,
gdk_x11_get_xatom_by_name_for_display (display,
"_NET_WM_NAME"),
0, G_MAXLONG, False,
if (name != NULL)
{
- g_free (screen_x11->window_manager_name);
- screen_x11->window_manager_name = g_strdup (name);
+ g_free (x11_screen->window_manager_name);
+ x11_screen->window_manager_name = g_strdup (name);
XFree (name);
}
}
}
- return GDK_SCREEN_X11 (screen)->window_manager_name;
+ return GDK_X11_SCREEN (screen)->window_manager_name;
}
static void
-_gdk_screen_x11_class_init (GdkScreenX11Class *klass)
+gdk_x11_screen_class_init (GdkX11ScreenClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GdkScreenClass *screen_class = GDK_SCREEN_CLASS (klass);
- object_class->dispose = gdk_screen_x11_dispose;
- object_class->finalize = gdk_screen_x11_finalize;
-
- screen_class->get_display = gdk_screen_x11_get_display;
- screen_class->get_width = gdk_screen_x11_get_width;
- screen_class->get_height = gdk_screen_x11_get_height;
- screen_class->get_width_mm = gdk_screen_x11_get_width_mm;
- screen_class->get_height_mm = gdk_screen_x11_get_height_mm;
- screen_class->get_number = gdk_screen_x11_get_number;
- screen_class->get_root_window = gdk_screen_x11_get_root_window;
- screen_class->get_n_monitors = gdk_screen_x11_get_n_monitors;
- screen_class->get_primary_monitor = gdk_screen_x11_get_primary_monitor;
- screen_class->get_monitor_width_mm = gdk_screen_x11_get_monitor_width_mm;
- screen_class->get_monitor_height_mm = gdk_screen_x11_get_monitor_height_mm;
- screen_class->get_monitor_plug_name = gdk_screen_x11_get_monitor_plug_name;
- screen_class->get_monitor_geometry = gdk_screen_x11_get_monitor_geometry;
- screen_class->get_system_visual = _gdk_screen_x11_get_system_visual;
- screen_class->get_rgba_visual = gdk_screen_x11_get_rgba_visual;
- screen_class->is_composited = gdk_screen_x11_is_composited;
- screen_class->make_display_name = gdk_screen_x11_make_display_name;
- screen_class->get_active_window = gdk_screen_x11_get_active_window;
- screen_class->get_window_stack = gdk_screen_x11_get_window_stack;
- screen_class->broadcast_client_message = gdk_screen_x11_broadcast_client_message;
- screen_class->get_setting = gdk_screen_x11_get_setting;
- screen_class->visual_get_best_depth = _gdk_screen_x11_visual_get_best_depth;
- screen_class->visual_get_best_type = _gdk_screen_x11_visual_get_best_type;
- screen_class->visual_get_best = _gdk_screen_x11_visual_get_best;
- screen_class->visual_get_best_with_depth = _gdk_screen_x11_visual_get_best_with_depth;
- screen_class->visual_get_best_with_type = _gdk_screen_x11_visual_get_best_with_type;
- screen_class->visual_get_best_with_both = _gdk_screen_x11_visual_get_best_with_both;
- screen_class->query_depths = _gdk_screen_x11_query_depths;
- screen_class->query_visual_types = _gdk_screen_x11_query_visual_types;
- screen_class->list_visuals = _gdk_screen_x11_list_visuals;
+ object_class->dispose = gdk_x11_screen_dispose;
+ object_class->finalize = gdk_x11_screen_finalize;
+
+ screen_class->get_display = gdk_x11_screen_get_display;
+ screen_class->get_width = gdk_x11_screen_get_width;
+ screen_class->get_height = gdk_x11_screen_get_height;
+ screen_class->get_width_mm = gdk_x11_screen_get_width_mm;
+ screen_class->get_height_mm = gdk_x11_screen_get_height_mm;
+ screen_class->get_number = gdk_x11_screen_get_number;
+ screen_class->get_root_window = gdk_x11_screen_get_root_window;
+ screen_class->get_n_monitors = gdk_x11_screen_get_n_monitors;
+ screen_class->get_primary_monitor = gdk_x11_screen_get_primary_monitor;
+ screen_class->get_monitor_width_mm = gdk_x11_screen_get_monitor_width_mm;
+ 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_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->make_display_name = gdk_x11_screen_make_display_name;
+ screen_class->get_active_window = gdk_x11_screen_get_active_window;
+ screen_class->get_window_stack = gdk_x11_screen_get_window_stack;
+ screen_class->get_setting = gdk_x11_screen_get_setting;
+ screen_class->visual_get_best_depth = _gdk_x11_screen_visual_get_best_depth;
+ screen_class->visual_get_best_type = _gdk_x11_screen_visual_get_best_type;
+ screen_class->visual_get_best = _gdk_x11_screen_visual_get_best;
+ screen_class->visual_get_best_with_depth = _gdk_x11_screen_visual_get_best_with_depth;
+ screen_class->visual_get_best_with_type = _gdk_x11_screen_visual_get_best_with_type;
+ screen_class->visual_get_best_with_both = _gdk_x11_screen_visual_get_best_with_both;
+ screen_class->query_depths = _gdk_x11_screen_query_depths;
+ screen_class->query_visual_types = _gdk_x11_screen_query_visual_types;
+ screen_class->list_visuals = _gdk_x11_screen_list_visuals;
signals[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 (GdkScreenX11Class, window_manager_changed),
+ G_STRUCT_OFFSET (GdkX11ScreenClass, window_manager_changed),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
projects / ~andy / gtk / blobdiff