move gdk_screen_width|heigth* to gdkdisplay

removed gdk_colormap_new_for_screen
implemented gdk_display_flush to replace gdk_flush

34 files changed, 130 insertions, 160 deletions

diff --git a/gdk/gdk.h b/gdk/gdk.h
index 7ec169d60..9bdc3fbac 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -106,13 +106,9 @@ GdkGrabStatus gdk_keyboard_grab      (GdkWindow    *window,
 void          gdk_keyboard_ungrab    (guint32       time);
 gboolean      gdk_pointer_is_grabbed (void);
 
-gint gdk_screen_width_for_screen (GdkScreen * screen);
 gint gdk_screen_width  (void) G_GNUC_CONST;
-gint gdk_screen_height_for_screen (GdkScreen * screen);
 gint gdk_screen_height (void) G_GNUC_CONST;
-gint gdk_screen_width_mm_for_screen (GdkScreen * screen);
 gint gdk_screen_width_mm  (void) G_GNUC_CONST;
-gint gdk_screen_height_mm_for_screen (GdkScreen * screen);
 gint gdk_screen_height_mm (void) G_GNUC_CONST;
 
 void gdk_flush (void);
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 5c7cc881d..8848d6858 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -61,19 +61,13 @@ GType        gdk_colormap_get_type (void) G_GNUC_CONST;
 
 GdkColormap* gdk_colormap_new	  (GdkVisual   *visual,
 				   gboolean	allocate);
-GdkColormap* gdk_colormap_new_for_screen (GdkVisual * visual,
-					  GdkScreen * screen,
-					  gboolean private_cmap);
-
 GdkColormap* gdk_colormap_ref	  (GdkColormap *cmap);
 void	     gdk_colormap_unref	  (GdkColormap *cmap);
-GdkColormap *gdk_colormap_get_system_for_screen (GdkScreen * screen);
-gint	     gdk_colormap_get_system_size_for_screen (GdkScreen * screen);
 
 GdkColormap* gdk_colormap_get_system	   (void);
 gint	     gdk_colormap_get_system_size  (void);
 GdkColormap* gdk_colormap_get_system_for_screen (GdkScreen * screen);
-gint	     gdk_colormap_get_system_size_for_screen (GdkScreen * screen);
+
 void gdk_colormap_change (GdkColormap	*colormap,
 			  gint		 ncolors);
 
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index d73226093..2a912e99f 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -24,8 +24,8 @@ struct _GdkCursor
 
 /* Cursors
  */
-GdkCursor* gdk_cursor_new_for_screen	 (GdkCursorType cursor_type,
-					  GdkScreen * screen);
+GdkCursor* gdk_cursor_new_for_screen	 (GdkScreen * screen,
+					  GdkCursorType cursor_type);
 GdkCursor* gdk_cursor_new		 (GdkCursorType	   cursor_type);
 GdkCursor* gdk_cursor_new_from_pixmap	 (GdkPixmap	  *source,
 					  GdkPixmap	  *mask,
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 23aac5b4b..b8e4392e0 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -54,7 +54,7 @@ GdkAtom		gdk_display_atom		(GdkDisplay * dpy,
 						 const gchar * atom_name,
 						 gboolean only_if_exists);
 gchar *		gdk_display_atom_name		(GdkDisplay * dpy, GdkAtom atom);
-
+void		gdk_display_sync		(GdkDisplay * display);
 
 #ifdef __cplusplus
 }
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 379b109fa..691d53abe 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include "gdk.h"		/* For gdk_screen_width/gdk_screen_height */
+#include "gdk.h"		
 #include "gdkcolor.h"
 #include "gdkimage.h"
 #include "gdkvisual.h"
@@ -1253,8 +1253,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
       ret = gdk_window_get_origin (src, &src_xorigin, &src_yorigin);
       g_return_val_if_fail (ret != FALSE, NULL);
 
-      screen_width = gdk_screen_width_for_screen (gdk_window_get_screen(src));
-      screen_height = gdk_screen_height_for_screen (gdk_window_get_screen(src));
+      screen_width = gdk_screen_get_width (gdk_window_get_screen(src));
+      screen_height = gdk_screen_get_height (gdk_window_get_screen(src));
 
       screen_srcx = src_xorigin + src_x;
       screen_srcy = src_yorigin + src_y;
diff --git a/gdk/gdkproperty.h b/gdk/gdkproperty.h
index 0db5fb661..27764fe40 100644
--- a/gdk/gdkproperty.h
+++ b/gdk/gdkproperty.h
@@ -16,7 +16,6 @@ typedef enum
 
 GdkAtom gdk_atom_intern (const gchar *atom_name,
 			 gboolean     only_if_exists);
-gchar *gdk_atom_name_for_display (GdkAtom atom, GdkDisplay * dpy);
 gchar*  gdk_atom_name   (GdkAtom      atom);
 
 gboolean gdk_property_get    (GdkWindow     *window,
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 1bb771f5b..96dac6a03 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -724,16 +724,12 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
       if (!image_info->cmap &&
 	  (gdk_rgb_install_cmap || image_info->visual != gdk_visual_get_system_for_screen (visual->screen)))
 	{
-	  image_info->cmap = gdk_colormap_new_for_screen (image_info->visual,
-							  visual->screen,
-							  FALSE);
+	  image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
 	  image_info->cmap_alloced = TRUE;
 	}
       if (!gdk_rgb_do_colormaps (image_info, image_info->cmap != NULL))
 	{
-	  image_info->cmap = gdk_colormap_new_for_screen (image_info->visual,
-							  visual->screen,
-							  FALSE);
+	  image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
 	  image_info->cmap_alloced = TRUE;
 	  gdk_rgb_do_colormaps (image_info, TRUE);
 	}
@@ -751,9 +747,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
     {
       if (!image_info->cmap)
 	{
-	  image_info->cmap = gdk_colormap_new_for_screen (image_info->visual,
-							  visual->screen,
-							  FALSE);
+	  image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
 	  image_info->cmap_alloced = TRUE;
 	}
       
@@ -770,9 +764,7 @@ gdk_rgb_create_info (GdkVisual *visual, GdkColormap *colormap)
 	    image_info->cmap = gdk_colormap_ref (gdk_colormap_get_system_for_screen (visual->screen));
 	  else
 	    {
-	      image_info->cmap = gdk_colormap_new_for_screen(image_info->visual,
-							     visual->screen,
-							     FALSE);
+	      image_info->cmap = gdk_colormap_new (image_info->visual, FALSE);
 	      image_info->cmap_alloced = TRUE;
 	    }
 	}
@@ -3102,7 +3094,7 @@ gdk_rgb_alloc_scratch_image (GdkRgbInfo *image_info)
   if (image_info->static_image_idx == N_REGIONS)
     {
 #ifndef NO_FLUSH
-      gdk_flush ();
+      gdk_display_sync (gdk_screen_get_display(image_info->visual->screen));
 #endif
 #ifdef VERBOSE
       g_print ("flush, %d puts since last flush\n", sincelast);
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 08a308168..0b7681e0c 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -76,3 +76,29 @@ gdk_screen_get_window_at_pointer (GdkScreen *screen,
 							     win_y);
 }
 
+gint
+gdk_screen_get_width (GdkScreen * screen)
+{
+  return GDK_SCREEN_GET_CLASS(screen)->get_width (screen);
+}
+
+gint
+gdk_screen_get_height (GdkScreen * screen)
+{
+  return GDK_SCREEN_GET_CLASS(screen)->get_height (screen);
+}
+
+
+gint
+gdk_screen_get_width_mm (GdkScreen * screen)
+{
+  return GDK_SCREEN_GET_CLASS(screen)->get_width_mm (screen);
+}
+
+gint
+gdk_screen_get_height_mm (GdkScreen * screen)
+{
+  return GDK_SCREEN_GET_CLASS(screen)->get_height_mm (screen);
+}
+
+
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index cc95ace47..a4ed4574c 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -60,6 +60,11 @@ GdkWindow *	    gdk_screen_get_window_at_pointer	(GdkScreen *screen,
 							 gint * win_x,
 							 gint * win_y);
 
+gint		    gdk_screen_get_width		(GdkScreen * screen);
+gint		    gdk_screen_get_height		(GdkScreen * screen);
+gint		    gdk_screen_get_width_mm		(GdkScreen * screen);
+gint		    gdk_screen_get_height_mm		(GdkScreen * screen);
+
 
 #ifdef __cplusplus
 }
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index e72dfdadd..bf8730645 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1786,7 +1786,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
           if (debug_updates)
             {
               /* Make sure we see the red invalid area before redrawing. */
-              gdk_flush ();
+              gdk_display_sync (gdk_window_get_display(window));
               g_usleep (70000);
             }
           
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index e06d74591..dbf91b4e8 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -128,9 +128,9 @@ gdk_colormap_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-GdkColormap *
-gdk_colormap_new_for_screen (GdkVisual * visual,
-			     GdkScreen * screen, gboolean private_cmap)
+GdkColormap*
+gdk_colormap_new (GdkVisual *visual,
+		  gboolean   private_cmap)
 {
   GdkColormap *colormap;
   GdkColormapPrivateX11 *private;
@@ -154,7 +154,7 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
 
   colormap->size = visual->colormap_size;
 
-  colormap->screen = screen;
+  colormap->screen = visual->screen;
 
   switch (visual->type) {
   case GDK_VISUAL_GRAYSCALE:
@@ -166,8 +166,8 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
 				      (GEqualFunc) gdk_color_equal);
 
     private->private_val = private_cmap;
-    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (screen),
-					  GDK_SCREEN_XROOTWIN (screen),
+    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (visual->screen),
+					  GDK_SCREEN_XROOTWIN (visual->screen),
 					  xvisual,
 					  (private_cmap) ? (AllocAll)
 					  : (AllocNone));
@@ -180,9 +180,9 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
       for (i = 0; i < colormap->size; i++)
 	default_colors[i].pixel = i;
 
-      XQueryColors (GDK_SCREEN_XDISPLAY (screen),
-		    DefaultColormap (GDK_SCREEN_XDISPLAY (screen),
-				     GDK_SCREEN_IMPL_X11 (screen)->scr_num),
+      XQueryColors (GDK_SCREEN_XDISPLAY (visual->screen),
+		    DefaultColormap (GDK_SCREEN_XDISPLAY (visual->screen),
+				     GDK_SCREEN_IMPL_X11 (visual->screen)->scr_num),
 		    default_colors, colormap->size);
 
       for (i = 0; i < colormap->size; i++) {
@@ -200,8 +200,8 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
 
   case GDK_VISUAL_DIRECT_COLOR:
     private->private_val = TRUE;
-    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (screen),
-					  GDK_SCREEN_XROOTWIN (screen),
+    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (visual->screen),
+					  GDK_SCREEN_XROOTWIN (visual->screen),
 					  xvisual, AllocAll);
     colormap->colors = g_new (GdkColor, colormap->size);
 
@@ -223,8 +223,8 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
   case GDK_VISUAL_STATIC_GRAY:
   case GDK_VISUAL_STATIC_COLOR:
     private->private_val = FALSE;
-    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (screen),
-					  GDK_SCREEN_XROOTWIN (screen),
+    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (visual->screen),
+					  GDK_SCREEN_XROOTWIN (visual->screen),
 					  xvisual, AllocNone);
 
     colormap->colors = g_new (GdkColor, colormap->size);
@@ -233,8 +233,8 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
 
   case GDK_VISUAL_TRUE_COLOR:
     private->private_val = FALSE;
-    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (screen),
-					  GDK_SCREEN_XROOTWIN (screen),
+    private->xcolormap = XCreateColormap (GDK_SCREEN_XDISPLAY (visual->screen),
+					  GDK_SCREEN_XROOTWIN (visual->screen),
 					  xvisual, AllocNone);
     break;
   }
