remove DEFAULT_GDK_* to proper functions.

changed dpy_mgr to gdk_display_manager (added a fct to get it).

41 files changed, 1037 insertions, 131 deletions

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index da7a3a109..bcd34e464 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
    gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
 
-   root = GDK_SCREEN_GET_CLASS(DEFAULT_GDK_SCREEN)->get_root_window(DEFAULT_GDK_SCREEN);
+   root = gdk_screen_get_root_window(gdk_get_default_screen ());
    pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
 					 0, 0, 0, 0, 150, 160);
    
diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index 13a5cd5f7..d5177200b 100644
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -128,7 +128,7 @@ main (int argc, char **argv)
 
         gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
 
-        root = GDK_SCREEN_GET_CLASS(DEFAULT_GDK_SCREEN)->get_root_window(DEFAULT_GDK_SCREEN);
+        root = gdk_screen_get_root_window (gdk_get_default_screen ());
         pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
                                                0, 0, 0, 0, 150, 160);
    
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index 237835632..22fadf8c9 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -248,3 +248,912 @@ gdk_visual_get_type (void)
   return our_type;
 }
 
+/* Color parsing
+ */
+
+/* The following 2 routines (parse_color, find_color) come from Tk, via the Win32
+ * port of GDK. The licensing terms on these (longer than the functions) is:
+ *
+ * This software is copyrighted by the Regents of the University of
+ * California, Sun Microsystems, Inc., and other parties.  The following
+ * terms apply to all files associated with the software unless explicitly
+ * disclaimed in individual files.
+ *
+ * The authors hereby grant permission to use, copy, modify, distribute,
+ * and license this software and its documentation for any purpose, provided
+ * that existing copyright notices are retained in all copies and that this
+ * notice is included verbatim in any distributions. No written agreement,
+ * license, or royalty fee is required for any of the authorized uses.
+ * Modifications to this software may be copyrighted by their authors
+ * and need not follow the licensing terms described here, provided that
+ * the new terms are clearly indicated on the first page of each file where
+ * they apply.
+ *
+ * IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ * FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ * DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+ * IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ * NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ * MODIFICATIONS.
+ *
+ * GOVERNMENT USE: If you are acquiring this software on behalf of the
+ * U.S. government, the Government shall have only "Restricted Rights"
+ * in the software and related documentation as defined in the Federal
+ * Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+ * are acquiring the software on behalf of the Department of Defense, the
+ * software shall be classified as "Commercial Computer Software" and the
+ * Government shall have only "Restricted Rights" as defined in Clause
+ * 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+ * authors grant the U.S. Government and others acting in its behalf
+ * permission to use and distribute the software in accordance with the
+ * terms specified in this license.
+ */
+
+typedef struct {
+    const char *name;
+    unsigned char red;
+    unsigned char green;
+    unsigned char blue;
+} ColorEntry;
+
+static ColorEntry xColors[] = {
+  { "alice blue", 240, 248, 255 },
+  { "AliceBlue", 240, 248, 255 },
+  { "antique white", 250, 235, 215 },
+  { "AntiqueWhite", 250, 235, 215 },
+  { "AntiqueWhite1", 255, 239, 219 },
+  { "AntiqueWhite2", 238, 223, 204 },
+  { "AntiqueWhite3", 205, 192, 176 },
+  { "AntiqueWhite4", 139, 131, 120 },
+  { "aquamarine", 127, 255, 212 },
+  { "aquamarine1", 127, 255, 212 },
+  { "aquamarine2", 118, 238, 198 },
+  { "aquamarine3", 102, 205, 170 },
+  { "aquamarine4", 69, 139, 116 },
+  { "azure", 240, 255, 255 },
+  { "azure1", 240, 255, 255 },
+  { "azure2", 224, 238, 238 },
+  { "azure3", 193, 205, 205 },
+  { "azure4", 131, 139, 139 },
+  { "beige", 245, 245, 220 },
+  { "bisque", 255, 228, 196 },
+  { "bisque1", 255, 228, 196 },
+  { "bisque2", 238, 213, 183 },
+  { "bisque3", 205, 183, 158 },
+  { "bisque4", 139, 125, 107 },
+  { "black", 0, 0, 0 },
+  { "blanched almond", 255, 235, 205 },
+  { "BlanchedAlmond", 255, 235, 205 },
+  { "blue", 0, 0, 255 },
+  { "blue violet", 138, 43, 226 },
+  { "blue1", 0, 0, 255 },
+  { "blue2", 0, 0, 238 },
+  { "blue3", 0, 0, 205 },
+  { "blue4", 0, 0, 139 },
+  { "BlueViolet", 138, 43, 226 },
+  { "brown", 165, 42, 42 },
+  { "brown1", 255, 64, 64 },
+  { "brown2", 238, 59, 59 },
+  { "brown3", 205, 51, 51 },
+  { "brown4", 139, 35, 35 },
+  { "burlywood", 222, 184, 135 },
+  { "burlywood1", 255, 211, 155 },
+  { "burlywood2", 238, 197, 145 },
+  { "burlywood3", 205, 170, 125 },
+  { "burlywood4", 139, 115, 85 },
+  { "cadet blue", 95, 158, 160 },
+  { "CadetBlue", 95, 158, 160 },
+  { "CadetBlue1", 152, 245, 255 },
+  { "CadetBlue2", 142, 229, 238 },
+  { "CadetBlue3", 122, 197, 205 },
+  { "CadetBlue4", 83, 134, 139 },
+  { "chartreuse", 127, 255, 0 },
+  { "chartreuse1", 127, 255, 0 },
+  { "chartreuse2", 118, 238, 0 },
+  { "chartreuse3", 102, 205, 0 },
+  { "chartreuse4", 69, 139, 0 },
+  { "chocolate", 210, 105, 30 },
+  { "chocolate1", 255, 127, 36 },
+  { "chocolate2", 238, 118, 33 },
+  { "chocolate3", 205, 102, 29 },
+  { "chocolate4", 139, 69, 19 },
+  { "coral", 255, 127, 80 },
+  { "coral1", 255, 114, 86 },
+  { "coral2", 238, 106, 80 },
+  { "coral3", 205, 91, 69 },
+  { "coral4", 139, 62, 47 },
+  { "cornflower blue", 100, 149, 237 },
+  { "CornflowerBlue", 100, 149, 237 },
+  { "cornsilk", 255, 248, 220 },
+  { "cornsilk1", 255, 248, 220 },
+  { "cornsilk2", 238, 232, 205 },
+  { "cornsilk3", 205, 200, 177 },
+  { "cornsilk4", 139, 136, 120 },
+  { "cyan", 0, 255, 255 },
+  { "cyan1", 0, 255, 255 },
+  { "cyan2", 0, 238, 238 },
+  { "cyan3", 0, 205, 205 },
+  { "cyan4", 0, 139, 139 },
+  { "dark blue", 0, 0, 139 },
+  { "dark cyan", 0, 139, 139 },
+  { "dark goldenrod", 184, 134, 11 },
+  { "dark gray", 169, 169, 169 },
+  { "dark green", 0, 100, 0 },
+  { "dark grey", 169, 169, 169 },
+  { "dark khaki", 189, 183, 107 },
+  { "dark magenta", 139, 0, 139 },
+  { "dark olive green", 85, 107, 47 },
+  { "dark orange", 255, 140, 0 },
+  { "dark orchid", 153, 50, 204 },
+  { "dark red", 139, 0, 0 },
+  { "dark salmon", 233, 150, 122 },
+  { "dark sea green", 143, 188, 143 },
+  { "dark slate blue", 72, 61, 139 },
+  { "dark slate gray", 47, 79, 79 },
+  { "dark slate grey", 47, 79, 79 },
+  { "dark turquoise", 0, 206, 209 },
+  { "dark violet", 148, 0, 211 },
+  { "DarkBlue", 0, 0, 139 },
+  { "DarkCyan", 0, 139, 139 },
+  { "DarkGoldenrod", 184, 134, 11 },
+  { "DarkGoldenrod1", 255, 185, 15 },
+  { "DarkGoldenrod2", 238, 173, 14 },
+  { "DarkGoldenrod3", 205, 149, 12 },
+  { "DarkGoldenrod4", 139, 101, 8 },
+  { "DarkGray", 169, 169, 169 },
+  { "DarkGreen", 0, 100, 0 },
+  { "DarkGrey", 169, 169, 169 },
+  { "DarkKhaki", 189, 183, 107 },
+  { "DarkMagenta", 139, 0, 139 },
+  { "DarkOliveGreen", 85, 107, 47 },
+  { "DarkOliveGreen1", 202, 255, 112 },
+  { "DarkOliveGreen2", 188, 238, 104 },
+  { "DarkOliveGreen3", 162, 205, 90 },
+  { "DarkOliveGreen4", 110, 139, 61 },
+  { "DarkOrange", 255, 140, 0 },
+  { "DarkOrange1", 255, 127, 0 },
+  { "DarkOrange2", 238, 118, 0 },
+  { "DarkOrange3", 205, 102, 0 },
+  { "DarkOrange4", 139, 69, 0 },
+  { "DarkOrchid", 153, 50, 204 },
+  { "DarkOrchid1", 191, 62, 255 },
+  { "DarkOrchid2", 178, 58, 238 },
+  { "DarkOrchid3", 154, 50, 205 },
+  { "DarkOrchid4", 104, 34, 139 },
+  { "DarkRed", 139, 0, 0 },
+  { "DarkSalmon", 233, 150, 122 },
+  { "DarkSeaGreen", 143, 188, 143 },
+  { "DarkSeaGreen1", 193, 255, 193 },
+  { "DarkSeaGreen2", 180, 238, 180 },
+  { "DarkSeaGreen3", 155, 205, 155 },
+  { "DarkSeaGreen4", 105, 139, 105 },
+  { "DarkSlateBlue", 72, 61, 139 },
+  { "DarkSlateGray", 47, 79, 79 },
+  { "DarkSlateGray1", 151, 255, 255 },
+  { "DarkSlateGray2", 141, 238, 238 },
+  { "DarkSlateGray3", 121, 205, 205 },
+  { "DarkSlateGray4", 82, 139, 139 },
+  { "DarkSlateGrey", 47, 79, 79 },
+  { "DarkTurquoise", 0, 206, 209 },
+  { "DarkViolet", 148, 0, 211 },
+  { "deep pink", 255, 20, 147 },
+  { "deep sky blue", 0, 191, 255 },
+  { "DeepPink", 255, 20, 147 },
+  { "DeepPink1", 255, 20, 147 },
+  { "DeepPink2", 238, 18, 137 },
+  { "DeepPink3", 205, 16, 118 },
+  { "DeepPink4", 139, 10, 80 },
+  { "DeepSkyBlue", 0, 191, 255 },
+  { "DeepSkyBlue1", 0, 191, 255 },
+  { "DeepSkyBlue2", 0, 178, 238 },
+  { "DeepSkyBlue3", 0, 154, 205 },
+  { "DeepSkyBlue4", 0, 104, 139 },
+  { "dim gray", 105, 105, 105 },
+  { "dim grey", 105, 105, 105 },
+  { "DimGray", 105, 105, 105 },
+  { "DimGrey", 105, 105, 105 },
+  { "dodger blue", 30, 144, 255 },
+  { "DodgerBlue", 30, 144, 255 },
+  { "DodgerBlue1", 30, 144, 255 },
+  { "DodgerBlue2", 28, 134, 238 },
+  { "DodgerBlue3", 24, 116, 205 },
+  { "DodgerBlue4", 16, 78, 139 },
+  { "firebrick", 178, 34, 34 },
+  { "firebrick1", 255, 48, 48 },
+  { "firebrick2", 238, 44, 44 },
+  { "firebrick3", 205, 38, 38 },
+  { "firebrick4", 139, 26, 26 },
+  { "floral white", 255, 250, 240 },
+  { "FloralWhite", 255, 250, 240 },
+  { "forest green", 34, 139, 34 },
+  { "ForestGreen", 34, 139, 34 },
+  { "gainsboro", 220, 220, 220 },
+  { "ghost white", 248, 248, 255 },
+  { "GhostWhite", 248, 248, 255 },
+  { "gold", 255, 215, 0 },
+  { "gold1", 255, 215, 0 },
+  { "gold2", 238, 201, 0 },
+  { "gold3", 205, 173, 0 },
+  { "gold4", 139, 117, 0 },
+  { "goldenrod", 218, 165, 32 },
+  { "goldenrod1", 255, 193, 37 },
+  { "goldenrod2", 238, 180, 34 },
+  { "goldenrod3", 205, 155, 29 },
+  { "goldenrod4", 139, 105, 20 },
+  { "gray", 190, 190, 190 },
+  { "gray0", 0, 0, 0 },
+  { "gray1", 3, 3, 3 },
+  { "gray10", 26, 26, 26 },
+  { "gray100", 255, 255, 255 },
+  { "gray11", 28, 28, 28 },
+  { "gray12", 31, 31, 31 },
+  { "gray13", 33, 33, 33 },
+  { "gray14", 36, 36, 36 },
+  { "gray15", 38, 38, 38 },
+  { "gray16", 41, 41, 41 },
+  { "gray17", 43, 43, 43 },
+  { "gray18", 46, 46, 46 },
+  { "gray19", 48, 48, 48 },
+  { "gray2", 5, 5, 5 },
+  { "gray20", 51, 51, 51 },
+  { "gray21", 54, 54, 54 },
+  { "gray22", 56, 56, 56 },
+  { "gray23", 59, 59, 59 },
+  { "gray24", 61, 61, 61 },
+  { "gray25", 64, 64, 64 },
+  { "gray26", 66, 66, 66 },
+  { "gray27", 69, 69, 69 },
+  { "gray28", 71, 71, 71 },
+  { "gray29", 74, 74, 74 },
+  { "gray3", 8, 8, 8 },
+  { "gray30", 77, 77, 77 },
+  { "gray31", 79, 79, 79 },
+  { "gray32", 82, 82, 82 },
+  { "gray33", 84, 84, 84 },
+  { "gray34", 87, 87, 87 },
+  { "gray35", 89, 89, 89 },
+  { "gray36", 92, 92, 92 },
+  { "gray37", 94, 94, 94 },
+  { "gray38", 97, 97, 97 },
+  { "gray39", 99, 99, 99 },
+  { "gray4", 10, 10, 10 },
+  { "gray40", 102, 102, 102 },
+  { "gray41", 105, 105, 105 },
+  { "gray42", 107, 107, 107 },
+  { "gray43", 110, 110, 110 },
+  { "gray44", 112, 112, 112 },
+  { "gray45", 115, 115, 115 },
+  { "gray46", 117, 117, 117 },
+  { "gray47", 120, 120, 120 },
+  { "gray48", 122, 122, 122 },
+  { "gray49", 125, 125, 125 },
+  { "gray5", 13, 13, 13 },
+  { "gray50", 127, 127, 127 },
+  { "gray51", 130, 130, 130 },
+  { "gray52", 133, 133, 133 },
+  { "gray53", 135, 135, 135 },
+  { "gray54", 138, 138, 138 },
+  { "gray55", 140, 140, 140 },
+  { "gray56", 143, 143, 143 },
+  { "gray57", 145, 145, 145 },
+  { "gray58", 148, 148, 148 },
+  { "gray59", 150, 150, 150 },
+  { "gray6", 15, 15, 15 },
+  { "gray60", 153, 153, 153 },
+  { "gray61", 156, 156, 156 },
+  { "gray62", 158, 158, 158 },
+  { "gray63", 161, 161, 161 },
+  { "gray64", 163, 163, 163 },
+  { "gray65", 166, 166, 166 },
+  { "gray66", 168, 168, 168 },
+  { "gray67", 171, 171, 171 },
+  { "gray68", 173, 173, 173 },
+  { "gray69", 176, 176, 176 },
+  { "gray7", 18, 18, 18 },
+  { "gray70", 179, 179, 179 },
+  { "gray71", 181, 181, 181 },
+  { "gray72", 184, 184, 184 },
+  { "gray73", 186, 186, 186 },
+  { "gray74", 189, 189, 189 },
+  { "gray75", 191, 191, 191 },
+  { "gray76", 194, 194, 194 },
+  { "gray77", 196, 196, 196 },
+  { "gray78", 199, 199, 199 },
+  { "gray79", 201, 201, 201 },
+  { "gray8", 20, 20, 20 },
+  { "gray80", 204, 204, 204 },
+  { "gray81", 207, 207, 207 },
+  { "gray82", 209, 209, 209 },
+  { "gray83", 212, 212, 212 },
+  { "gray84", 214, 214, 214 },
+  { "gray85", 217, 217, 217 },
+  { "gray86", 219, 219, 219 },
+  { "gray87", 222, 222, 222 },
+  { "gray88", 224, 224, 224 },
+  { "gray89", 227, 227, 227 },
+  { "gray9", 23, 23, 23 },
+  { "gray90", 229, 229, 229 },
+  { "gray91", 232, 232, 232 },
+  { "gray92", 235, 235, 235 },
+  { "gray93", 237, 237, 237 },
+  { "gray94", 240, 240, 240 },
+  { "gray95", 242, 242, 242 },
+  { "gray96", 245, 245, 245 },
+  { "gray97", 247, 247, 247 },
+  { "gray98", 250, 250, 250 },
+  { "gray99", 252, 252, 252 },
+  { "green", 0, 255, 0 },
+  { "green yellow", 173, 255, 47 },
+  { "green1", 0, 255, 0 },
+  { "green2", 0, 238, 0 },
+  { "green3", 0, 205, 0 },
+  { "green4", 0, 139, 0 },
+  { "GreenYellow", 173, 255, 47 },
+  { "grey", 190, 190, 190 },
+  { "grey0", 0, 0, 0 },
+  { "grey1", 3, 3, 3 },
+  { "grey10", 26, 26, 26 },
+  { "grey100", 255, 255, 255 },
+  { "grey11", 28, 28, 28 },
+  { "grey12", 31, 31, 31 },
+  { "grey13", 33, 33, 33 },
+  { "grey14", 36, 36, 36 },
+  { "grey15", 38, 38, 38 },
+  { "grey16", 41, 41, 41 },
+  { "grey17", 43, 43, 43 },
+  { "grey18", 46, 46, 46 },
+  { "grey19", 48, 48, 48 },
+  { "grey2", 5, 5, 5 },
+  { "grey20", 51, 51, 51 },
+  { "grey21", 54, 54, 54 },
+  { "grey22", 56, 56, 56 },
+  { "grey23", 59, 59, 59 },
+  { "grey24", 61, 61, 61 },
+  { "grey25", 64, 64, 64 },
+  { "grey26", 66, 66, 66 },
+  { "grey27", 69, 69, 69 },
+  { "grey28", 71, 71, 71 },
+  { "grey29", 74, 74, 74 },
+  { "grey3", 8, 8, 8 },
+  { "grey30", 77, 77, 77 },
+  { "grey31", 79, 79, 79 },
+  { "grey32", 82, 82, 82 },
+  { "grey33", 84, 84, 84 },
+  { "grey34", 87, 87, 87 },
+  { "grey35", 89, 89, 89 },
+  { "grey36", 92, 92, 92 },
+  { "grey37", 94, 94, 94 },
+  { "grey38", 97, 97, 97 },
+  { "grey39", 99, 99, 99 },
+  { "grey4", 10, 10, 10 },
+  { "grey40", 102, 102, 102 },
+  { "grey41", 105, 105, 105 },
+  { "grey42", 107, 107, 107 },
+  { "grey43", 110, 110, 110 },
+  { "grey44", 112, 112, 112 },
+  { "grey45", 115, 115, 115 },
+  { "grey46", 117, 117, 117 },
+  { "grey47", 120, 120, 120 },
+  { "grey48", 122, 122, 122 },
+  { "grey49", 125, 125, 125 },
+  { "grey5", 13, 13, 13 },
+  { "grey50", 127, 127, 127 },
+  { "grey51", 130, 130, 130 },
+  { "grey52", 133, 133, 133 },
+  { "grey53", 135, 135, 135 },
+  { "grey54", 138, 138, 138 },
+  { "grey55", 140, 140, 140 },
+  { "grey56", 143, 143, 143 },
+  { "grey57", 145, 145, 145 },
+  { "grey58", 148, 148, 148 },
+  { "grey59", 150, 150, 150 },
+  { "grey6", 15, 15, 15 },
+  { "grey60", 153, 153, 153 },
+  { "grey61", 156, 156, 156 },
+  { "grey62", 158, 158, 158 },
+  { "grey63", 161, 161, 161 },
+  { "grey64", 163, 163, 163 },
+  { "grey65", 166, 166, 166 },
+  { "grey66", 168, 168, 168 },
+  { "grey67", 171, 171, 171 },
+  { "grey68", 173, 173, 173 },
+  { "grey69", 176, 176, 176 },
+  { "grey7", 18, 18, 18 },
+  { "grey70", 179, 179, 179 },
+  { "grey71", 181, 181, 181 },
+  { "grey72", 184, 184, 184 },
+  { "grey73", 186, 186, 186 },
+  { "grey74", 189, 189, 189 },
+  { "grey75", 191, 191, 191 },
+  { "grey76", 194, 194, 194 },
+  { "grey77", 196, 196, 196 },
+  { "grey78", 199, 199, 199 },
+  { "grey79", 201, 201, 201 },
+  { "grey8", 20, 20, 20 },
+  { "grey80", 204, 204, 204 },
+  { "grey81", 207, 207, 207 },
+  { "grey82", 209, 209, 209 },
+  { "grey83", 212, 212, 212 },
+  { "grey84", 214, 214, 214 },
+  { "grey85", 217, 217, 217 },
+  { "grey86", 219, 219, 219 },
+  { "grey87", 222, 222, 222 },
+  { "grey88", 224, 224, 224 },
+  { "grey89", 227, 227, 227 },
+  { "grey9", 23, 23, 23 },
+  { "grey90", 229, 229, 229 },
+  { "grey91", 232, 232, 232 },
+  { "grey92", 235, 235, 235 },
+  { "grey93", 237, 237, 237 },
+  { "grey94", 240, 240, 240 },
+  { "grey95", 242, 242, 242 },
+  { "grey96", 245, 245, 245 },
+  { "grey97", 247, 247, 247 },
+  { "grey98", 250, 250, 250 },
+  { "grey99", 252, 252, 252 },
+  { "honeydew", 240, 255, 240 },
+  { "honeydew1", 240, 255, 240 },
+  { "honeydew2", 224, 238, 224 },
+  { "honeydew3", 193, 205, 193 },
+  { "honeydew4", 131, 139, 131 },
+  { "hot pink", 255, 105, 180 },
+  { "HotPink", 255, 105, 180 },
+  { "HotPink1", 255, 110, 180 },
+  { "HotPink2", 238, 106, 167 },
+  { "HotPink3", 205, 96, 144 },
+  { "HotPink4", 139, 58, 98 },
+  { "indian red", 205, 92, 92 },
+  { "IndianRed", 205, 92, 92 },
+  { "IndianRed1", 255, 106, 106 },
+  { "IndianRed2", 238, 99, 99 },
+  { "IndianRed3", 205, 85, 85 },
+  { "IndianRed4", 139, 58, 58 },
+  { "ivory", 255, 255, 240 },
+  { "ivory1", 255, 255, 240 },
+  { "ivory2", 238, 238, 224 },
+  { "ivory3", 205, 205, 193 },
+  { "ivory4", 139, 139, 131 },
+  { "khaki", 240, 230, 140 },
+  { "khaki1", 255, 246, 143 },
+  { "khaki2", 238, 230, 133 },
+  { "khaki3", 205, 198, 115 },
+  { "khaki4", 139, 134, 78 },
+  { "lavender", 230, 230, 250 },
+  { "lavender blush", 255, 240, 245 },
+  { "LavenderBlush", 255, 240, 245 },
+  { "LavenderBlush1", 255, 240, 245 },
+  { "LavenderBlush2", 238, 224, 229 },
+  { "LavenderBlush3", 205, 193, 197 },
+  { "LavenderBlush4", 139, 131, 134 },
+  { "lawn green", 124, 252, 0 },
+  { "LawnGreen", 124, 252, 0 },
+  { "lemon chiffon", 255, 250, 205 },
+  { "LemonChiffon", 255, 250, 205 },
+  { "LemonChiffon1", 255, 250, 205 },
+  { "LemonChiffon2", 238, 233, 191 },
+  { "LemonChiffon3", 205, 201, 165 },
+  { "LemonChiffon4", 139, 137, 112 },
+  { "light blue", 173, 216, 230 },
+  { "light coral", 240, 128, 128 },
+  { "light cyan", 224, 255, 255 },
+  { "light goldenrod", 238, 221, 130 },
+  { "light goldenrod yellow", 250, 250, 210 },
+  { "light gray", 211, 211, 211 },
+  { "light green", 144, 238, 144 },
+  { "light grey", 211, 211, 211 },
+  { "light pink", 255, 182, 193 },
+  { "light salmon", 255, 160, 122 },
+  { "light sea green", 32, 178, 170 },
+  { "light sky blue", 135, 206, 250 },
+  { "light slate blue", 132, 112, 255 },
+  { "light slate gray", 119, 136, 153 },
+  { "light slate grey", 119, 136, 153 },
+  { "light steel blue", 176, 196, 222 },
+  { "light yellow", 255, 255, 224 },
+  { "LightBlue", 173, 216, 230 },
+  { "LightBlue1", 191, 239, 255 },
+  { "LightBlue2", 178, 223, 238 },
+  { "LightBlue3", 154, 192, 205 },
+  { "LightBlue4", 104, 131, 139 },
+  { "LightCoral", 240, 128, 128 },
+  { "LightCyan", 224, 255, 255 },
+  { "LightCyan1", 224, 255, 255 },
+  { "LightCyan2", 209, 238, 238 },
+  { "LightCyan3", 180, 205, 205 },
+  { "LightCyan4", 122, 139, 139 },
+  { "LightGoldenrod", 238, 221, 130 },
+  { "LightGoldenrod1", 255, 236, 139 },
+  { "LightGoldenrod2", 238, 220, 130 },
+  { "LightGoldenrod3", 205, 190, 112 },
+  { "LightGoldenrod4", 139, 129, 76 },
+  { "LightGoldenrodYellow", 250, 250, 210 },
+  { "LightGray", 211, 211, 211 },
+  { "LightGreen", 144, 238, 144 },
+  { "LightGrey", 211, 211, 211 },
+  { "LightPink", 255, 182, 193 },
+  { "LightPink1", 255, 174, 185 },
+  { "LightPink2", 238, 162, 173 },
+  { "LightPink3", 205, 140, 149 },
+  { "LightPink4", 139, 95, 101 },
+  { "LightSalmon", 255, 160, 122 },
+  { "LightSalmon1", 255, 160, 122 },
+  { "LightSalmon2", 238, 149, 114 },
+  { "LightSalmon3", 205, 129, 98 },
+  { "LightSalmon4", 139, 87, 66 },
+  { "LightSeaGreen", 32, 178, 170 },
+  { "LightSkyBlue", 135, 206, 250 },
+  { "LightSkyBlue1", 176, 226, 255 },
+  { "LightSkyBlue2", 164, 211, 238 },
+  { "LightSkyBlue3", 141, 182, 205 },
+  { "LightSkyBlue4", 96, 123, 139 },
+  { "LightSlateBlue", 132, 112, 255 },
+  { "LightSlateGray", 119, 136, 153 },
+  { "LightSlateGrey", 119, 136, 153 },
+  { "LightSteelBlue", 176, 196, 222 },
+  { "LightSteelBlue1", 202, 225, 255 },
+  { "LightSteelBlue2", 188, 210, 238 },
+  { "LightSteelBlue3", 162, 181, 205 },
+  { "LightSteelBlue4", 110, 123, 139 },
+  { "LightYellow", 255, 255, 224 },
+  { "LightYellow1", 255, 255, 224 },
+  { "LightYellow2", 238, 238, 209 },
+  { "LightYellow3", 205, 205, 180 },
+  { "LightYellow4", 139, 139, 122 },
+  { "lime green", 50, 205, 50 },
+  { "LimeGreen", 50, 205, 50 },
+  { "linen", 250, 240, 230 },
+  { "magenta", 255, 0, 255 },
+  { "magenta1", 255, 0, 255 },
+  { "magenta2", 238, 0, 238 },
+  { "magenta3", 205, 0, 205 },
+  { "magenta4", 139, 0, 139 },
+  { "maroon", 176, 48, 96 },
+  { "maroon1", 255, 52, 179 },
+  { "maroon2", 238, 48, 167 },
+  { "maroon3", 205, 41, 144 },
+  { "maroon4", 139, 28, 98 },
+  { "medium aquamarine", 102, 205, 170 },
+  { "medium blue", 0, 0, 205 },
+  { "medium orchid", 186, 85, 211 },
+  { "medium purple", 147, 112, 219 },
+  { "medium sea green", 60, 179, 113 },
+  { "medium slate blue", 123, 104, 238 },
+  { "medium spring green", 0, 250, 154 },
+  { "medium turquoise", 72, 209, 204 },
+  { "medium violet red", 199, 21, 133 },
+  { "MediumAquamarine", 102, 205, 170 },
+  { "MediumBlue", 0, 0, 205 },
+  { "MediumOrchid", 186, 85, 211 },
+  { "MediumOrchid1", 224, 102, 255 },
+  { "MediumOrchid2", 209, 95, 238 },
+  { "MediumOrchid3", 180, 82, 205 },
+  { "MediumOrchid4", 122, 55, 139 },
+  { "MediumPurple", 147, 112, 219 },
+  { "MediumPurple1", 171, 130, 255 },
+  { "MediumPurple2", 159, 121, 238 },
+  { "MediumPurple3", 137, 104, 205 },
+  { "MediumPurple4", 93, 71, 139 },
+  { "MediumSeaGreen", 60, 179, 113 },
+  { "MediumSlateBlue", 123, 104, 238 },
+  { "MediumSpringGreen", 0, 250, 154 },
+  { "MediumTurquoise", 72, 209, 204 },
+  { "MediumVioletRed", 199, 21, 133 },
+  { "midnight blue", 25, 25, 112 },
+  { "MidnightBlue", 25, 25, 112 },
+  { "mint cream", 245, 255, 250 },
+  { "MintCream", 245, 255, 250 },
+  { "misty rose", 255, 228, 225 },
+  { "MistyRose", 255, 228, 225 },
+  { "MistyRose1", 255, 228, 225 },
+  { "MistyRose2", 238, 213, 210 },
+  { "MistyRose3", 205, 183, 181 },
+  { "MistyRose4", 139, 125, 123 },
+  { "moccasin", 255, 228, 181 },
+  { "navajo white", 255, 222, 173 },
+  { "NavajoWhite", 255, 222, 173 },
+  { "NavajoWhite1", 255, 222, 173 },
+  { "NavajoWhite2", 238, 207, 161 },
+  { "NavajoWhite3", 205, 179, 139 },
+  { "NavajoWhite4", 139, 121, 94 },
+  { "navy", 0, 0, 128 },
+  { "navy blue", 0, 0, 128 },
+  { "NavyBlue", 0, 0, 128 },
+  { "old lace", 253, 245, 230 },
+  { "OldLace", 253, 245, 230 },
+  { "olive drab", 107, 142, 35 },
+  { "OliveDrab", 107, 142, 35 },
+  { "OliveDrab1", 192, 255, 62 },
+  { "OliveDrab2", 179, 238, 58 },
+  { "OliveDrab3", 154, 205, 50 },
+  { "OliveDrab4", 105, 139, 34 },
+  { "orange", 255, 165, 0 },
+  { "orange red", 255, 69, 0 },
+  { "orange1", 255, 165, 0 },
+  { "orange2", 238, 154, 0 },
+  { "orange3", 205, 133, 0 },
+  { "orange4", 139, 90, 0 },
+  { "OrangeRed", 255, 69, 0 },
+  { "OrangeRed1", 255, 69, 0 },
+  { "OrangeRed2", 238, 64, 0 },
+  { "OrangeRed3", 205, 55, 0 },
+  { "OrangeRed4", 139, 37, 0 },
+  { "orchid", 218, 112, 214 },
+  { "orchid1", 255, 131, 250 },
+  { "orchid2", 238, 122, 233 },
+  { "orchid3", 205, 105, 201 },
+  { "orchid4", 139, 71, 137 },
+  { "pale goldenrod", 238, 232, 170 },
+  { "pale green", 152, 251, 152 },
+  { "pale turquoise", 175, 238, 238 },
+  { "pale violet red", 219, 112, 147 },
+  { "PaleGoldenrod", 238, 232, 170 },
+  { "PaleGreen", 152, 251, 152 },
+  { "PaleGreen1", 154, 255, 154 },
+  { "PaleGreen2", 144, 238, 144 },
+  { "PaleGreen3", 124, 205, 124 },
+  { "PaleGreen4", 84, 139, 84 },
+  { "PaleTurquoise", 175, 238, 238 },
+  { "PaleTurquoise1", 187, 255, 255 },
+  { "PaleTurquoise2", 174, 238, 238 },
+  { "PaleTurquoise3", 150, 205, 205 },
+  { "PaleTurquoise4", 102, 139, 139 },
+  { "PaleVioletRed", 219, 112, 147 },
+  { "PaleVioletRed1", 255, 130, 171 },
+  { "PaleVioletRed2", 238, 121, 159 },
+  { "PaleVioletRed3", 205, 104, 137 },
+  { "PaleVioletRed4", 139, 71, 93 },
+  { "papaya whip", 255, 239, 213 },
+  { "PapayaWhip", 255, 239, 213 },
+  { "peach puff", 255, 218, 185 },
+  { "PeachPuff", 255, 218, 185 },
+  { "PeachPuff1", 255, 218, 185 },
+  { "PeachPuff2", 238, 203, 173 },
+  { "PeachPuff3", 205, 175, 149 },
+  { "PeachPuff4", 139, 119, 101 },
+  { "peru", 205, 133, 63 },
+  { "pink", 255, 192, 203 },
+  { "pink1", 255, 181, 197 },
+  { "pink2", 238, 169, 184 },
+  { "pink3", 205, 145, 158 },
+  { "pink4", 139, 99, 108 },
+  { "plum", 221, 160, 221 },
+  { "plum1", 255, 187, 255 },
+  { "plum2", 238, 174, 238 },
+  { "plum3", 205, 150, 205 },
+  { "plum4", 139, 102, 139 },
+  { "powder blue", 176, 224, 230 },
+  { "PowderBlue", 176, 224, 230 },
+  { "purple", 160, 32, 240 },
+  { "purple1", 155, 48, 255 },
+  { "purple2", 145, 44, 238 },
+  { "purple3", 125, 38, 205 },
+  { "purple4", 85, 26, 139 },
+  { "red", 255, 0, 0 },
+  { "red1", 255, 0, 0 },
+  { "red2", 238, 0, 0 },
+  { "red3", 205, 0, 0 },
+  { "red4", 139, 0, 0 },
+  { "rosy brown", 188, 143, 143 },
+  { "RosyBrown", 188, 143, 143 },
+  { "RosyBrown1", 255, 193, 193 },
+  { "RosyBrown2", 238, 180, 180 },
+  { "RosyBrown3", 205, 155, 155 },
+  { "RosyBrown4", 139, 105, 105 },
+  { "royal blue", 65, 105, 225 },
+  { "RoyalBlue", 65, 105, 225 },
+  { "RoyalBlue1", 72, 118, 255 },
+  { "RoyalBlue2", 67, 110, 238 },
+  { "RoyalBlue3", 58, 95, 205 },
+  { "RoyalBlue4", 39, 64, 139 },
+  { "saddle brown", 139, 69, 19 },
+  { "SaddleBrown", 139, 69, 19 },
+  { "salmon", 250, 128, 114 },
+  { "salmon1", 255, 140, 105 },
+  { "salmon2", 238, 130, 98 },
+  { "salmon3", 205, 112, 84 },
+  { "salmon4", 139, 76, 57 },
+  { "sandy brown", 244, 164, 96 },
+  { "SandyBrown", 244, 164, 96 },
+  { "sea green", 46, 139, 87 },
+  { "SeaGreen", 46, 139, 87 },
+  { "SeaGreen1", 84, 255, 159 },
+  { "SeaGreen2", 78, 238, 148 },
+  { "SeaGreen3", 67, 205, 128 },
+  { "SeaGreen4", 46, 139, 87 },
+  { "seashell", 255, 245, 238 },
+  { "seashell1", 255, 245, 238 },
+  { "seashell2", 238, 229, 222 },
+  { "seashell3", 205, 197, 191 },
+  { "seashell4", 139, 134, 130 },
+  { "sienna", 160, 82, 45 },
+  { "sienna1", 255, 130, 71 },
+  { "sienna2", 238, 121, 66 },
+  { "sienna3", 205, 104, 57 },
+  { "sienna4", 139, 71, 38 },
+  { "sky blue", 135, 206, 235 },
+  { "SkyBlue", 135, 206, 235 },
+  { "SkyBlue1", 135, 206, 255 },
+  { "SkyBlue2", 126, 192, 238 },
+  { "SkyBlue3", 108, 166, 205 },
+  { "SkyBlue4", 74, 112, 139 },
+  { "slate blue", 106, 90, 205 },
+  { "slate gray", 112, 128, 144 },
+  { "slate grey", 112, 128, 144 },
+  { "SlateBlue", 106, 90, 205 },
+  { "SlateBlue1", 131, 111, 255 },
+  { "SlateBlue2", 122, 103, 238 },
+  { "SlateBlue3", 105, 89, 205 },
+  { "SlateBlue4", 71, 60, 139 },
+  { "SlateGray", 112, 128, 144 },
+  { "SlateGray1", 198, 226, 255 },
+  { "SlateGray2", 185, 211, 238 },
+  { "SlateGray3", 159, 182, 205 },
+  { "SlateGray4", 108, 123, 139 },
+  { "SlateGrey", 112, 128, 144 },
+  { "snow", 255, 250, 250 },
+  { "snow1", 255, 250, 250 },
+  { "snow2", 238, 233, 233 },
+  { "snow3", 205, 201, 201 },
+  { "snow4", 139, 137, 137 },
+  { "spring green", 0, 255, 127 },
+  { "SpringGreen", 0, 255, 127 },
+  { "SpringGreen1", 0, 255, 127 },
+  { "SpringGreen2", 0, 238, 118 },
+  { "SpringGreen3", 0, 205, 102 },
+  { "SpringGreen4", 0, 139, 69 },
+  { "steel blue", 70, 130, 180 },
+  { "SteelBlue", 70, 130, 180 },
+  { "SteelBlue1", 99, 184, 255 },
+  { "SteelBlue2", 92, 172, 238 },
+  { "SteelBlue3", 79, 148, 205 },
+  { "SteelBlue4", 54, 100, 139 },
+  { "tan", 210, 180, 140 },
+  { "tan1", 255, 165, 79 },
+  { "tan2", 238, 154, 73 },
+  { "tan3", 205, 133, 63 },
+  { "tan4", 139, 90, 43 },
+  { "thistle", 216, 191, 216 },
+  { "thistle1", 255, 225, 255 },
+  { "thistle2", 238, 210, 238 },
+  { "thistle3", 205, 181, 205 },
+  { "thistle4", 139, 123, 139 },
+  { "tomato", 255, 99, 71 },
+  { "tomato1", 255, 99, 71 },
+  { "tomato2", 238, 92, 66 },
+  { "tomato3", 205, 79, 57 },
+  { "tomato4", 139, 54, 38 },
+  { "turquoise", 64, 224, 208 },
+  { "turquoise1", 0, 245, 255 },
+  { "turquoise2", 0, 229, 238 },
+  { "turquoise3", 0, 197, 205 },
+  { "turquoise4", 0, 134, 139 },
+  { "violet", 238, 130, 238 },
+  { "violet red", 208, 32, 144 },
+  { "VioletRed", 208, 32, 144 },
+  { "VioletRed1", 255, 62, 150 },
+  { "VioletRed2", 238, 58, 140 },
+  { "VioletRed3", 205, 50, 120 },
+  { "VioletRed4", 139, 34, 82 },
+  { "wheat", 245, 222, 179 },
+  { "wheat1", 255, 231, 186 },
+  { "wheat2", 238, 216, 174 },
+  { "wheat3", 205, 186, 150 },
+  { "wheat4", 139, 126, 102 },
+  { "white", 255, 255, 255 },
+  { "white smoke", 245, 245, 245 },
+  { "WhiteSmoke", 245, 245, 245 },
+  { "yellow", 255, 255, 0 },
+  { "yellow green", 154, 205, 50 },
+  { "yellow1", 255, 255, 0 },
+  { "yellow2", 238, 238, 0 },
+  { "yellow3", 205, 205, 0 },
+  { "yellow4", 139, 139, 0 },
+  { "YellowGreen", 154, 205, 50 }
+};
+
+static int
+compare_xcolor_entries (const void *a, const void *b)
+{
+  return g_strcasecmp ((const char *) a, ((const ColorEntry *) b)->name);
+}
+
+static gboolean
+find_color(const char *name,
+           guint16    *red,
+           guint16    *green,
+           guint16    *blue)
+{
+  ColorEntry *found;
+
+  found = bsearch (name, xColors, G_N_ELEMENTS (xColors),
+                   sizeof (ColorEntry),
+                   compare_xcolor_entries);
+  if (found == NULL)
+    return FALSE;
+
+  *red = (found->red * 65535) / 255;
+  *green = (found->green * 65535) / 255;
+  *blue = (found->blue * 65535) / 255;
+
+  return TRUE;
+}
+
+static gboolean
+color_parse (const char *spec,
+             guint16    *red,
+             guint16    *green,
+             guint16    *blue)
+{
+  if (spec[0] == '#')
+    {
+      char fmt[16];
+      int i, r, g, b;
+
+      if ((i = strlen (spec+1)) % 3)
+        return FALSE;
+
+      i /= 3;
+
+      sprintf (fmt, "%%%dx%%%dx%%%dx", i, i, i);
+      if (sscanf (spec+1, fmt, &r, &g, &b) != 3)
+        return FALSE;
+
+      if (i == 4)
+        {
+          if (red)
+            *red = r;
+          if (green)
+            *green = g;
+          if (blue)
+            *blue = b;
+        }
+      else if (i == 1)
+        {
+          if (red)
+            *red = (r * 65535) / 15;
+          if (green)
+            *green = (g * 65535) / 15;
+          if (blue)
+            *blue = (b * 65535) / 15;
+        }
+      else if (i == 2)
+        {
+          if (red)
+            *red = (r * 65535) / 255;
+          if (green)
+            *green = (g * 65535) / 255;
+          if (blue)
+            *blue = (b * 65535) / 255;
+        }
+      else /* if (i == 3) */
+        {
+          if (red)
+            *red = (r * 65535) / 4095;
+          if (green)
+            *green = (g * 65535) / 4095;
+          if (blue)
+            *blue = (b * 65535) / 4095;
+        }
+    }
+  else
+    {
+      if (!find_color(spec, red, green, blue))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+gdk_color_parse (const gchar *spec,
+		 GdkColor *color)
+{
+  return color_parse(spec, &color->red, &color->green, &color->blue);
+}
+
diff --git a/gdk/gdkcolor.h b/gdk/gdkcolor.h
index 8848d6858..e0856e6a6 100644
--- a/gdk/gdkcolor.h
+++ b/gdk/gdkcolor.h
@@ -93,9 +93,6 @@ GdkVisual *gdk_colormap_get_visual (GdkColormap *colormap);
      
 GdkColor *gdk_color_copy  (const GdkColor *color);
 void      gdk_color_free  (GdkColor       *color);
-gboolean  gdk_color_parse_for_screen (const gchar * spec, 
-				      GdkColor * color,
-				      GdkScreen * screen);
 gint      gdk_color_parse (const gchar    *spec,
 			   GdkColor       *color);
 guint     gdk_color_hash  (const GdkColor *colora);
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index a84824b26..7ce78c4da 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -41,7 +41,7 @@ gdk_display_class_init (GdkDisplayClass *class)
 GdkDisplay*
 gdk_display_new (gchar * display_name)
 {
-  return GDK_DISPLAY_MGR_GET_CLASS(dpy_mgr)->open_display(dpy_mgr, display_name);
+  return GDK_DISPLAY_MGR_GET_CLASS(gdk_display_manager)->open_display(gdk_display_manager, display_name);
 }
 gchar*		
 gdk_display_get_name (GdkDisplay *dpy)
diff --git a/gdk/gdkdisplaymgr.c b/gdk/gdkdisplaymgr.c
index d9738435d..d7a51dd1e 100644
--- a/gdk/gdkdisplaymgr.c
+++ b/gdk/gdkdisplaymgr.c
@@ -1,3 +1,4 @@
+#include "gdkprivate.h"
 #include "gdkdisplaymgr.h"
 
 static void	    gdk_display_manager_class_init (GObjectClass *class);
@@ -52,3 +53,27 @@ gdk_display_num_display (GdkDisplayManager * dpy_mgr)
 {
   return GDK_DISPLAY_MGR_GET_CLASS(dpy_mgr)->get_num_display(dpy_mgr);
 }
+
+
+GdkDisplay*
+gdk_get_default_display	(void)
+{
+  return GDK_DISPLAY_MGR_GET_CLASS(gdk_display_manager)->get_default(gdk_display_manager);
+}
+GdkScreen*
+gdk_get_default_screen (void)
+{
+  GdkDisplay* dpy = gdk_get_default_display();
+  return GDK_DISPLAY_GET_CLASS(dpy)->get_default_screen(dpy);
+}
+
+
+
+GdkDisplayManager*
+gdk_get_display_manager	(void)
+{
+  return gdk_display_manager;
+}
+
+
+
diff --git a/gdk/gdkdisplaymgr.h b/gdk/gdkdisplaymgr.h
index 28313b36c..534ad4457 100644
--- a/gdk/gdkdisplaymgr.h
+++ b/gdk/gdkdisplaymgr.h
@@ -41,7 +41,13 @@ GdkDisplay *	gdk_display_manager_get_default	    (GdkDisplayManager * dpy_mgr);
 GdkDisplay *	gdk_display_manager_open_display    (GdkDisplayManager * dpy_mgr,
 						     gchar *display_name);
 gint		gdk_display_num_display		    (GdkDisplayManager * dpy_mgr);
-#define DEFAULT_GDK_DISPLAY GDK_DISPLAY_MGR_GET_CLASS(dpy_mgr)->get_default(dpy_mgr)
+
+GdkDisplay *	gdk_get_default_display		    (void);
+GdkScreen  *	gdk_get_default_screen		    (void);
+GdkDisplayManager * gdk_get_display_manager	    (void);
+
+
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index dc6fedb14..a8e342a0b 100644
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -36,6 +36,6 @@ GList            *gdk_default_filters = NULL;
 GMutex           *gdk_threads_mutex = NULL;          /* Global GDK lock */
 GList            *gdk_queued_events = NULL;
 GList            *gdk_queued_tail = NULL;
-GdkDisplayManager *dpy_mgr = NULL;
+GdkDisplayManager *gdk_display_manager = NULL;
 
 
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index ad2b3f77b..e4f253f59 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -102,7 +102,7 @@ gdk_keymap_get_default (void)
   static GdkKeymap *keymap = NULL;
 
   if (keymap == NULL)
-    keymap = gdk_keymap_new(DEFAULT_GDK_DISPLAY);
+    keymap = gdk_keymap_new(gdk_get_default_display());
 
   return keymap;
 }
diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index 0a6e2bbb6..72415246d 100644
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -453,7 +453,7 @@ gdk_pixbuf_render_pixmap_and_mask (GdkPixbuf  *pixbuf,
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_pixbuf_render_pixmap_and_mask_for_screen instead\n"));
   gdk_pixbuf_render_pixmap_and_mask_for_screen(pixbuf,
-					       DEFAULT_GDK_SCREEN,
+					       gdk_get_default_screen(),
 					       pixmap_return,
 					       mask_return,
 					       alpha_threshold);
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index ba80545b7..1f554e19b 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -83,7 +83,7 @@ void gdk_window_destroy_notify	     (GdkWindow *window);
 
 GDKVAR gint		 gdk_error_code;
 GDKVAR gint		 gdk_error_warnings;
-GDKVAR GdkDisplayManager *dpy_mgr;
+GDKVAR GdkDisplayManager *gdk_display_manager;
 
 #ifdef __cplusplus
 }
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index 96dac6a03..49d7fc4b6 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -903,7 +903,7 @@ gulong
 gdk_rgb_xpixel_from_rgb (guint32 rgb)
 {
   GDK_NOTE(MULTIHEAD,g_message(" Use gdk_rgb_xpixel_from_rgb_for_screen instead\n"));
-  return gdk_rgb_xpixel_from_rgb_for_screen(DEFAULT_GDK_SCREEN,rgb);
+  return gdk_rgb_xpixel_from_rgb_for_screen(gdk_get_default_screen(),rgb);
 }
 
 void
@@ -3576,7 +3576,7 @@ gdk_rgb_get_colormap (void)
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_rgb_get_colormap_for_screen instead\n"));
   if (!cmap)
     {
-      GdkRgbInfo *image_info = gdk_rgb_create_info (gdk_rgb_choose_visual (DEFAULT_GDK_SCREEN), NULL);
+      GdkRgbInfo *image_info = gdk_rgb_create_info (gdk_rgb_choose_visual (gdk_get_default_screen()), NULL);
       cmap = image_info->cmap;
     }
 
@@ -3605,5 +3605,5 @@ GdkVisual *
 gdk_rgb_get_visual (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_rgb_get_colormap_for_screen instead\n"));
-  return gdk_rgb_get_visual_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_rgb_get_visual_for_screen(gdk_get_default_screen());
 }
diff --git a/gdk/gdkscreen.h b/gdk/gdkscreen.h
index 72dbcc35c..1b851e12e 100644
--- a/gdk/gdkscreen.h
+++ b/gdk/gdkscreen.h
@@ -44,7 +44,6 @@ struct _GdkScreenClass
 						 gint * win_x,
 						 gint * win_y);
 };
