Change FSF Address

[~andy/gtk] / gdk / win32 / gdkwin32id.c

diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c
index 4cba645459b05251d06431842284b8d15ca81fc1..6f831a14a1c06362b31cb0ad429548bba5e84839 100644 (file)
--- a/gdk/win32/gdkwin32id.c
+++ b/gdk/win32/gdkwin32id.c
@@ -2,87 +2,80 @@
  * 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
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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"
-
-#include <stdio.h>
 #include <gdk/gdk.h>
 
-#include "gdkprivate.h"
-
-static guint gdk_xid_hash    (XID *xid);
-static gint  gdk_xid_compare (XID *a,
-                             XID *b);
+#include "gdkprivate-win32.h"
 
+static GHashTable *handle_ht = NULL;
 
-static GHashTable *xid_ht = NULL;
+static guint
+gdk_handle_hash (HANDLE *handle)
+{
+#ifdef _WIN64
+  return ((guint *) handle)[0] ^ ((guint *) handle)[1];
+#else
+  return (guint) *handle;
+#endif
+}
 
+static gint
+gdk_handle_equal (HANDLE *a,
+                 HANDLE *b)
+{
+  return (*a == *b);
+}
 
 void
-gdk_xid_table_insert (XID      *xid,
-                     gpointer  data)
+gdk_win32_handle_table_insert (HANDLE  *handle,
+                              gpointer data)
 {
-  g_return_if_fail (xid != NULL);
+  g_return_if_fail (handle != NULL);
 
-  if (!xid_ht)
-    xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
-                              (GCompareFunc) gdk_xid_compare);
+  if (!handle_ht)
+    handle_ht = g_hash_table_new ((GHashFunc) gdk_handle_hash,
+                                 (GEqualFunc) gdk_handle_equal);
 
-  g_hash_table_insert (xid_ht, xid, data);
+  g_hash_table_insert (handle_ht, handle, data);
 }
 
 void
-gdk_xid_table_remove (XID xid)
+gdk_win32_handle_table_remove (HANDLE handle)
 {
-  if (!xid_ht)
-    xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
-                              (GCompareFunc) gdk_xid_compare);
+  if (!handle_ht)
+    handle_ht = g_hash_table_new ((GHashFunc) gdk_handle_hash,
+                                 (GEqualFunc) gdk_handle_equal);
 
-  g_hash_table_remove (xid_ht, &xid);
+  g_hash_table_remove (handle_ht, &handle);
 }
 
 gpointer
-gdk_xid_table_lookup (XID xid)
+gdk_win32_handle_table_lookup (HWND handle)
 {
   gpointer data = NULL;
 
-  if (xid_ht)
-    data = g_hash_table_lookup (xid_ht, &xid);
+  if (handle_ht)
+    data = g_hash_table_lookup (handle_ht, &handle);
   
   return data;
 }
-
-
-static guint
-gdk_xid_hash (XID *xid)
-{
-  return (guint) *xid;
-}
-
-static gint
-gdk_xid_compare (XID *a,
-                XID *b)
-{
-  return (*a == *b);
-}