@@ -244,14 +244,6 @@ gdk_colormap_new_for_screen (GdkVisual * visual,
   return colormap;
 }
 
-GdkColormap*
-gdk_colormap_new (GdkVisual *visual,
-		  gboolean   private_cmap)
-{
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_colormap_new_for_screen instead\n"));  
-  return gdk_colormap_new_for_screen(visual,DEFAULT_GDK_SCREEN,private_cmap);
-}
-
 #define MIN_SYNC_TIME 2
 
 static void
@@ -358,16 +350,11 @@ gdk_colormap_get_system (void)
 }
 
 gint
-gdk_colormap_get_system_size_for_screen (GdkScreen * screen)
-{
-  return DisplayCells (GDK_SCREEN_XDISPLAY (screen),
-		       GDK_SCREEN_IMPL_X11 (screen)->scr_num);
-}
-
-gint
 gdk_colormap_get_system_size (void)
 {
-  return gdk_colormap_get_system_size_for_screen(DEFAULT_GDK_SCREEN);
+  GDK_NOTE(MULTIHEAD, g_message(" Use the DisplayCells X call instead\n"));
+  return DisplayCells (GDK_SCREEN_XDISPLAY (DEFAULT_GDK_SCREEN),
+		       GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->scr_num);
 }
 
 void
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 63f8fa5f1..8ed6517f3 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -280,3 +280,8 @@ gdk_display_atom_name (GdkDisplay * dpy, GdkAtom atom)
   }
 }
 
