Commit 5334fb89 authored by Matthias Clasen's avatar Matthias Clasen

Drop GDK_MULTIHEAD_SAFE

We don't support multiple screens anymore, so there is no need
for marking API as multihead safe any longer.
parent 41fd2ae8
......@@ -90,13 +90,6 @@ GDK_PIXBUF_DISABLE_DEPRECATED and G_DISABLE_DEPRECATED for GDK, GdkPixbuf and
GLib.
</para>
<para>
If you want to make sure that your program doesn't use any functions which
may be problematic in a multihead setting, you can define the preprocessor
symbol GDK_MULTIHEAD_SAFE by using the command line option
<literal>-DGTK_MULTIHEAD_SAFE=1</literal>.
</para>
<para>
Similarly, if you want to make sure that your program doesn't use any
functions which may be problematic in a multidevice setting, you can
......
......@@ -162,10 +162,6 @@ additional environment variables.
<term>keybindings</term>
<listitem><para>Keybindings</para></listitem>
</varlistentry>
<varlistentry>
<term>multihead</term>
<listitem><para>Working on multiple displays</para></listitem>
</varlistentry>
<varlistentry>
<term>modules</term>
<listitem><para>Loading of modules</para></listitem>
......@@ -395,10 +391,6 @@ nevertheless.
<term>nograbs</term>
<listitem><para>Turn off all pointer and keyboard grabs</para></listitem>
</varlistentry>
<varlistentry>
<term>multihead</term>
<listitem><para>Information related to multiple screens</para></listitem>
</varlistentry>
<varlistentry>
<term>xinerama</term>
<listitem><para>Simulate a multi-monitor setup</para></listitem>
......
......@@ -219,10 +219,8 @@ GType gdk_cursor_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GdkCursor* gdk_cursor_new_for_display (GdkDisplay *display,
GdkCursorType cursor_type);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
GdkCursor* gdk_cursor_new (GdkCursorType cursor_type);
#endif
GDK_AVAILABLE_IN_ALL
GdkCursor* gdk_cursor_new_from_pixbuf (GdkDisplay *display,
GdkPixbuf *pixbuf,
......
......@@ -479,11 +479,7 @@ gdk_event_put (const GdkEvent *event)
if (event->any.window)
display = gdk_window_get_display (event->any.window);
else
{
GDK_NOTE (MULTIHEAD,
g_message ("Falling back to default display for gdk_event_put()"));
display = gdk_display_get_default ();
}
display = gdk_display_get_default ();
gdk_display_put_event (display, event);
}
......
......@@ -1305,14 +1305,10 @@ void gdk_set_show_events (gboolean show_events);
GDK_AVAILABLE_IN_ALL
gboolean gdk_get_show_events (void);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
gboolean gdk_setting_get (const gchar *name,
GValue *value);
#endif /* GDK_MULTIHEAD_SAFE */
G_END_DECLS
#endif /* __GDK_EVENTS_H__ */
......@@ -80,10 +80,8 @@ struct _GdkKeymapKey
GDK_AVAILABLE_IN_ALL
GType gdk_keymap_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
GdkKeymap* gdk_keymap_get_default (void);
#endif
GDK_AVAILABLE_IN_ALL
GdkKeymap* gdk_keymap_get_for_display (GdkDisplay *display);
......
......@@ -95,8 +95,6 @@ GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
guint32 time_);
#endif /* GDK_MULTIDEVICE_SAFE */
#ifndef GDK_MULTIHEAD_SAFE
#ifndef GDK_MULTIDEVICE_SAFE
GDK_DEPRECATED_IN_3_0_FOR(gdk_device_ungrab)
void gdk_pointer_ungrab (guint32 time_);
......@@ -122,8 +120,6 @@ void gdk_set_double_click_time (guint msec);
GDK_AVAILABLE_IN_ALL
void gdk_beep (void);
#endif /* GDK_MULTIHEAD_SAFE */
GDK_AVAILABLE_IN_ALL
void gdk_flush (void);
......
......@@ -31,10 +31,8 @@ G_BEGIN_DECLS
GDK_AVAILABLE_IN_ALL
PangoContext *gdk_pango_context_get_for_screen (GdkScreen *screen);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
PangoContext *gdk_pango_context_get (void);
#endif
/* Get a clip region to draw only part of a layout or
......
......@@ -152,7 +152,6 @@ G_BEGIN_DECLS
/* Selections
*/
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
gboolean gdk_selection_owner_set (GdkWindow *owner,
GdkAtom selection,
......@@ -160,8 +159,6 @@ gboolean gdk_selection_owner_set (GdkWindow *owner,
gboolean send_event);
GDK_AVAILABLE_IN_ALL
GdkWindow* gdk_selection_owner_get (GdkAtom selection);
#endif/* GDK_MULTIHEAD_SAFE */
GDK_AVAILABLE_IN_ALL
gboolean gdk_selection_owner_set_for_display (GdkDisplay *display,
GdkWindow *owner,
......
......@@ -82,7 +82,6 @@ typedef enum
GDK_AVAILABLE_IN_ALL
GType gdk_visual_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
gint gdk_visual_get_best_depth (void);
GDK_AVAILABLE_IN_ALL
......@@ -108,7 +107,6 @@ void gdk_query_visual_types (GdkVisualType **visual_types,
GDK_AVAILABLE_IN_ALL
GList* gdk_list_visuals (void);
#endif
GDK_AVAILABLE_IN_ALL
GdkScreen *gdk_visual_get_screen (GdkVisual *visual);
......
......@@ -1243,9 +1243,6 @@ gdk_window_new (GdkWindow *parent,
if (!parent)
{
GDK_NOTE (MULTIHEAD,
g_warning ("gdk_window_new(): no parent specified reverting to parent = default root window"));
screen = gdk_screen_get_default ();
parent = gdk_screen_get_root_window (screen);
}
......@@ -6034,12 +6031,7 @@ gdk_window_get_geometry (GdkWindow *window,
GdkWindowImplClass *impl_class;
if (!window)
{
GDK_NOTE (MULTIHEAD,
g_message ("gdk_window_get_geometry(): Window needs "
"to be non-NULL to be multi head safe"));
window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
}
window = gdk_screen_get_root_window ((gdk_screen_get_default ()));
g_return_if_fail (GDK_IS_WINDOW (window));
......
......@@ -469,8 +469,6 @@ _gdk_x11_window_get_property (GdkWindow *window,
{
GdkScreen *screen = gdk_screen_get_default ();
window = gdk_screen_get_root_window (screen);
GDK_NOTE (MULTIHEAD, g_message ("gdk_property_get(): window is NULL\n"));
}
else if (!GDK_WINDOW_IS_X11 (window))
return FALSE;
......@@ -607,8 +605,6 @@ _gdk_x11_window_change_property (GdkWindow *window,
screen = gdk_screen_get_default ();
window = gdk_screen_get_root_window (screen);
GDK_NOTE (MULTIHEAD, g_message ("gdk_property_change(): window is NULL\n"));
}
else if (!GDK_WINDOW_IS_X11 (window))
return;
......@@ -658,9 +654,6 @@ _gdk_x11_window_delete_property (GdkWindow *window,
{
GdkScreen *screen = gdk_screen_get_default ();
window = gdk_screen_get_root_window (screen);
GDK_NOTE (MULTIHEAD,
g_message ("gdk_property_delete(): window is NULL\n"));
}
else if (!GDK_WINDOW_IS_X11 (window))
return;
......
......@@ -49,7 +49,6 @@ Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *displa
GDK_AVAILABLE_IN_ALL
const gchar * gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
Atom xatom);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
Atom gdk_x11_atom_to_xatom (GdkAtom atom);
GDK_AVAILABLE_IN_ALL
......@@ -58,7 +57,6 @@ GDK_AVAILABLE_IN_ALL
Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);
GDK_AVAILABLE_IN_ALL
const gchar * gdk_x11_get_xatom_name (Atom xatom);
#endif
G_END_DECLS
......
......@@ -61,10 +61,8 @@ int gdk_x11_screen_get_screen_number (GdkScreen *screen);
GDK_AVAILABLE_IN_ALL
const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
gint gdk_x11_get_default_screen (void);
#endif
/**
* GDK_SCREEN_XDISPLAY:
......
......@@ -36,21 +36,17 @@
G_BEGIN_DECLS
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
Window gdk_x11_get_default_root_xwindow (void);
GDK_AVAILABLE_IN_ALL
Display *gdk_x11_get_default_xdisplay (void);
#endif
#ifndef GDK_MULTIHEAD_SAFE
/**
* GDK_ROOT_WINDOW:
*
* Obtains the Xlib window id of the root window of the current screen.
*/
#define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ())
#endif
/**
* GDK_XID_TO_POINTER:
......@@ -71,12 +67,10 @@ Display *gdk_x11_get_default_xdisplay (void);
*/
#define GDK_POINTER_TO_XID(pointer) GPOINTER_TO_UINT(pointer)
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
void gdk_x11_grab_server (void);
GDK_AVAILABLE_IN_ALL
void gdk_x11_ungrab_server (void);
#endif
G_END_DECLS
......
......@@ -186,10 +186,8 @@ GType gtk_clipboard_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkClipboard *gtk_clipboard_get_for_display (GdkDisplay *display,
GdkAtom selection);
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
GtkClipboard *gtk_clipboard_get (GdkAtom selection);
#endif
GDK_AVAILABLE_IN_ALL
GdkDisplay *gtk_clipboard_get_display (GtkClipboard *clipboard);
......
......@@ -76,13 +76,11 @@ struct _GtkPlugClass
GDK_AVAILABLE_IN_ALL
GType gtk_plug_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
void gtk_plug_construct (GtkPlug *plug,
Window socket_id);
GDK_AVAILABLE_IN_ALL
GtkWidget *gtk_plug_new (Window socket_id);
#endif
GDK_AVAILABLE_IN_ALL
void gtk_plug_construct_for_display (GtkPlug *plug,
......
......@@ -87,10 +87,8 @@ struct _GtkSettingsValue
/* --- functions --- */
GDK_AVAILABLE_IN_ALL
GType gtk_settings_get_type (void) G_GNUC_CONST;
#ifndef GDK_MULTIHEAD_SAFE
GDK_AVAILABLE_IN_ALL
GtkSettings* gtk_settings_get_default (void);
#endif
GDK_AVAILABLE_IN_ALL
GtkSettings* gtk_settings_get_for_screen (GdkScreen *screen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment