X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/9c7271c1a4c2b676f027dfacc2fe0daca7dd3759..e4251a293459eb4ffaf4b943df01155d39cfa9ea:/gdk/alien/glue.c

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index 48caf6b..b2bcc10 100644
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -1,38 +1,39 @@
-/* Common Lisp bindings for GTK+ v2.0
- * Copyright (C) 1999-2000 Espen S. Johnsen <espejohn@online.no>
+/* Common Lisp bindings for GTK+ v2.x
+ * Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
  *
- * This library is free software; you can redistribute it and/or
- * 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.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- * 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
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * 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
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: glue.c,v 1.1 2004-10-27 18:50:25 espen Exp $ */
+/* $Id: glue.c,v 1.3 2005-04-23 16:48:50 espen Exp $ */
 
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
-
-extern Display *gdk_display;
-
-gint gdk_connection_number ()
+struct _GdkDisplayX11
 {
-  return ConnectionNumber (gdk_display); 
-}
-
+  GdkDisplay parent_instance;
+  Display *xdisplay;
+};
 
-GdkWindow*
-gdk_get_root_window ()
+gint clg_gdk_connection_number (GdkDisplay *display)
 {
-  return gdk_window_foreign_new (GDK_ROOT_WINDOW ());
+  return ConnectionNumber (((struct _GdkDisplayX11 *)display)->xdisplay);
 }