+void
+gdk_display_sync (GdkDisplay * display)
+{
+  XSync (GDK_DISPLAY_IMPL_X11(display)->xdisplay, False);
+}
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 1fa7ec768..7197d5c65 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2576,7 +2576,7 @@ xdnd_manage_source_filter (GdkDragContext *context,
 	}
     }
 
-  gdk_flush ();
+  gdk_display_sync (gdk_window_get_display(window));
   gdk_error_trap_pop ();  
 }
 
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 113743c82..491082cee 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1934,7 +1934,7 @@ gdk_net_wm_supports_for_screen (GdkAtom property, GdkScreen * screen)
    */
   XSelectInput (scr_impl->xdisplay, *xwindow, StructureNotifyMask);
 
-  gdk_flush ();
+  gdk_display_sync (scr_impl->display);
 
   if (gdk_error_trap_pop ()) {
     XFree (xwindow);
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 640778da3..47aa813e4 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -490,7 +490,7 @@ gdk_x11_image_destroy (GdkImage *image)
 
     case GDK_IMAGE_SHARED:
 #ifdef USE_SHM
-      gdk_flush();
+      gdk_display_sync (GDK_SCREEN_IMPL_X11(private->screen)->display);
 
       XShmDetach (GDK_SCREEN_XDISPLAY(private->screen), private->x_shm_info);
       XDestroyImage (private->ximage);
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 46ed5b5c5..7ec470d4c 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -448,8 +448,8 @@ gdk_input_translate_coordinates (GdkDevicePrivate *gdkdev,
 
   if (gdkdev->info.mode == GDK_MODE_SCREEN) 
     {
-      x_scale = gdk_screen_width() / device_width;
-      y_scale = gdk_screen_height() / device_height;
+      x_scale = gdk_screen_get_width(gdk_window_get_screen(input_window->window)) / device_width;
+      y_scale = gdk_screen_get_height(gdk_window_get_screen(input_window->window)) / device_height;
 
       x_offset = - input_window->root_x;
       y_offset = - input_window->root_y;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index c06385a93..640042e01 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -516,13 +516,8 @@ gdk_keyboard_ungrab (guint32 time)
 gint
 gdk_screen_width (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_width_for_screen instead\n"));  
-  return gdk_screen_width_for_screen (DEFAULT_GDK_SCREEN);
-}
-gint
-gdk_screen_width_for_screen (GdkScreen * screen)
-{
-  return GDK_SCREEN_GET_CLASS(screen)->get_width (screen);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_width instead\n"));  
+  return gdk_screen_get_width (DEFAULT_GDK_SCREEN);
 }
 
 /*
@@ -543,15 +538,10 @@ gdk_screen_width_for_screen (GdkScreen * screen)
 gint
 gdk_screen_height (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_height_for_screen instead\n"));
-  return gdk_screen_height_for_screen (DEFAULT_GDK_SCREEN);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_height instead\n"));
+  return gdk_screen_get_height (DEFAULT_GDK_SCREEN);
 }
 
-gint
-gdk_screen_height_for_screen (GdkScreen * screen)
-{
-  return GDK_SCREEN_GET_CLASS(screen)->get_height (screen);
-}
 
 
 /*
@@ -572,13 +562,8 @@ gdk_screen_height_for_screen (GdkScreen * screen)
 gint
 gdk_screen_width_mm (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_width_mm_for_screen instead\n"));
-  return gdk_screen_width_mm_for_screen(DEFAULT_GDK_SCREEN);
-}
-gint
-gdk_screen_width_mm_for_screen (GdkScreen * screen)
-{
-  return GDK_SCREEN_GET_CLASS(screen)->get_width_mm (screen);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_width_mm instead\n"));
+  return gdk_screen_get_width_mm (DEFAULT_GDK_SCREEN);
 }
 
 /*
@@ -599,13 +584,8 @@ gdk_screen_width_mm_for_screen (GdkScreen * screen)
 gint
 gdk_screen_height_mm (void)
 {
-  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_height_mm_for_screen instead\n"));
-  return gdk_screen_height_mm_for_screen(DEFAULT_GDK_SCREEN);
-}
-gint
-gdk_screen_height_mm_for_screen (GdkScreen * screen)
-{
-  return GDK_SCREEN_GET_CLASS(screen)->get_height_mm (screen);
+  GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_height_mm instead\n"));
+  return gdk_screen_get_height_mm(DEFAULT_GDK_SCREEN);
 }
 
 /*
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 5501f165f..754f74305 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -154,18 +154,4 @@ static GdkWindow * gdk_X11_screen_get_window_at_pointer (GdkScreen *screen,
 
 
 
-/*
-GdkVisual * gdk_X11_screen_get_root_visual(GdkScreen * screen){
-
-
-}
-
-GdkColormap *	    gdk_X11_screen_get_default_colormap(GdkScreen * screen){
-
-}
-GdkGC *		    gdk_X11_screen_get_default_gc	(GdkScreen * screen){
-
-}
-*/
-
 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f27373fa1..0413c70ba 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -428,7 +428,7 @@ gdk_window_new_for_screen (GdkScreen * screen,
 	gdk_colormap_ref (draw_impl->colormap);
       }
       else {
-	draw_impl->colormap = gdk_colormap_new_for_screen (visual, screen, FALSE);
+	draw_impl->colormap = gdk_colormap_new (visual, FALSE);
       }
     }
 
@@ -755,7 +755,7 @@ _gdk_windowing_window_destroy (GdkWindow *window,
 	  XSendEvent (GDK_WINDOW_XDISPLAY (window),
 		      GDK_WINDOW_XID (window),
 		      False, 0, (XEvent *)&xevent);
-	  gdk_flush ();
+	  gdk_display_sync (GDK_WINDOW_DISPLAY(window));
 	  gdk_error_trap_pop ();
 	}
     }
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 3fc491fba..65a5b8d7b 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -829,8 +829,8 @@ popup_position_func (GtkMenu   *menu,
   *y = root_y + widget->allocation.height / 2;
 
   /* Ensure sanity */
-  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width_for_screen (widget->screen) - req.width));
-  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height_for_screen (widget->screen) - req.height));
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_get_width (widget->screen) - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (widget->screen) - req.height));
 }
 
 static void
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index fbf3de27b..4fece96ab 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -392,7 +392,7 @@ gtk_combo_get_pos (GtkCombo * combo, gint * x, gint * y, gint * height, gint * w
   real_height = MIN (combo->entry->requisition.height, 
 		     combo->entry->allocation.height);
   *y += real_height;
-  avail_height = gdk_screen_height_for_screen (widget->screen) - *y;
+  avail_height = gdk_screen_get_height (widget->screen) - *y;
   
   gtk_widget_size_request (combo->list, &list_requisition);
   min_height = MIN (list_requisition.height, 
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index fa5a7ac50..570353551 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -728,10 +728,10 @@ gtk_curve_size_graph (GtkCurve *curve)
   width  = (curve->max_x - curve->min_x) + 1;
   height = (curve->max_y - curve->min_y) + 1;
   aspect = width / (gfloat) height;
-  if (width > gdk_screen_width_for_screen (scr) / 4)
-    width  = gdk_screen_width_for_screen (scr) / 4;
-  if (height > gdk_screen_height_for_screen (scr) / 4)
-    height = gdk_screen_height_for_screen (scr) / 4;
+  if (width > gdk_screen_get_width (scr) / 4)
+    width  = gdk_screen_get_width (scr) / 4;
+  if (height > gdk_screen_get_height (scr) / 4)
+    height = gdk_screen_get_height (scr) / 4;
 
   if (aspect < 1.0)
     width  = height * aspect;
@@ -864,8 +864,8 @@ gtk_curve_set_vector (GtkCurve *c, int veclen, gfloat vector[])
   else
     {
       height = (c->max_y - c->min_y);
-      if (height > gdk_screen_height_for_screen (scr) / 4)
-	height = gdk_screen_height_for_screen (scr) / 4;
+      if (height > gdk_screen_get_height (scr) / 4)
+	height = gdk_screen_get_height (scr) / 4;
 
       c->height = height;
       c->num_points = veclen;
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a3fbe36c8..6e1d71f89 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3299,8 +3299,8 @@ popup_position_func (GtkMenu   *menu,
   *x += widget->allocation.width / 2;
   *y += widget->allocation.height;
 
-  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width_for_screen (widget->screen) - req.width));
-  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height_for_screen (widget->screen) - req.height));
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_get_width (widget->screen) - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (widget->screen) - req.height));
 }
 
 static void
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 7cd4b2c8c..73b8f87c7 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -1170,9 +1170,9 @@ gtk_handle_box_motion (GtkWidget      *widget,
 	  /* this extra move is neccessary if we use decorations, or our
 	   * window manager insists on decorations.
 	   */
-	  gdk_flush ();
+	  gdk_display_sync (gdk_window_get_display(hb->float_window));
 	  gdk_window_move (hb->float_window, new_x, new_y);
-	  gdk_flush ();
+	  gdk_display_sync (gdk_window_get_display(hb->float_window));
 #endif	/* 0 */
 	  gtk_signal_emit (GTK_OBJECT (hb),
 			   handle_box_signals[SIGNAL_CHILD_DETACHED],
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 786d71fc3..88eddd0a7 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1054,7 +1054,7 @@ gtk_label_ensure_layout (GtkLabel *label,
 		       PANGO_SCALE * gdk_string_width (GTK_WIDGET (label)->style->font,
 						"This long string gives a good enough length for any line to have."));
 	  width = MIN (width,
-		       PANGO_SCALE * (gdk_screen_width_for_screen (GTK_WIDGET(label)->screen) + 1) / 2);
+		       PANGO_SCALE * (gdk_screen_get_width (GTK_WIDGET(label)->screen) + 1) / 2);
 
 	  pango_layout_set_width (label->layout, width);
 	  pango_layout_get_extents (label->layout, NULL, &logical_rect);
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index f7fc851bb..10891e5c5 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1947,8 +1947,8 @@ gtk_menu_position (GtkMenu *menu)
 
   widget = GTK_WIDGET (menu);
 
-  screen_width = gdk_screen_width_for_screen (widget->screen);
-  screen_height = gdk_screen_height_for_screen (widget->screen);
+  screen_width = gdk_screen_get_width (widget->screen);
+  screen_height = gdk_screen_get_height (widget->screen);
 
   gdk_window_get_pointer (gdk_screen_get_parent_root(widget->screen),
   			  &x, &y, NULL);
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 9acfda636..78ac3652b 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -736,8 +736,8 @@ gtk_menu_item_position_menu (GtkMenu  *menu,
   twidth = GTK_WIDGET (menu)->requisition.width;
   theight = GTK_WIDGET (menu)->requisition.height;
 
-  screen_width = gdk_screen_width_for_screen (GTK_WIDGET (menu)->screen);
-  screen_height = gdk_screen_height_for_screen (GTK_WIDGET (menu)->screen);
+  screen_width = gdk_screen_get_width (GTK_WIDGET (menu)->screen);
+  screen_height = gdk_screen_get_height (GTK_WIDGET (menu)->screen);
 
   if (!gdk_window_get_origin (GTK_WIDGET (menu_item)->window, &tx, &ty))
     {
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 24f169a2b..bfdb34a00 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -891,7 +891,7 @@ gtk_menu_shell_activate_item (GtkMenuShell      *menu_shell,
       /* flush the x-queue, so any grabs are removed and
        * the menu is actually taken down
        */
-      gdk_flush ();
+      gdk_display_sync (GTK_WIDGET_GET_DISPLAY(menu_item));
     }
 
   gtk_widget_activate (menu_item);
diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 793dba826..b04a799e3 100644
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -855,7 +855,7 @@ gtk_option_menu_position (GtkMenu  *menu,
       children = children->next;
     }
 
-  screen_width = gdk_screen_width_for_screen (GTK_WIDGET (option_menu)->screen);
+  screen_width = gdk_screen_get_width (GTK_WIDGET (option_menu)->screen);
   
   if (menu_xpos < 0)
     menu_xpos = 0;
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 5436a4464..d646c608a 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -222,12 +222,12 @@ gtk_plug_realize (GtkWidget *widget)
   gdk_error_trap_push ();
   widget->window = gdk_window_new (plug->socket_window, 
 				   &attributes, attributes_mask);
-  gdk_flush ();
+  gdk_display_sync (GTK_WIDGET_GET_DISPLAY(widget));
   if (gdk_error_trap_pop ()) /* Uh-oh */
     {
       gdk_error_trap_push ();
       gdk_window_destroy (widget->window);
-      gdk_flush ();
+      gdk_display_sync (GTK_WIDGET_GET_DISPLAY(widget));
       gdk_error_trap_pop ();
       widget->window = gdk_window_new_for_screen (widget->screen,
       						  NULL,
@@ -282,7 +282,7 @@ gtk_plug_forward_key_press (GtkPlug *plug, GdkEventKey *event)
   XSendEvent (GDK_WINDOW_XDISPLAY (plug->socket_window),
 	      GDK_WINDOW_XWINDOW (plug->socket_window),
 	      False, NoEventMask, &xevent);
-  gdk_flush ();
+  gdk_display_sync (GDK_WINDOW_DISPLAY(plug->socket_window));
   gdk_error_trap_pop ();
 }
 
@@ -312,7 +312,7 @@ gtk_plug_set_focus (GtkWindow *window,
       XSendEvent (gdk_display,
 		  GDK_WINDOW_XWINDOW (plug->socket_window),
 		  False, NoEventMask, &xevent);
-      gdk_flush ();
+      gdk_display_sync (GDK_WINDOW_DISPLAY(plug->socket_window));
       gdk_error_trap_pop ();
 #endif
 
@@ -504,10 +504,10 @@ gtk_plug_focus (GtkContainer     *container,
 	      gtk_window_set_focus (GTK_WINDOW (widget), NULL);
 
 	      gdk_error_trap_push ();
-	      XSetInputFocus (GDK_DISPLAY (),
+	      XSetInputFocus (GDK_WINDOW_XDISPLAY (plug->socket_window),
 			      GDK_WINDOW_XWINDOW (plug->socket_window),
 			      RevertToParent, event->time);
-	      gdk_flush ();
+	      gdk_display_sync(GDK_WINDOW_DISPLAY (plug->socket_window));
 	      gdk_error_trap_pop ();
 
 	      gtk_plug_forward_key_press (plug, event);
@@ -566,7 +566,7 @@ send_xembed_message (GtkPlug *plug,
       XSendEvent (GDK_WINDOW_XDISPLAY(plug->socket_window),
 		  GDK_WINDOW_XWINDOW (plug->socket_window),
 		  False, NoEventMask, &xevent);
-      gdk_flush ();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (plug->socket_window));
       gdk_error_trap_pop ();
     }
 }
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index a936605d9..7c90a8727 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -206,7 +206,7 @@ gtk_socket_steal (GtkSocket *socket, GdkNativeWindow id)
   gdk_window_hide (socket->plug_window);
   gdk_window_reparent (socket->plug_window, widget->window, 0, 0);
 
-  gdk_flush ();
+  gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
   gdk_error_trap_pop ();
   
   socket->need_map = TRUE;
@@ -262,7 +262,7 @@ gtk_socket_realize (GtkWidget *widget)
    * our window is passed to another application, SubstructureRedirectMask
    * will be set by the time the other app creates its window.
    */
-  gdk_flush();
+  gdk_display_sync(GDK_WINDOW_DISPLAY (widget->window));
 }
 
 static void
@@ -398,7 +398,7 @@ gtk_socket_size_allocate (GtkWidget     *widget,
 	      socket->need_map = FALSE;
 	    }
 
-	  gdk_flush ();
+	  gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
 	  gdk_error_trap_pop ();
 	}
     }
@@ -617,7 +617,7 @@ gtk_socket_key_press_event (GtkWidget   *widget,
       XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
-      gdk_flush ();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
       gdk_error_trap_pop ();
       
       return TRUE;
@@ -697,7 +697,7 @@ gtk_socket_claim_focus (GtkSocket *socket)
       XSetInputFocus (GDK_WINDOW_XDISPLAY (socket->plug_window),
 		      GDK_WINDOW_XWINDOW (socket->plug_window),
 		      RevertToParent, GDK_CURRENT_TIME);
-      gdk_flush ();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
       gdk_error_trap_pop ();
 #endif
     }
@@ -790,7 +790,7 @@ gtk_socket_focus (GtkContainer *container, GtkDirectionType direction)
       XSendEvent (xevent.xkey.display,
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
-      gdk_flush();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
       gdk_error_trap_pop ();
       
       return TRUE;
@@ -828,7 +828,7 @@ gtk_socket_send_configure_event (GtkSocket *socket)
   XSendEvent (GDK_WINDOW_XDISPLAY (socket->plug_window),
 	      GDK_WINDOW_XWINDOW (socket->plug_window),
 	      False, NoEventMask, &event);
-  gdk_flush ();
+  gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
   gdk_error_trap_pop ();
 }
 
@@ -859,7 +859,7 @@ gtk_socket_add_window (GtkSocket *socket, GdkNativeWindow xid)
       if (gdk_drag_get_protocol (GDK_WINDOW_DISPLAY(socket->plug_window), xid, &protocol))
 	gtk_drag_dest_set_proxy (GTK_WIDGET (socket), socket->plug_window, 
 				 protocol, TRUE);
-      gdk_flush ();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
       gdk_error_trap_pop ();
 
       gdk_window_add_filter (socket->plug_window, 
@@ -908,7 +908,7 @@ send_xembed_message (GtkSocket *socket,
       XSendEvent (GDK_WINDOW_XDISPLAY(socket->plug_window),
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
-      gdk_flush ();
+      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
       gdk_error_trap_pop ();
     }
 }
@@ -999,7 +999,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 				   0, 0,
 				   widget->allocation.width, 
 				   widget->allocation.height);
-	    gdk_flush ();
+	    gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
 	    gdk_error_trap_pop ();
 	
 	    socket->request_width = xcwe->width;
@@ -1089,7 +1089,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 	  
 	  if (toplevel)
 	    {
-	      XSetInputFocus (GDK_DISPLAY (),
+	      XSetInputFocus (GDK_WINDOW_XDISPLAY (toplevel->window),
 			      GDK_WINDOW_XWINDOW (toplevel->window),
 			      RevertToParent, CurrentTime); /* FIXME? */
 	    }
@@ -1112,7 +1112,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 	  
 	  gdk_error_trap_push ();
 	  gdk_window_show (socket->plug_window);
-	  gdk_flush ();
+	  gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
 	  gdk_error_trap_pop ();
 
 	  return_val = GDK_FILTER_REMOVE;
@@ -1138,7 +1138,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 		gtk_drag_dest_set_proxy (GTK_WIDGET (socket),
 					 socket->plug_window,
 					 protocol, TRUE);
-	      gdk_flush ();
+	      gdk_display_sync(GDK_WINDOW_DISPLAY (socket->plug_window));
 	      gdk_error_trap_pop ();
 	    }
 	  return_val = GDK_FILTER_REMOVE;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 84e55bb44..7be7b0387 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5159,8 +5159,8 @@ popup_position_func (GtkMenu   *menu,
   *x = CLAMP (*x, root_x, (root_x + widget->allocation.width));
   *y = CLAMP (*y, root_y, (root_y + widget->allocation.height));
 
-  *x = CLAMP (*x, 0, MAX (0, gdk_screen_width_for_screen (scr) - req.width));
-  *y = CLAMP (*y, 0, MAX (0, gdk_screen_height_for_screen (scr) - req.height));
+  *x = CLAMP (*x, 0, MAX (0, gdk_screen_get_width (scr) - req.width));
+  *y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (scr) - req.height));
 }
 
 static void
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 4fe5578df..bc41c5de4 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -329,8 +329,8 @@ gtk_tooltips_draw_tips (GtkTooltips * tooltips)
   
   widget = tooltips->active_tips_data->widget;
 
