Minor code cleanup

[clg] / gdk / alien / glue.c

diff --git a/gdk/alien/glue.c b/gdk/alien/glue.c
index 48caf6b0b9cc962ebb18a847714a8a0050f27268..94109b9c988e1d2ba3b19e0b628ffa7a6e53f54e 100644 (file)
--- a/gdk/alien/glue.c
+++ b/gdk/alien/glue.c
@@ -1,38 +1,64 @@
-/* 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-2007 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.6 2007-06-01 09:23:41 espen Exp $ */
 
 
 #include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
 
-extern Display *gdk_display;
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
 
-gint gdk_connection_number ()
+gint clg_gdk_connection_number (GdkDisplay *display)
 {
-  return ConnectionNumber (gdk_display); 
+#ifdef GDK_WINDOWING_X11
+  return ConnectionNumber (GDK_DISPLAY_XDISPLAY (display));
+#else
+  return -1;
+#endif
 }
 
 
-GdkWindow*
-gdk_get_root_window ()
+GdkWindow *clg_gdk_cairo_surface_get_window (cairo_surface_t *surface)
 {
-  return gdk_window_foreign_new (GDK_ROOT_WINDOW ());
+  /* If 'surface_info_key' had been public we would have had a
+     portable way to find the GdkWindow of a Cairo surface. */
+  
+#ifdef GDK_WINDOWING_X11
+  Display* display = cairo_xlib_surface_get_display (surface);
+  Drawable window = cairo_xlib_surface_get_drawable (surface);
+  if (display && window)
+    return gdk_window_lookup_for_display (window, display);
+  else
+    return NULL;
+#elif defined (G_OS_WIN32)
+  HDC hdc = cairo_win32_surface_get_dc (surface);
+  if (hdc)
+    return gdk_window_lookup (hdc);
+  else
+    return NULL;
+#else
+  return NULL;
+#endif
 }