Bug 559408 - Transparency lost when images are copied between GTK+ and the

[~andy/gtk] / gdk / gdkglobals.c

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 5736a1a80d2e740f3d3bd402b4531ecae1df3110..35e9908a298b6e4d6dfcbd760aedcd15c239903e 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -2,64 +2,46 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include "gdktypes.h"
-#include "gdkprivate.h"
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
 #include "config.h"
 
-guint             gdk_debug_flags = 0;
-gint              gdk_use_xshm = TRUE;
-gchar            *gdk_display_name = NULL;
-Display          *gdk_display = NULL;
-gint              gdk_screen;
-Window            gdk_root_window;
-Window            gdk_leader_window;
-GdkWindowPrivate  gdk_root_parent = { { NULL, }, NULL, };
-Atom              gdk_wm_delete_window;
-Atom              gdk_wm_take_focus;
-Atom              gdk_wm_protocols;
-Atom              gdk_wm_window_protocols[2];
-Atom              gdk_selection_property;
-GdkDndCursorInfo  gdk_dnd_cursorinfo = {None, None, NULL, NULL,
-                                       {0,0}, {0,0}, NULL};
-GdkDndGlobals     gdk_dnd = {None,None,None,
-                            None,None,None,
-                            None,
-                            &gdk_dnd_cursorinfo,
-                            NULL,
-                            0,
-                            FALSE, FALSE, FALSE,
-                            None,
-                            {0,0},
-                            {0,0}, {0,0},
-                            {0,0,0,0}, NULL, None, 0};
-gchar            *gdk_progclass = NULL;
-gint              gdk_error_code;
-gint              gdk_error_warnings = TRUE;
-gint              gdk_null_window_warnings = TRUE;
-GList            *gdk_default_filters = NULL;
+#include <stdio.h>
 
-gboolean          gdk_using_threads = FALSE;
+#include "gdktypes.h"
+#include "gdkprivate.h"
+#include "gdkalias.h"
 
-/* Used to signal the mainloop thread from its select() */
-#ifdef USE_PTHREADS
-gint              gdk_threads_pipe[2];
-gboolean          gdk_select_waiting = FALSE;
-#endif
+guint               _gdk_debug_flags = 0;
+gint                _gdk_error_code = 0;
+gint                _gdk_error_warnings = TRUE;
+GList              *_gdk_default_filters = NULL;
+gchar              *_gdk_display_name = NULL;
+gint                _gdk_screen_number = -1;
+gchar              *_gdk_display_arg_name = NULL;
 
+GSList             *_gdk_displays = NULL;
 
+GMutex              *gdk_threads_mutex = NULL;          /* Global GDK lock */
+GCallback            gdk_threads_lock = NULL;
+GCallback            gdk_threads_unlock = NULL;