-#define DEFAULT_GDK_SCREEN  (GDK_DISPLAY_GET_CLASS(DEFAULT_GDK_DISPLAY)->get_default_screen(DEFAULT_GDK_DISPLAY))
 GType 		    gdk_screen_get_type	(void);
 GdkScreen *	    gdk_screen_ref	(GdkScreen * screen);
 void		    gdk_screen_unref	(GdkScreen * screen);
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0b968c78f..a070bda2a 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -570,7 +570,7 @@ GList *
 gdk_window_get_toplevels (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_window_get_toplevels_for_screen instead\n"));
-  return gdk_window_get_toplevels_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_window_get_toplevels_for_screen(gdk_get_default_screen());
 }
 
 /*************************************************************
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index dbf91b4e8..c82ba5fc9 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -346,15 +346,15 @@ GdkColormap*
 gdk_colormap_get_system (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_colormap_get_system_for_screen instead\n"));
-  return gdk_colormap_get_system_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_colormap_get_system_for_screen(gdk_get_default_screen());
 }
 
 gint
 gdk_colormap_get_system_size (void)
 {
   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);
+  return DisplayCells (GDK_SCREEN_XDISPLAY (gdk_get_default_screen()),
+		       GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->scr_num);
 }
 
 void
@@ -475,38 +475,7 @@ gdk_colors_alloc (GdkColormap   *colormap,
   return return_val != 0;
 }
 
-gboolean
-gdk_color_parse_for_screen (const gchar * spec, GdkColor * color,
-			    GdkScreen * screen)
-{
-  Colormap xcolormap;
-  XColor xcolor;
-  gboolean return_val;
-
-  g_return_val_if_fail (spec != NULL, FALSE);
-  g_return_val_if_fail (color != NULL, FALSE);
-
-  xcolormap = DefaultColormap (GDK_SCREEN_XDISPLAY (screen),
-			       GDK_SCREEN_IMPL_X11 (screen)->scr_num);
-
-  if (XParseColor (GDK_SCREEN_XDISPLAY (screen), xcolormap, spec, &xcolor)) {
-    return_val = TRUE;
-    color->red = xcolor.red;
-    color->green = xcolor.green;
-    color->blue = xcolor.blue;
-  }
-  else
-    return_val = FALSE;
-
-  return return_val;
-}
 
-gboolean
-gdk_color_parse (const gchar *spec,
-		 GdkColor *color)
-{
-  return gdk_color_parse_for_screen(spec,color,DEFAULT_GDK_SCREEN);
-}
 
 /* This is almost identical to gdk_colormap_free_colors.
  * Keep them in sync!
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index c9747f7de..5c7a69a45 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -58,7 +58,7 @@ GdkCursor*
 gdk_cursor_new (GdkCursorType cursor_type)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_cursor_new_for_screen instead\n"));
-  return gdk_cursor_new_for_screen (DEFAULT_GDK_SCREEN, cursor_type);
+  return gdk_cursor_new_for_screen (gdk_get_default_screen(), cursor_type);
 
 }
 
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 6d0ea2386..e43fc0796 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -148,7 +148,7 @@ GType		gdk_x11_display_impl_get_type();
 gboolean	gdk_x11_display_impl_is_root_window(GdkDisplay *dpy, Window xroot_window);
 
 
-#define DEFAULT_X_DISPLAY   GDK_DISPLAY_IMPL_X11(DEFAULT_GDK_DISPLAY)->xdisplay
+#define DEFAULT_X_DISPLAY   GDK_DISPLAY_IMPL_X11(gdk_get_default_display())->xdisplay
 #define GDK_DISPLAY_XDISPLAY(dpy)  (GDK_DISPLAY_IMPL_X11(dpy)->xdisplay)
 
 #ifdef __cplusplus
diff --git a/gdk/x11/gdkdisplaymgr-x11.c b/gdk/x11/gdkdisplaymgr-x11.c
index 4f06e88b7..d90b49e7a 100644
--- a/gdk/x11/gdkdisplaymgr-x11.c
+++ b/gdk/x11/gdkdisplaymgr-x11.c
@@ -114,7 +114,7 @@ GdkDisplay * gdk_x11_display_manager_get_display (GdkDisplayManager * dpy_mgr,Di
 
 GdkDisplayImplX11 * gdk_lookup_xdisplay(Display *dpy)
 {
-    return GDK_DISPLAY_IMPL_X11(gdk_x11_display_manager_get_display(dpy_mgr,dpy));
+    return GDK_DISPLAY_IMPL_X11(gdk_x11_display_manager_get_display(gdk_display_manager, dpy));
 }
 
 
diff --git a/gdk/x11/gdkdisplaymgr-x11.h b/gdk/x11/gdkdisplaymgr-x11.h
index 4cd830ecd..5c78030dc 100644
--- a/gdk/x11/gdkdisplaymgr-x11.h
+++ b/gdk/x11/gdkdisplaymgr-x11.h
@@ -21,7 +21,7 @@ GdkDisplayImplX11 * gdk_lookup_xdisplay(Display *dpy);
 
 
 
-/*#define DEFAULT_GDK_DISPLAY gdk_x11_display_manager_get_default(dpy_mgr)*/
+/*#define gdk_get_default_display gdk_x11_display_manager_get_default(dpy_mgr)*/
 
 #ifdef __cplusplus
 }
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 0714e03d5..73c11da7e 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1719,7 +1719,7 @@ gdk_event_send_client_message_to_all_recurse (XEvent  *xev,
   gboolean send = FALSE;
   gboolean found = FALSE;
   int i;
-  GdkDisplay *dpy = gdk_x11_display_manager_get_display(dpy_mgr,xev->xany.display);
+  GdkDisplay *dpy = gdk_x11_display_manager_get_display(gdk_display_manager,xev->xany.display);
 
   gdk_error_warnings = FALSE;
   gdk_error_code = 0;
@@ -1815,7 +1815,7 @@ gdk_event_send_clientmessage_toall (GdkEvent *event)
 void
 gdk_flush (void)
 {
-  GSList *tmp_dpy_list = dpy_mgr->open_displays;
+  GSList *tmp_dpy_list = gdk_display_manager->open_displays;
   while(tmp_dpy_list != NULL){
     XSync (GDK_DISPLAY_IMPL_X11(tmp_dpy_list->data)->xdisplay, False);
     tmp_dpy_list = g_slist_next(tmp_dpy_list);
@@ -1829,7 +1829,7 @@ timestamp_predicate (Display *display,
 		     XPointer arg)
 {
   Window xwindow = GPOINTER_TO_UINT (arg);
-  GdkDisplayImplX11 * dpy_impl = GDK_DISPLAY_IMPL_X11(gdk_x11_display_manager_get_display(dpy_mgr,display));
+  GdkDisplayImplX11 * dpy_impl = GDK_DISPLAY_IMPL_X11(gdk_x11_display_manager_get_display(gdk_display_manager,display));
 
   if (xevent->type == PropertyNotify &&
       xevent->xproperty.window == xwindow &&
@@ -1962,7 +1962,7 @@ gdk_net_wm_supports_for_screen (GdkScreen * screen, GdkAtom property)
 gboolean
 gdk_net_wm_supports (GdkAtom property)
 {
-  return gdk_net_wm_supports_for_screen (DEFAULT_GDK_SCREEN, property);
+  return gdk_net_wm_supports_for_screen (gdk_get_default_screen(), property);
 }
 
 
diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index 45dfa6c84..a68bf7a89 100644
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -205,7 +205,7 @@ GdkFont*
 gdk_font_load (const gchar *font_name)
 {  
    GDK_NOTE(MULTIHEAD,g_message("Use gdk_font_load_for_display instead\n"));
-   return gdk_font_load_for_display (DEFAULT_GDK_DISPLAY, font_name);
+   return gdk_font_load_for_display (gdk_get_default_display(), font_name);
 }
 
 char *
@@ -302,7 +302,7 @@ gdk_font_from_description (PangoFontDescription *font_desc)
 {
   GDK_NOTE(MULTIHEAD, 
     g_message("Use gdk_font_from_description_for_display or Pango ! instead\n"));
-  return gdk_font_from_description_for_display(DEFAULT_GDK_DISPLAY,font_desc);
+  return gdk_font_from_description_for_display(gdk_get_default_display(),font_desc);
 }
 
 GdkFont *
@@ -372,7 +372,7 @@ GdkFont*
 gdk_fontset_load (const gchar *fontset_name)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_fontset_load_for_display instead\n"));
-  return gdk_fontset_load_for_display(DEFAULT_GDK_DISPLAY, fontset_name);
+  return gdk_fontset_load_for_display(gdk_get_default_display(), fontset_name);
 }
 
 void
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 7693e3c18..1b350e0d5 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -125,7 +125,7 @@ gchar *
 gdk_wcstombs (const GdkWChar *src)
 {
   gchar *mbstr;
-  GdkDisplay *display = DEFAULT_GDK_DISPLAY;
+  GdkDisplay *display = gdk_get_default_display();
   GDK_NOTE(MULTIHEAD, g_message("Don't use gdk_wcstombs for multihead\n"));
 
   if (gdk_use_mb) {
@@ -186,7 +186,7 @@ gdk_wcstombs (const GdkWChar *src)
 gint
 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
 {
-  GdkDisplay *display = DEFAULT_GDK_DISPLAY;
+  GdkDisplay *display = gdk_get_default_display();
   GDK_NOTE(MULTIHEAD,g_message("Don't use gdk_mbstowcs for multihead\n"));
   if (gdk_use_mb) {
     XTextProperty tpr;
diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c
index eb4c3b547..44df1e12c 100644
--- a/gdk/x11/gdkkeys-x11.c
+++ b/gdk/x11/gdkkeys-x11.c
@@ -53,14 +53,14 @@
 static inline void
 update_keyrange (void)
 {
-    update_keyrange_for_display(DEFAULT_GDK_DISPLAY);
+    update_keyrange_for_display(gdk_get_default_display());
 }
 */
 /* not needed with multihead display 
 static XkbDescPtr
 get_xkb (void)
 {	
-  return get_xkb_for_display(DEFAULT_GDK_DISPLAY);
+  return get_xkb_for_display(gdk_get_default_display());
 }
 */
 /*
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 640042e01..f55ddba7d 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -129,10 +129,10 @@ _gdk_windowing_init_check_for_display (int argc, char **argv, char *display_name
   XSetErrorHandler (gdk_x_error);
   XSetIOErrorHandler (gdk_x_io_error);
 
-  if (!dpy_mgr) {
-    dpy_mgr = g_object_new (gdk_display_manager_type (), NULL);
+  if (!gdk_display_manager) {
+    gdk_display_manager = g_object_new (gdk_display_manager_type (), NULL);
   }
-  display = GDK_DISPLAY_MGR_GET_CLASS (dpy_mgr)->open_display (dpy_mgr, display_name);
+  display = GDK_DISPLAY_MGR_GET_CLASS (gdk_display_manager)->open_display (gdk_display_manager, display_name);
   if(!display)
     return NULL;
   dpy_impl = GDK_DISPLAY_IMPL_X11 (display);
@@ -262,14 +262,14 @@ void
 gdk_set_use_xshm (gboolean use_xshm)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_use_xshm_set instead\n"));
-  gdk_display_use_xshm_set (DEFAULT_GDK_DISPLAY,use_xshm);
+  gdk_display_use_xshm_set (gdk_get_default_display(),use_xshm);
 }
 
 gboolean
 gdk_get_use_xshm (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_use_xshm_get instead\n"));
-  return gdk_display_use_xshm_get (DEFAULT_GDK_DISPLAY);
+  return gdk_display_use_xshm_get (gdk_get_default_display());
 }
 
 static GdkGrabStatus
@@ -406,7 +406,7 @@ void
 gdk_pointer_ungrab (guint32 time)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_pointer_ungrab instead\n"));
-  gdk_display_pointer_ungrab (DEFAULT_GDK_DISPLAY,time);
+  gdk_display_pointer_ungrab (gdk_get_default_display(),time);
 }
 
 /*
@@ -428,7 +428,7 @@ gboolean
 gdk_pointer_is_grabbed (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_is_pointer_grabbed instead\n"));
-  return gdk_display_is_pointer_grabbed (DEFAULT_GDK_DISPLAY);
+  return gdk_display_is_pointer_grabbed (gdk_get_default_display());
 }
 
 
@@ -495,7 +495,7 @@ void
 gdk_keyboard_ungrab (guint32 time)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_keyboard_ungrab instead\n"));	 
-  gdk_display_keyboard_ungrab (DEFAULT_GDK_DISPLAY,time);
+  gdk_display_keyboard_ungrab (gdk_get_default_display(),time);
 }
 
 /*
@@ -517,7 +517,7 @@ gint
 gdk_screen_width (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_width instead\n"));  
-  return gdk_screen_get_width (DEFAULT_GDK_SCREEN);
+  return gdk_screen_get_width (gdk_get_default_screen());
 }
 
 /*
@@ -539,7 +539,7 @@ gint
 gdk_screen_height (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_height instead\n"));
-  return gdk_screen_get_height (DEFAULT_GDK_SCREEN);
+  return gdk_screen_get_height (gdk_get_default_screen());
 }
 
 
@@ -563,7 +563,7 @@ gint
 gdk_screen_width_mm (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_width_mm instead\n"));
-  return gdk_screen_get_width_mm (DEFAULT_GDK_SCREEN);
+  return gdk_screen_get_width_mm (gdk_get_default_screen());
 }
 
 /*
@@ -585,7 +585,7 @@ gint
 gdk_screen_height_mm (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_screen_get_height_mm instead\n"));
-  return gdk_screen_get_height_mm(DEFAULT_GDK_SCREEN);
+  return gdk_screen_get_height_mm(gdk_get_default_screen());
 }
 
 /*
@@ -614,7 +614,7 @@ void
 gdk_set_sm_client_id (const gchar* sm_client_id)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_set_sm_client_id_for_screen instead\n"));
-  gdk_set_sm_client_id_for_screen(DEFAULT_GDK_SCREEN,sm_client_id);
+  gdk_set_sm_client_id_for_screen(gdk_get_default_screen(),sm_client_id);
 }
 
 void
@@ -659,14 +659,14 @@ void
 gdk_key_repeat_disable (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_key_repeat_disable_for_display instead\n"));
-  gdk_key_repeat_disable_for_display (DEFAULT_GDK_DISPLAY);
+  gdk_key_repeat_disable_for_display (gdk_get_default_display());
 }
 
 void
 gdk_key_repeat_restore (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_key_repeat_restore_for_display instead\n"));	
-  gdk_key_repeat_restore_for_display(DEFAULT_GDK_DISPLAY);
+  gdk_key_repeat_restore_for_display(gdk_get_default_display());
 }
 
 */
@@ -676,7 +676,7 @@ void
 gdk_beep (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_beep instead\n"));
-  gdk_display_beep (DEFAULT_GDK_DISPLAY);
+  gdk_display_beep (gdk_get_default_display());
 }
 
 /* close all open display */
@@ -684,7 +684,7 @@ gdk_beep (void)
 void
 gdk_windowing_exit (void)
 {
-  GSList * tmp = dpy_mgr->open_displays;
+  GSList * tmp = gdk_display_manager->open_displays;
     
   while(tmp != NULL){
 	  pango_x_shutdown_display(GDK_DISPLAY_XDISPLAY(tmp->data));
@@ -814,7 +814,7 @@ gchar *
 gdk_get_display (void)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_x11_display_impl_get_display_name instead\n"));
-  return gdk_x11_display_impl_get_display_name(DEFAULT_GDK_DISPLAY);
+  return gdk_x11_display_impl_get_display_name(gdk_get_default_display());
 }
 
 gchar *
diff --git a/gdk/x11/gdkpango-x11.c b/gdk/x11/gdkpango-x11.c
index aaf21aa3c..7e92182ca 100644
--- a/gdk/x11/gdkpango-x11.c
+++ b/gdk/x11/gdkpango-x11.c
@@ -51,5 +51,5 @@ gdk_pango_context_get_for_screen (GdkScreen * screen)
 PangoContext *
 gdk_pango_context_get (void)
 {
-    return gdk_pango_context_get_for_screen(DEFAULT_GDK_SCREEN);
+    return gdk_pango_context_get_for_screen(gdk_get_default_screen());
 }
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index fb980a93e..ec4a46c53 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -161,7 +161,7 @@ gdk_pixmap_new (GdkWindow * window, gint width, gint height, gint depth)
   {
     GDK_NOTE(MULTIHEAD, g_message ("need to specify the screen parent window",
 		                   "for gdk_pixmap_new to be multihead safe"));
-    window = GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->root_window;
+    window = GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->root_window;
   }
 
   if (GDK_WINDOW_DESTROYED (window))
@@ -214,7 +214,7 @@ gdk_bitmap_create_from_data (GdkWindow   *window,
   {
     GDK_NOTE(MULTIHEAD, g_message ("need to specify the screen parent window",
 		                   "for gdk_bitmap_create_from_data to be multihead safe"));
-    window = GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->root_window;
+    window = GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->root_window;
   }
 
   if (GDK_WINDOW_DESTROYED (window))
@@ -264,7 +264,7 @@ gdk_pixmap_create_from_data (GdkWindow   *window,
   {
     GDK_NOTE(MULTIHEAD, g_message ("need to specify the screen parent window",
 		                   "for gdk_pixmap_create_from_data to be multihead safe"));
-    window = GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->root_window;
+    window = GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->root_window;
   }
 
   if (GDK_WINDOW_DESTROYED (window))
@@ -350,7 +350,7 @@ GdkPixmap*
 gdk_pixmap_foreign_new (GdkNativeWindow anid)
 {
    GDK_NOTE(MULTIHEAD, g_message("Use gdk_pixmap_foreign_new_for_screen instead\n"));
-   return gdk_pixmap_foreign_new_for_screen(DEFAULT_GDK_SCREEN,anid);
+   return gdk_pixmap_foreign_new_for_screen(gdk_get_default_screen(),anid);
 }
 
 GdkScreen*
diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c
index 9902621e0..85c01f5eb 100644
--- a/gdk/x11/gdkproperty-x11.c
+++ b/gdk/x11/gdkproperty-x11.c
@@ -40,7 +40,7 @@ GdkAtom
 gdk_atom_intern (const gchar *atom_name, gboolean only_if_exists)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_atom instead\n"));
-  return gdk_display_atom (DEFAULT_GDK_DISPLAY, atom_name, only_if_exists);
+  return gdk_display_atom (gdk_get_default_display(), atom_name, only_if_exists);
 
 }
 
@@ -48,7 +48,7 @@ gchar*
 gdk_atom_name (GdkAtom atom)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_display_atom_name instead\n"));
-  return gdk_display_atom_name (DEFAULT_GDK_DISPLAY, atom);	
+  return gdk_display_atom_name (gdk_get_default_display(), atom);	
 
 }
 
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index fd6ef1643..fdd584706 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -61,7 +61,7 @@ extern "C"
   GType gdk_X11_screen_impl_get_type ();
 
 
-#define DEFAULT_X_SCREEN    GDK_SCREEN_IMPL_X11(DEFAULT_GDK_SCREEN)->xscreen
+#define DEFAULT_X_SCREEN    GDK_SCREEN_IMPL_X11(gdk_get_default_screen())->xscreen
 #define DEFAULT_GDK_SCREEN_IMPL_X11_FOR_DISPLAY(display)  GDK_SCREEN_IMPL_X11(GDK_DISPLAY_GET_CLASS(display)->get_default_screen(display))
 #define GDK_SCREEN_XDISPLAY(scr)  (GDK_SCREEN_IMPL_X11(scr)->xdisplay)
 #define GDK_SCREEN_XROOTWIN(scr)  (GDK_SCREEN_IMPL_X11(scr)->xroot_window)
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index b63c91d60..19b24c535 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -156,7 +156,7 @@ gdk_selection_owner_set (GdkWindow *owner,
 			 gboolean   send_event)
 {
  GDK_NOTE(MULTIHEAD,g_message("Use gdk_selection_owner_set_for_display instead\n"));
- return gdk_selection_owner_set_for_display(DEFAULT_GDK_DISPLAY,owner,
+ return gdk_selection_owner_set_for_display(gdk_get_default_display(),owner,
 					    selection,time,send_event);
 }
 GdkWindow *
@@ -175,7 +175,7 @@ GdkWindow*
 gdk_selection_owner_get (GdkAtom selection)
 {
   GDK_NOTE(MULTIHEAD,g_message("Use gdk_selection_owner_get_for_display instead\n"));
-  return gdk_selection_owner_get_for_display(DEFAULT_GDK_DISPLAY,selection);
+  return gdk_selection_owner_get_for_display(gdk_get_default_display(),selection);
 }
 
 void
@@ -301,7 +301,7 @@ gdk_selection_send_notify (guint32  requestor,
 {
     GDK_NOTE(MULTIHEAD,
 	     g_message("Use gdk_selection_send_notify_for_display instead\n"));
-    gdk_selection_send_notify_for_display(DEFAULT_GDK_DISPLAY,requestor,
+    gdk_selection_send_notify_for_display(gdk_get_default_display(),requestor,
 					  selection,target,property,time);
 }
 gint
@@ -341,7 +341,7 @@ gdk_text_property_to_text_list (GdkAtom       encoding,
 				gchar      ***list)
 {
   GDK_NOTE(MULTIHEAD, g_message(" Use gdk_text_property_to_text_list_for_display instead\n"));
-  return gdk_text_property_to_text_list_for_display(DEFAULT_GDK_DISPLAY,encoding,
+  return gdk_text_property_to_text_list_for_display(gdk_get_default_display(),encoding,
 						    format,text,length,list);
 }
 
@@ -518,7 +518,7 @@ gdk_text_property_to_utf8_list (GdkAtom        encoding,
 {
   GDK_NOTE(MULTIHEAD, 
 	   g_message("Use gdk_text_property_to_utf8_list_for_display instead\n"));
-  return gdk_text_property_to_utf8_list_for_display (DEFAULT_GDK_DISPLAY,encoding,
+  return gdk_text_property_to_utf8_list_for_display (gdk_get_default_display(),encoding,
 						     format,text,length,list);
 }
 
@@ -562,7 +562,7 @@ gdk_string_to_compound_text (const gchar *str,
 {
   GDK_NOTE(MULTIHEAD, 
 	   g_message("Use gdk_string_to_compound_text_for_display instead\n"));
-  return gdk_string_to_compound_text_for_display(DEFAULT_GDK_DISPLAY,
+  return gdk_string_to_compound_text_for_display(gdk_get_default_display(),
 						 str,
 						 encoding,
 						 format,
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index b2c7ebba5..c3b4b800a 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -265,7 +265,7 @@ gdk_visual_get_best_depth (void)
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_visual_get_best_depth_for_screen instead\n"));
-  return gdk_visual_get_best_depth_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_visual_get_best_depth_for_screen(gdk_get_default_screen());
 }
 GdkVisualType
 gdk_visual_get_best_type_for_screen (GdkScreen * scr)
@@ -277,7 +277,7 @@ gdk_visual_get_best_type (void)
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_visual_get_best_type_for_screen instead\n"));
-  return gdk_visual_get_best_type_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_visual_get_best_type_for_screen(gdk_get_default_screen());
 }
 GdkVisual *
 gdk_visual_get_system_for_screen (GdkScreen * scr)
@@ -289,7 +289,7 @@ gdk_visual_get_system (void)
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_visual_get_system_for_screen instead\n"));
-  return gdk_visual_get_system_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_visual_get_system_for_screen(gdk_get_default_screen());
 }
 GdkVisual *
 gdk_visual_get_best_for_screen (GdkScreen * scr)
@@ -299,7 +299,7 @@ gdk_visual_get_best_for_screen (GdkScreen * scr)
 GdkVisual*
 gdk_visual_get_best (void)
 {
-  return gdk_visual_get_best_for_screen(DEFAULT_GDK_SCREEN);
+  return gdk_visual_get_best_for_screen(gdk_get_default_screen());
 }
 GdkVisual *
 gdk_visual_get_best_with_depth_for_screen (GdkScreen * scr, gint depth)
@@ -320,7 +320,7 @@ gdk_visual_get_best_with_depth_for_screen (GdkScreen * scr, gint depth)
 GdkVisual*
 gdk_visual_get_best_with_depth (gint depth)
 {
-  return gdk_visual_get_best_with_depth_for_screen(DEFAULT_GDK_SCREEN, depth);
+  return gdk_visual_get_best_with_depth_for_screen(gdk_get_default_screen(), depth);
 }
 GdkVisual *
 gdk_visual_get_best_with_type_for_screen (GdkScreen * scr,
@@ -345,7 +345,7 @@ gdk_visual_get_best_with_type (GdkVisualType visual_type)
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_visual_get_best_with_type_for_screen instead\n"));	
-  return gdk_visual_get_best_with_type_for_screen(DEFAULT_GDK_SCREEN, visual_type);
+  return gdk_visual_get_best_with_type_for_screen(gdk_get_default_screen(), visual_type);
 }
 GdkVisual *
 gdk_visual_get_best_with_both_for_screen (GdkScreen * scr,
@@ -373,7 +373,7 @@ gdk_visual_get_best_with_both (gint          depth,
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_visual_get_best_with_both_for_screen instead\n"));	
-  return gdk_visual_get_best_with_both_for_screen(DEFAULT_GDK_SCREEN,
+  return gdk_visual_get_best_with_both_for_screen(gdk_get_default_screen(),
 						  depth,
 						  visual_type);
 }
@@ -391,7 +391,7 @@ gdk_query_depths  (gint **depths,
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_query_depths_for_screen instead\n"));
-  gdk_query_depths_for_screen(DEFAULT_GDK_SCREEN, depths, count);
+  gdk_query_depths_for_screen(gdk_get_default_screen(), depths, count);
 }
 void
 gdk_query_visual_types_for_screen (GdkScreen * scr,
@@ -408,7 +408,7 @@ gdk_query_visual_types (GdkVisualType **visual_types,
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_query_visual_types_for_screen instead\n"));
-  gdk_query_visual_types_for_screen(DEFAULT_GDK_SCREEN, visual_types, count);
+  gdk_query_visual_types_for_screen(gdk_get_default_screen(), visual_types, count);
 }
 
 GList *
@@ -428,7 +428,7 @@ gdk_list_visuals_for_screen (GdkScreen * scr)
 GList*
 gdk_list_visuals (void)
 {
- return gdk_list_visuals_for_screen(DEFAULT_GDK_SCREEN);
+ return gdk_list_visuals_for_screen(gdk_get_default_screen());
 }
 
 GdkVisual *
@@ -449,7 +449,7 @@ GdkVisual*
 gdk_visual_lookup (Visual *xvisual)
 {
   GDK_NOTE(MULTIHEAD, g_message("Use gdk_visual_lookup_for_screen instead\n"));
-  return gdk_visual_lookup_for_screen(DEFAULT_GDK_SCREEN, xvisual);
+  return gdk_visual_lookup_for_screen(gdk_get_default_screen(), xvisual);
 }
 
 GdkVisual *
@@ -469,7 +469,7 @@ GdkVisual*
 gdkx_visual_get (VisualID xvisualid)
 {
   GDK_NOTE(MULTIHEAD, g_message("Use gdkx_visual_get_for_screen instead\n"));
-  return gdkx_visual_get_for_screen(DEFAULT_GDK_SCREEN, xvisualid);
+  return gdkx_visual_get_for_screen(gdk_get_default_screen(), xvisualid);
 }
 
 
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 1f24c5c8d..9a57a87d8 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -620,7 +620,7 @@ gdk_window_new (GdkWindow     *parent,
     screen = GDK_WINDOW_SCREEN(parent);  
   else{
     GDK_NOTE(MULTIHEAD, g_message("Use gdk_window_new_for_screen instead instead\n"));
-    screen = DEFAULT_GDK_SCREEN;
+    screen = gdk_get_default_screen();
   }
   return gdk_window_new_for_screen(screen, 
 				   parent,
@@ -684,7 +684,7 @@ gdk_window_foreign_new_for_display (GdkDisplay * display,
      try to match a GdkScreen to root 
    */
   draw_impl->screen =
-    gdk_x11_display_manager_get_screen_for_root (dpy_mgr, root);
+    gdk_x11_display_manager_get_screen_for_root (gdk_display_manager, root);
   g_assert (draw_impl->screen != NULL);
 
   private->x = attrs.x;
@@ -712,7 +712,7 @@ gdk_window_foreign_new_for_display (GdkDisplay * display,
 GdkWindow *
 gdk_window_foreign_new (GdkNativeWindow anid)
 {
-  return gdk_window_foreign_new_for_display(DEFAULT_GDK_DISPLAY, anid);
+  return gdk_window_foreign_new_for_display(gdk_get_default_display(), anid);
 }
 
 void
@@ -1771,7 +1771,7 @@ gdk_window_get_geometry (GdkWindow *window,
   {
     GDK_NOTE(MULTIHEAD, 
 	     g_message("Window needs to be defined to be multisafe\n"));
-    window = GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->root_window;
+    window = GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->root_window;
   }
 
   if (!GDK_WINDOW_DESTROYED (window)) {
@@ -2036,7 +2036,7 @@ gdk_window_get_pointer (GdkWindow       *window,
   {
     GDK_NOTE(MULTIHEAD, 
 	     g_message("window arg is need for multihead safe operation\n"));
-    window = GDK_SCREEN_IMPL_X11 (DEFAULT_GDK_SCREEN)->root_window;
+    window = GDK_SCREEN_IMPL_X11 (gdk_get_default_screen())->root_window;
   }
 
   _gdk_windowing_window_get_offsets (window, &xoffset, &yoffset);
@@ -2066,7 +2066,7 @@ gdk_window_at_pointer (gint *win_x,
 {
   GDK_NOTE(MULTIHEAD,
 	   g_message("Use gdk_screen_get_window_at_pointer instead\n"));
-  return gdk_screen_get_window_at_pointer(DEFAULT_GDK_SCREEN,win_x,win_y);
+  return gdk_screen_get_window_at_pointer(gdk_get_default_screen(),win_x,win_y);
 }
 
 GdkEventMask  
@@ -3493,7 +3493,7 @@ gdk_window_xid_at_coords (gint     x,
 			  GList   *excludes,
 			  gboolean excl_child)
 {
- return gdk_window_xid_at_coords_for_screen (x, y, excludes, excl_child,DEFAULT_GDK_SCREEN);
+ return gdk_window_xid_at_coords_for_screen (x, y, excludes, excl_child,gdk_get_default_screen());
 }
 
 
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 503d4efcc..aaf1b11ff 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -158,7 +158,7 @@ extern Window		 gdk_xroot_window;
 extern gint		 gdk_screen;*/
 extern gchar		*gdk_display_name;
 /*extern Window		 gdk_leader_window;*/
-extern GdkDisplayManager *dpy_mgr;
+extern GdkDisplayManager *gdk_display_manager;
 
 extern Atom		 gdk_selection_property;
 
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 7011e9448..116d45ff2 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -139,7 +139,7 @@ gtk_clipboard_get_for_display (GdkDisplay *display, GdkAtom selection)
 GtkClipboard *
 gtk_clipboard_get (GdkAtom selection)
 {
-  return gtk_clipboard_get_for_display (DEFAULT_GDK_DISPLAY, selection);
+  return gtk_clipboard_get_for_display (gdk_get_default_display(), selection);
 
 }
 
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 859b7d0cd..903a61ac7 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -486,8 +486,8 @@ gtk_init_check (int	 *argc,
    *  used in creating widgets. (We want to use the system
    *  defaults so as to be nice to the colormap).
    */
-  gtk_visual = gdk_visual_get_system_for_screen (DEFAULT_GDK_SCREEN);
-  gtk_colormap = gdk_colormap_get_system_for_screen (DEFAULT_GDK_SCREEN);
+  gtk_visual = gdk_visual_get_system_for_screen (gdk_get_default_screen());
+  gtk_colormap = gdk_colormap_get_system_for_screen (gdk_get_default_screen());
 
   gtk_type_init (0);
   gtk_rc_init ();
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 0531b0290..f48128f12 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -209,7 +209,7 @@ GtkTargetList *
 gtk_target_list_new (const GtkTargetEntry *targets,
 		     guint                 ntargets)
 {
-  return gtk_target_list_new_for_display (DEFAULT_GDK_DISPLAY, targets, ntargets);
+  return gtk_target_list_new_for_display (gdk_get_default_display(), targets, ntargets);
 
 }
 
@@ -290,7 +290,7 @@ gtk_target_list_add_table (GtkTargetList        *list,
 			   guint                 ntargets)
 {
     g_message("Use gtk_target_list_add_table_for_display instead\n");
-    gtk_target_list_add_table_for_display (DEFAULT_GDK_DISPLAY, list, targets, ntargets);
+    gtk_target_list_add_table_for_display (gdk_get_default_display(), list, targets, ntargets);
 
 }
 
@@ -453,7 +453,7 @@ gtk_selection_owner_set (GtkWidget *widget,
 			 GdkAtom    selection,
 			 guint32    time)
 {
- return gtk_selection_owner_set_for_display (DEFAULT_GDK_DISPLAY,
+ return gtk_selection_owner_set_for_display (gdk_get_default_display(),
 					     widget,
 					     selection,
 					     time);
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 9b6b8d31c..464122ac0 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -683,7 +683,7 @@ GtkStyle*
 gtk_style_new (void)
 {
   GTK_NOTE(MULTIHEAD, g_message("Use gtk_style_new_for_display instead\n"));
-  return gtk_style_new_for_display(DEFAULT_GDK_DISPLAY);
+  return gtk_style_new_for_display(gdk_get_default_display());
 }
 
 /*************************************************************
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index bb0acc540..49f469cfd 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -301,7 +301,7 @@ void
 gtk_text_buffer_init (GtkTextBuffer *buffer)
 {
   buffer->clipboard_contents = NULL;
-  buffer->clipboard_display = DEFAULT_GDK_DISPLAY;
+  buffer->clipboard_display = gdk_get_default_display();
 }
 
 /**
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 6e11346d7..2e7e1937d 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1288,7 +1288,7 @@ gtk_widget_init (GtkWidget *widget)
   widget->allocation.height = 1;
   widget->window = NULL;
   widget->parent = NULL;
-  widget->screen = DEFAULT_GDK_SCREEN;
+  widget->screen = gdk_get_default_screen();
   GTK_WIDGET_SET_FLAGS (widget,
 			GTK_SENSITIVE |
 			GTK_PARENT_SENSITIVE |
@@ -3931,7 +3931,7 @@ gtk_widget_get_default_style (void)
 {
   GTK_NOTE(MULTIHEAD, 
 	   g_message("Use gtk_widget_get_default_style_for_display instead\n"));
-  return gtk_widget_get_default_style_for_display(DEFAULT_GDK_DISPLAY);
+  return gtk_widget_get_default_style_for_display(gdk_get_default_display());
 }
 
 void
@@ -4872,7 +4872,7 @@ gtk_widget_get_default_colormap (void)
 {
   GTK_NOTE (MISC,
 	    g_message("don't use for multihead !!")); 
-  return gdk_screen_get_default_colormap(DEFAULT_GDK_SCREEN);
+  return gdk_screen_get_default_colormap(gdk_get_default_screen());
 }
 
 /**
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index b151624ef..f88d4b84f 100644
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -186,7 +186,8 @@ get_im (const char *locale)
       if (!XSetLocaleModifiers (""))
 	g_warning ("can not set locale modifiers");
       
-      im = XOpenIM (GDK_DISPLAY_IMPL_X11(DEFAULT_GDK_DISPLAY)->xdisplay, NULL, NULL, NULL);
+      im = XOpenIM (GDK_DISPLAY_IMPL_X11(gdk_get_default_display ())->xdisplay,
+		    NULL, NULL, NULL);
       
       if (im)
 	{
diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index f9ecb6e50..7deb235c4 100644
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -50,7 +50,7 @@ void make_selection_dialog(GdkScreen *screen,
   
   if(!screen)
      screen = gdk_display_get_default_screen(
-		    gdk_display_manager_get_default(dpy_mgr));
+	       gdk_display_manager_get_default(gdk_get_display_manager ()));
   
   window = g_object_connect (gtk_widget_new (gtk_window_get_type (),
 					     "screen", screen,
diff --git a/tests/testmultiscreen.c b/tests/testmultiscreen.c
index d0a38f47f..4a7d10839 100644
--- a/tests/testmultiscreen.c
+++ b/tests/testmultiscreen.c
@@ -21,7 +21,7 @@ main (int argc, char *argv[])
   GdkDisplay *dpy;
   gtk_init (&argc, &argv);
 
-  dpy = gdk_display_manager_get_default(dpy_mgr);
+  dpy = gdk_display_manager_get_default(gdk_get_display_manager ());
   num_screen = gdk_display_get_n_screens(dpy);
   displayname = gdk_display_get_name(dpy);
   if(num_screen <= 1)