Commit 8e2240f6 authored by Benjamin Otte's avatar Benjamin Otte Committed by Matthias Clasen

x11: Rename GdkDisplayX11 to GdkX11Display

parent 85bd6177
......@@ -394,7 +394,7 @@ _gdk_x11_cursor_update_theme (GdkCursor *cursor)
Display *xdisplay;
GdkX11Cursor *private;
Cursor new_cursor = None;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
private = (GdkX11Cursor *) cursor;
display_x11 = GDK_DISPLAY_X11 (gdk_cursor_get_display (cursor));
......@@ -469,7 +469,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
const gchar *theme,
const gint size)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
Display *xdisplay;
gchar *old_theme;
gint old_size;
......
......@@ -417,7 +417,7 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator,
GdkWindowImplX11 *window_impl = NULL;
gboolean return_val;
GdkToplevelX11 *toplevel = NULL;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
device_manager = GDK_DEVICE_MANAGER_CORE (translator);
return_val = FALSE;
......
......@@ -160,13 +160,13 @@ static const char *const precache_atoms[] = {
static char *gdk_sm_client_id;
G_DEFINE_TYPE_WITH_CODE (GdkDisplayX11, _gdk_display_x11, GDK_TYPE_DISPLAY,
G_DEFINE_TYPE_WITH_CODE (GdkX11Display, _gdk_display_x11, GDK_TYPE_DISPLAY,
G_IMPLEMENT_INTERFACE (GDK_TYPE_EVENT_TRANSLATOR,
gdk_display_x11_event_translator_init))
static void
_gdk_display_x11_init (GdkDisplayX11 *display)
_gdk_display_x11_init (GdkX11Display *display)
{
_gdk_x11_display_manager_add_display (gdk_display_manager_get (),
GDK_DISPLAY (display));
......@@ -383,7 +383,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
GdkScreen *screen = NULL;
GdkScreenX11 *screen_x11 = NULL;
GdkToplevelX11 *toplevel = NULL;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
gboolean return_val;
Window xwindow = None;
......@@ -1097,7 +1097,7 @@ gdk_wm_protocols_filter (GdkXEvent *xev,
static void
gdk_event_init (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkDeviceManager *device_manager;
display_x11 = GDK_DISPLAY_X11 (display);
......@@ -1119,7 +1119,7 @@ gdk_event_init (GdkDisplay *display)
static void
gdk_x11_display_init_input (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkDeviceManager *device_manager;
GdkDevice *device;
GList *list, *l;
......@@ -1172,7 +1172,7 @@ static void
set_sm_client_id (GdkDisplay *display,
const gchar *sm_client_id)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (gdk_display_is_closed (display))
return;
......@@ -1203,7 +1203,7 @@ _gdk_x11_display_open (const gchar *display_name)
{
Display *xdisplay;
GdkDisplay *display;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkWindowAttr attr;
gint argc;
gchar *argv[1];
......@@ -1570,7 +1570,7 @@ gboolean
_gdk_x11_display_is_root_window (GdkDisplay *display,
Window xroot_window)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
gint i;
display_x11 = GDK_DISPLAY_X11 (display);
......@@ -1678,7 +1678,7 @@ gdk_x11_display_get_default_group (GdkDisplay *display)
void
gdk_x11_display_grab (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
g_return_if_fail (GDK_IS_DISPLAY (display));
......@@ -1701,7 +1701,7 @@ gdk_x11_display_grab (GdkDisplay *display)
void
gdk_x11_display_ungrab (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
g_return_if_fail (GDK_IS_DISPLAY (display));
......@@ -1720,7 +1720,7 @@ static void
gdk_display_x11_dispose (GObject *object)
{
GdkDisplay *display = GDK_DISPLAY (object);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (object);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (object);
gint i;
_gdk_x11_display_manager_remove_display (gdk_display_manager_get (), display);
......@@ -1743,7 +1743,7 @@ gdk_display_x11_dispose (GObject *object)
static void
gdk_display_x11_finalize (GObject *object)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (object);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (object);
gint i;
/* Keymap */
......@@ -1892,7 +1892,7 @@ gdk_x11_display_get_xdisplay (GdkDisplay *display)
void
_gdk_x11_display_make_default (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
const gchar *startup_id;
g_free (display_x11->startup_notification_id);
......@@ -2089,7 +2089,7 @@ gdk_x11_display_notify_startup_complete (GdkDisplay *display,
static gboolean
gdk_x11_display_supports_selection_notification (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
return display_x11->have_xfixes;
}
......@@ -2100,7 +2100,7 @@ gdk_x11_display_request_selection_notification (GdkDisplay *display,
{
#ifdef HAVE_XFIXES
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
Atom atom;
if (display_x11->have_xfixes)
......@@ -2137,7 +2137,7 @@ gdk_x11_display_store_clipboard (GdkDisplay *display,
const GdkAtom *targets,
gint n_targets)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
Atom clipboard_manager, save_targets;
g_return_if_fail (GDK_WINDOW_IS_X11 (clipboard_window));
......@@ -2251,7 +2251,7 @@ void
gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
const gchar *startup_id)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
gchar *time_str;
display_x11 = GDK_DISPLAY_X11 (display);
......@@ -2291,7 +2291,7 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay *display,
static gboolean
gdk_x11_display_supports_composite (GdkDisplay *display)
{
GdkDisplayX11 *x11_display = GDK_DISPLAY_X11 (display);
GdkX11Display *x11_display = GDK_DISPLAY_X11 (display);
return x11_display->have_xcomposite &&
x11_display->have_xdamage &&
......@@ -2372,7 +2372,7 @@ gdk_x11_register_standard_event_type (GdkDisplay *display,
gint n_events)
{
GdkEventTypeX11 *event_type;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
display_x11 = GDK_DISPLAY_X11 (display);
event_type = g_new (GdkEventTypeX11, 1);
......@@ -2391,7 +2391,7 @@ void
_gdk_x11_display_error_event (GdkDisplay *display,
XErrorEvent *error)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GSList *tmp_list;
gboolean ignore;
......@@ -2451,7 +2451,7 @@ _gdk_x11_display_error_event (GdkDisplay *display,
}
static void
delete_outdated_error_traps (GdkDisplayX11 *display_x11)
delete_outdated_error_traps (GdkX11Display *display_x11)
{
GSList *tmp_list;
gulong processed_sequence;
......@@ -2497,7 +2497,7 @@ delete_outdated_error_traps (GdkDisplayX11 *display_x11)
void
gdk_x11_display_error_trap_push (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkErrorTrap *trap;
display_x11 = GDK_DISPLAY_X11 (display);
......@@ -2520,7 +2520,7 @@ static gint
gdk_x11_display_error_trap_pop_internal (GdkDisplay *display,
gboolean need_code)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkErrorTrap *trap;
GSList *tmp_list;
int result;
......@@ -2701,7 +2701,7 @@ pop_error_trap (GdkDisplay *display,
static GdkKeymap *
gdk_x11_display_get_keymap (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
display_x11 = GDK_DISPLAY_X11 (display);
......@@ -2714,7 +2714,7 @@ gdk_x11_display_get_keymap (GdkDisplay *display)
}
static void
_gdk_display_x11_class_init (GdkDisplayX11Class * class)
_gdk_display_x11_class_init (GdkX11DisplayClass * class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (class);
......
......@@ -35,16 +35,16 @@
G_BEGIN_DECLS
typedef struct _GdkDisplayX11 GdkDisplayX11;
typedef struct _GdkDisplayX11Class GdkDisplayX11Class;
typedef struct _GdkX11Display GdkX11Display;
typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
#define GDK_TYPE_DISPLAY_X11 (_gdk_display_x11_get_type())
#define GDK_DISPLAY_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_X11, GdkDisplayX11))
#define GDK_DISPLAY_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_X11, GdkDisplayX11Class))
#define GDK_DISPLAY_X11(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_X11, GdkX11Display))
#define GDK_DISPLAY_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_DISPLAY_X11, GdkX11DisplayClass))
#define GDK_IS_DISPLAY_X11_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_DISPLAY_X11))
#define GDK_DISPLAY_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_X11, GdkDisplayX11Class))
#define GDK_DISPLAY_X11_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_DISPLAY_X11, GdkX11DisplayClass))
struct _GdkDisplayX11
struct _GdkX11Display
{
GdkDisplay parent_instance;
Display *xdisplay;
......@@ -143,7 +143,7 @@ struct _GdkDisplayX11
GSList *error_traps;
};
struct _GdkDisplayX11Class
struct _GdkX11DisplayClass
{
GdkDisplayClass parent_class;
};
......
......@@ -298,7 +298,7 @@ free_cache_child (GdkCacheChild *child,
if (child->shape_selected && display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
XShapeSelectInput (display_x11->xdisplay, child->xid, 0);
}
......@@ -337,7 +337,7 @@ gdk_window_cache_shape_filter (GdkXEvent *xev,
XEvent *xevent = (XEvent *)xev;
GdkWindowCache *cache = data;
GdkDisplayX11 *display = GDK_DISPLAY_X11 (gdk_screen_get_display (cache->screen));
GdkX11Display *display = GDK_DISPLAY_X11 (gdk_screen_get_display (cache->screen));
if (display->have_shapes &&
xevent->type == display->shape_event_base + ShapeNotify)
......@@ -594,14 +594,14 @@ is_pointer_within_shape (GdkDisplay *display,
{
if (!child->shape_selected)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
XShapeSelectInput (display_x11->xdisplay, child->xid, ShapeNotifyMask);
child->shape_selected = TRUE;
}
if (!child->shape_valid)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
cairo_region_t *input_shape;
child->shape = _gdk_x11_xwindow_get_shape (display_x11->xdisplay,
......@@ -884,7 +884,7 @@ motif_drag_window_filter (GdkXEvent *xevent,
{
XEvent *xev = (XEvent *)xevent;
GdkDisplay *display = GDK_WINDOW_DISPLAY (event->any.window);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
switch (xev->xany.type)
{
......@@ -937,7 +937,7 @@ static Window
motif_find_drag_window (GdkDisplay *display,
gboolean create)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (!display_x11->motif_drag_window)
{
......@@ -1002,7 +1002,7 @@ motif_find_drag_window (GdkDisplay *display,
static void
motif_read_target_table (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
gulong bytes_after, nitems;
Atom type;
gint format;
......@@ -1128,7 +1128,7 @@ static gint
motif_target_table_check (GdkDisplay *display,
GList *sorted)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
GList *tmp_list1, *tmp_list2;
gint i;
......@@ -1156,7 +1156,7 @@ static gint
motif_add_to_target_table (GdkDisplay *display,
GList *targets) /* targets is list of GdkAtom */
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
GList *sorted = NULL;
gint index = -1;
gint i;
......@@ -1586,7 +1586,7 @@ motif_read_initiator_info (GdkDisplay *display,
guchar *data;
MotifDragInitiatorInfo *initiator_info;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
gdk_x11_display_error_trap_push (display);
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), source_window, atom,
......@@ -1650,7 +1650,7 @@ motif_drag_context_new (GdkWindow *dest_window,
GdkDragContextX11 *context_x11;
GdkDragContext *context;
GdkDisplay *display = GDK_WINDOW_DISPLAY (dest_window);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
/* FIXME, current_dest_drag really shouldn't be NULL'd
* if we error below.
......@@ -1716,7 +1716,7 @@ motif_top_level_enter (GdkEvent *event,
guint32 source_window,
guint32 atom)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkDragContext *new_context;
GDK_NOTE(DND, g_message ("Motif DND top level enter: flags: %#4x time: %d source_widow: %#4x atom: %d",
......@@ -1740,7 +1740,7 @@ motif_top_level_leave (GdkEvent *event,
guint16 flags,
guint32 timestamp)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GDK_NOTE(DND, g_message ("Motif DND top level leave: flags: %#4x time: %d",
flags, timestamp));
......@@ -1769,7 +1769,7 @@ motif_motion (GdkEvent *event,
gint16 y_root)
{
GdkDragContextX11 *context_x11;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GDK_NOTE(DND, g_message ("Motif DND motion: flags: %#4x time: %d (%d, %d)",
flags, timestamp, x_root, y_root));
......@@ -1808,7 +1808,7 @@ motif_operation_changed (GdkEvent *event,
guint32 timestamp)
{
GdkDragContextX11 *context_x11;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GDK_NOTE(DND, g_message ("Motif DND operation changed: flags: %#4x time: %d",
flags, timestamp));
......@@ -1847,7 +1847,7 @@ motif_drop_start (GdkEvent *event,
gint16 y_root)
{
GdkDragContext *new_context;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (event->any.window));
GDK_NOTE(DND, g_message ("Motif DND drop start: flags: %#4x time: %d (%d, %d) source_widow: %#4x atom: %d",
flags, timestamp, x_root, y_root, source_window, atom));
......@@ -2732,7 +2732,7 @@ xdnd_manage_source_filter (GdkDragContext *context,
static void
base_precache_atoms (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (!display_x11->base_dnd_atoms_precached)
{
......@@ -2754,7 +2754,7 @@ base_precache_atoms (GdkDisplay *display)
static void
xdnd_precache_atoms (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (!display_x11->xdnd_atoms_precached)
{
......@@ -2789,7 +2789,7 @@ xdnd_enter_filter (GdkXEvent *xev,
{
GdkDeviceManager *device_manager;
GdkDisplay *display;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
XEvent *xevent = (XEvent *)xev;
GdkDragContext *context;
GdkDragContextX11 *context_x11;
......@@ -2927,7 +2927,7 @@ xdnd_leave_filter (GdkXEvent *xev,
XEvent *xevent = (XEvent *)xev;
guint32 source_window = xevent->xclient.data.l[0];
GdkDisplay *display;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
if (!event->any.window ||
gdk_window_get_window_type (event->any.window) == GDK_WINDOW_FOREIGN)
......@@ -2972,7 +2972,7 @@ xdnd_position_filter (GdkXEvent *xev,
Atom action = xevent->xclient.data.l[4];
GdkDisplay *display;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkDragContext *context;
GdkDragContextX11 *context_x11;
......@@ -3030,7 +3030,7 @@ xdnd_drop_filter (GdkXEvent *xev,
guint32 source_window = xevent->xclient.data.l[0];
guint32 time = xevent->xclient.data.l[2];
GdkDisplay *display;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkDragContext *context;
GdkDragContextX11 *context_x11;
......
......@@ -270,7 +270,7 @@ _gdk_x11_display_queue_events (GdkDisplay *display)
XEvent xevent;
Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
GdkEventSource *event_source;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
display_x11 = GDK_DISPLAY_X11 (display);
event_source = (GdkEventSource *) display_x11->event_source;
......@@ -341,7 +341,7 @@ gdk_x11_event_source_new (GdkDisplay *display)
{
GSource *source;
GdkEventSource *event_source;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
int connection_number;
char *name;
......
......@@ -157,7 +157,7 @@ static void
gdk_window_queue (GdkWindow *window,
GdkWindowQueueItem *item)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
if (!display_x11->translate_queue)
display_x11->translate_queue = g_queue_new ();
......@@ -331,7 +331,7 @@ _gdk_x11_window_process_expose (GdkWindow *window,
GdkRectangle *area)
{
cairo_region_t *invalidate_region = cairo_region_create_rectangle (area);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
if (display_x11->translate_queue)
{
......
......@@ -234,7 +234,7 @@ update_modmap (Display *display,
static XkbDescPtr
get_xkb (GdkKeymapX11 *keymap_x11)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
Display *xdisplay = display_x11->xdisplay;
update_keyrange (keymap_x11);
......@@ -318,7 +318,7 @@ set_symbol (KeySym *syms,
static void
update_keymaps (GdkKeymapX11 *keymap_x11)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (GDK_KEYMAP (keymap_x11)->display);
Display *xdisplay = display_x11->xdisplay;
#ifdef HAVE_XKB
......@@ -671,7 +671,7 @@ void
_gdk_x11_keymap_state_changed (GdkDisplay *display,
XEvent *xevent)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
XkbEvent *xkb_event = (XkbEvent *)xevent;
if (display_x11->keymap)
......@@ -691,7 +691,7 @@ _gdk_x11_keymap_state_changed (GdkDisplay *display,
void
_gdk_x11_keymap_keys_changed (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
++display_x11->keymap_serial;
......@@ -1595,7 +1595,7 @@ gint
_gdk_x11_get_group_for_state (GdkDisplay *display,
GdkModifierType state)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
#ifdef HAVE_XKB
if (display_x11->use_xkb)
......
......@@ -246,7 +246,7 @@ gdk_x_error (Display *xdisplay,
displays = gdk_display_manager_list_displays (manager);
while (displays != NULL)
{
GdkDisplayX11 *gdk_display = displays->data;
GdkX11Display *gdk_display = displays->data;
if (xdisplay == gdk_display->xdisplay)
{
......
......@@ -174,7 +174,7 @@ insert_atom_pair (GdkDisplay *display,
GdkAtom virtual_atom,
Atom xatom)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (!display_x11->atom_from_virtual)
{
......@@ -194,7 +194,7 @@ static Atom
lookup_cached_xatom (GdkDisplay *display,
GdkAtom atom)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (ATOM_TO_INDEX (atom) < G_N_ELEMENTS (xatoms_offset) - N_CUSTOM_PREDEFINED)
return ATOM_TO_INDEX (atom);
......@@ -328,7 +328,7 @@ GdkAtom
gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
Atom xatom)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkAtom virtual_atom = GDK_NONE;
g_return_val_if_fail (GDK_IS_DISPLAY (display), GDK_NONE);
......
......@@ -486,7 +486,7 @@ init_randr13 (GdkScreen *screen)
{
#ifdef HAVE_RANDR
GdkDisplay *display = gdk_screen_get_display (screen);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (screen);
Display *dpy = GDK_SCREEN_XDISPLAY (screen);
XRRScreenResources *resources;
......@@ -790,7 +790,7 @@ _gdk_x11_screen_new (GdkDisplay *display,
{
GdkScreen *screen;
GdkScreenX11 *screen_x11;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
screen = g_object_new (GDK_TYPE_SCREEN_X11, NULL);
......@@ -890,7 +890,7 @@ _gdk_x11_screen_size_changed (GdkScreen *screen,
{
gint width, height;
#ifdef HAVE_RANDR
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
#endif
width = gdk_screen_get_width (screen);
......
......@@ -528,7 +528,7 @@ get_default_title (void)
static void
check_leader_window_title (GdkDisplay *display)
{
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
GdkX11Display *display_x11 = GDK_DISPLAY_X11 (display);
if (display_x11->leader_window && !display_x11->leader_window_title_set)
{
......@@ -544,7 +544,7 @@ static Window
create_focus_window (GdkDisplay *display,
XID parent)
{
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
GdkEventMask event_mask;
Display *xdisplay;
Window focus_window;
......@@ -688,7 +688,7 @@ _gdk_x11_display_create_window_impl (GdkDisplay *display,
{
GdkWindowImplX11 *impl;
GdkScreenX11 *screen_x11;
GdkDisplayX11 *display_x11;
GdkX11Display *display_x11;
Window xparent;
Visual *xvisual;
......@@ -874,7 +874,7 @@ gdk_x11_window_foreign_new_for_display (GdkDisplay *display,