-  scr_w = gdk_screen_width_for_screen (widget->screen);
-  scr_h = gdk_screen_height_for_screen (widget->screen);
+  scr_w = gdk_screen_get_width (widget->screen);
+  scr_h = gdk_screen_get_height (widget->screen);
 
   data = tooltips->active_tips_data;
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 7a2e6486b..625a57c6f 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3007,8 +3007,8 @@ gtk_window_compute_reposition (GtkWindow *window,
     case GTK_WIN_POS_CENTER_ALWAYS:
       if (window->use_uposition)
 	{
-	  gint screen_width = gdk_screen_width_for_screen (widget->screen);
-	  gint screen_height = gdk_screen_height_for_screen (widget->screen);
+	  gint screen_width = gdk_screen_get_width (widget->screen);
+	  gint screen_height = gdk_screen_get_height (widget->screen);
 	  
 	  *x = (screen_width - new_width) / 2;
 	  *y = (screen_height - new_height) / 2;
@@ -3032,8 +3032,8 @@ gtk_window_compute_reposition (GtkWindow *window,
     case GTK_WIN_POS_MOUSE:
       if (window->use_uposition)
 	{
-	  gint screen_width = gdk_screen_width_for_screen (widget->screen);
-	  gint screen_height = gdk_screen_height_for_screen (widget->screen);
+	  gint screen_width = gdk_screen_get_width (widget->screen);
+	  gint screen_height = gdk_screen_get_height (widget->screen);
 	  
 	  gdk_window_get_pointer (window, x, y, NULL);
 	  *x -= new_width / 2;