]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkevents.c
gdk/: fully remove gdkalias hacks
[~andy/gtk] / gdk / gdkevents.c
index 544e3dd1cb8cf02d8088aeffcf8a79b521936c16..fb9373aee1a2c678e1a34d56009f14fb3d557908 100644 (file)
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include "config.h"
+#include <string.h>            /* For memset() */
+#include <math.h>
+
 #include "gdk.h"
 #include "gdkinternals.h"
 
-typedef struct _GdkIOClosure GdkIOClosure;
-typedef struct _GdkEventPrivate GdkEventPrivate;
-
-#define DOUBLE_CLICK_TIME      250
-#define TRIPLE_CLICK_TIME      500
-#define DOUBLE_CLICK_DIST      5
-#define TRIPLE_CLICK_DIST      5
 
-typedef enum
-{
-  /* Following flag is set for events on the event queue during
-   * translation and cleared afterwards.
-   */
-  GDK_EVENT_PENDING = 1 << 0
-} GdkEventFlags;
+typedef struct _GdkIOClosure GdkIOClosure;
 
 struct _GdkIOClosure
 {
-  GdkInputFunction function;
-  GdkInputCondition condition;
-  GdkDestroyNotify notify;
+  GDestroyNotify notify;
   gpointer data;
 };
 
-struct _GdkEventPrivate
-{
-  GdkEvent event;
-  guint    flags;
-};
-
-/* 
- * Private function declarations
- */
-
-GdkFilterReturn gdk_wm_protocols_filter (GdkXEvent *xev,
-                                        GdkEvent  *event,
-                                        gpointer   data);
-
 /* Private variable declarations
  */
 
-static guint32 button_click_time[2] = { 0, 0}; /* The last 2 button click times. Used
-                                               * to determine if the latest button click
-                                               * is part of a double or triple click.
-                                               */
-static GdkWindow *button_window[2] = { NULL, NULL}; /* The last 2 windows to receive button presses.
-                                                    *  Also used to determine if the latest button
-                                                    *  click is part of a double or triple click.
-                                            */
-static guint button_number[2] = { -1, -1 }; /* The last 2 buttons to be pressed.
-                                            */
-GdkEventFunc   gdk_event_func = NULL;    /* Callback for events */
-gpointer       gdk_event_data = NULL;
-GDestroyNotify gdk_event_notify = NULL;
-
-GPollFD event_poll_fd;
+GdkEventFunc   _gdk_event_func = NULL;    /* Callback for events */
+gpointer       _gdk_event_data = NULL;
+GDestroyNotify _gdk_event_notify = NULL;
 
 /*********************************************
  * Functions for maintaining the event queue *
  *********************************************/
 
-/*************************************************************
- * gdk_event_queue_find_first:
- *     Find the first event on the queue that is not still
- *     being filled in.
- *   arguments:
- *     
- *   results:
- *     Pointer to the list node for that event, or NULL
- *************************************************************/
-
+/**
+ * _gdk_event_queue_find_first:
+ * @display: a #GdkDisplay
+ * 
+ * Find the first event on the queue that is not still
+ * being filled in.
+ * 
+ * Return value: Pointer to the list node for that event, or NULL.
+ **/
 GList*
-gdk_event_queue_find_first (void)
+_gdk_event_queue_find_first (GdkDisplay *display)
 {
-  GList *tmp_list = gdk_queued_events;
+  GList *tmp_list = display->queued_events;
 
   while (tmp_list)
     {
@@ -115,190 +77,376 @@ gdk_event_queue_find_first (void)
   return NULL;
 }
 
-/*************************************************************
- * gdk_event_queue_remove_link:
- *     Remove a specified list node from the event queue.
- *   arguments:
- *     node: Node to remove.
- *   results:
- *************************************************************/
+/**
+ * _gdk_event_queue_prepend:
+ * @display: a #GdkDisplay
+ * @event: Event to prepend.
+ *
+ * Prepends an event before the head of the event queue.
+ *
+ * Returns: the newly prepended list node.
+ **/
+GList*
+_gdk_event_queue_prepend (GdkDisplay *display,
+                         GdkEvent   *event)
+{
+  display->queued_events = g_list_prepend (display->queued_events, event);
+  if (!display->queued_tail)
+    display->queued_tail = display->queued_events;
+  return display->queued_events;
+}
+
+/**
+ * _gdk_event_queue_append:
+ * @display: a #GdkDisplay
+ * @event: Event to append.
+ * 
+ * Appends an event onto the tail of the event queue.
+ *
+ * Returns: the newly appended list node.
+ **/
+GList *
+_gdk_event_queue_append (GdkDisplay *display,
+                        GdkEvent   *event)
+{
+  display->queued_tail = g_list_append (display->queued_tail, event);
+  
+  if (!display->queued_events)
+    display->queued_events = display->queued_tail;
+  else
+    display->queued_tail = display->queued_tail->next;
+
+  return display->queued_tail;
+}
+
+/**
+ * _gdk_event_queue_insert_after:
+ * @display: a #GdkDisplay
+ * @sibling: Append after this event.
+ * @event: Event to append.
+ *
+ * Appends an event after the specified event, or if it isn't in
+ * the queue, onto the tail of the event queue.
+ *
+ * Returns: the newly appended list node.
+ *
+ * Since: 2.16
+ */
+GList*
+_gdk_event_queue_insert_after (GdkDisplay *display,
+                               GdkEvent   *sibling,
+                               GdkEvent   *event)
+{
+  GList *prev = g_list_find (display->queued_events, sibling);
+  if (prev && prev->next)
+    {
+      display->queued_events = g_list_insert_before (display->queued_events, prev->next, event);
+      return prev->next;
+    }
+  else
+    return _gdk_event_queue_append (display, event);
+}
+
+/**
+ * _gdk_event_queue_insert_after:
+ * @display: a #GdkDisplay
+ * @sibling: Append after this event.
+ * @event: Event to append.
+ *
+ * Appends an event before the specified event, or if it isn't in
+ * the queue, onto the tail of the event queue.
+ *
+ * Returns: the newly appended list node.
+ *
+ * Since: 2.16
+ */
+GList*
+_gdk_event_queue_insert_before (GdkDisplay *display,
+                               GdkEvent   *sibling,
+                               GdkEvent   *event)
+{
+  GList *next = g_list_find (display->queued_events, sibling);
+  if (next)
+    {
+      display->queued_events = g_list_insert_before (display->queued_events, next, event);
+      return next->prev;
+    }
+  else
+    return _gdk_event_queue_append (display, event);
+}
+
 
+/**
+ * _gdk_event_queue_remove_link:
+ * @display: a #GdkDisplay
+ * @node: node to remove
+ * 
+ * Removes a specified list node from the event queue.
+ **/
 void
-gdk_event_queue_remove_link (GList *node)
+_gdk_event_queue_remove_link (GdkDisplay *display,
+                             GList      *node)
 {
   if (node->prev)
     node->prev->next = node->next;
   else
-    gdk_queued_events = node->next;
+    display->queued_events = node->next;
   
   if (node->next)
     node->next->prev = node->prev;
   else
-    gdk_queued_tail = node->prev;
+    display->queued_tail = node->prev;
 }
 
-/*************************************************************
- * gdk_event_queue_append:
- *     Append an event onto the tail of the event queue.
- *   arguments:
- *     event: Event to append.
- *   results:
- *************************************************************/
-
-void
-gdk_event_queue_append (GdkEvent *event)
+/**
+ * _gdk_event_unqueue:
+ * @display: a #GdkDisplay
+ * 
+ * Removes and returns the first event from the event
+ * queue that is not still being filled in.
+ * 
+ * Return value: the event, or %NULL. Ownership is transferred
+ * to the caller.
+ **/
+GdkEvent*
+_gdk_event_unqueue (GdkDisplay *display)
 {
-  gdk_queued_tail = g_list_append (gdk_queued_tail, event);
-  
-  if (!gdk_queued_events)
-    gdk_queued_events = gdk_queued_tail;
-  else
-    gdk_queued_tail = gdk_queued_tail->next;
+  GdkEvent *event = NULL;
+  GList *tmp_list;
+
+  tmp_list = _gdk_event_queue_find_first (display);
+
+  if (tmp_list)
+    {
+      event = tmp_list->data;
+      _gdk_event_queue_remove_link (display, tmp_list);
+      g_list_free_1 (tmp_list);
+    }
+
+  return event;
 }
 
-/*************************************************************
+/**
  * gdk_event_handler_set:
- *     
- *   arguments:
- *     func: Callback function to be called for each event.
- *     data: Data supplied to the function
- *     notify: function called when function is no longer needed
+ * @func: the function to call to handle events from GDK.
+ * @data: user data to pass to the function. 
+ * @notify: the function to call when the handler function is removed, i.e. when
+ *          gdk_event_handler_set() is called with another event handler.
  * 
- *   results:
- *************************************************************/
-
+ * Sets the function to call to handle all events from GDK.
+ *
+ * Note that GTK+ uses this to install its own event handler, so it is
+ * usually not useful for GTK+ applications. (Although an application
+ * can call this function then call gtk_main_do_event() to pass
+ * events to GTK+.)
+ **/
 void 
 gdk_event_handler_set (GdkEventFunc   func,
                       gpointer       data,
                       GDestroyNotify notify)
 {
-  if (gdk_event_notify)
-    (*gdk_event_notify) (gdk_event_data);
+  if (_gdk_event_notify)
+    (*_gdk_event_notify) (_gdk_event_data);
 
-  gdk_event_func = func;
-  gdk_event_data = data;
-  gdk_event_notify = notify;
+  _gdk_event_func = func;
+  _gdk_event_data = data;
+  _gdk_event_notify = notify;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_event_get
- *
- *   Gets the next event.
- *
- * Arguments:
- *
- * Results:
- *   If an event is waiting that we care about, returns 
- *   a pointer to that event, to be freed with gdk_event_free.
- *   Otherwise, returns NULL.
- *
- * Side effects:
- *
- *--------------------------------------------------------------
- */
-
+/**
+ * gdk_event_get:
+ * 
+ * Checks all open displays for a #GdkEvent to process,to be processed
+ * on, fetching events from the windowing system if necessary.
+ * See gdk_display_get_event().
+ * 
+ * Return value: the next #GdkEvent to be processed, or %NULL if no events
+ * are pending. The returned #GdkEvent should be freed with gdk_event_free().
+ **/
 GdkEvent*
 gdk_event_get (void)
 {
-  gdk_events_queue ();
+  GSList *tmp_list;
+
+  for (tmp_list = _gdk_displays; tmp_list; tmp_list = tmp_list->next)
+    {
+      GdkEvent *event = gdk_display_get_event (tmp_list->data);
+      if (event)
+       return event;
+    }
 
-  return gdk_event_unqueue ();
+  return NULL;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_event_peek
- *
- *   Gets the next event.
- *
- * Arguments:
- *
- * Results:
- *   If an event is waiting that we care about, returns 
- *   a copy of that event, but does not remove it from
- *   the queue. The pointer is to be freed with gdk_event_free.
- *   Otherwise, returns NULL.
- *
- * Side effects:
+/**
+ * gdk_event_peek:
  *
- *--------------------------------------------------------------
- */
-
+ * If there is an event waiting in the event queue of some open
+ * display, returns a copy of it. See gdk_display_peek_event().
+ * 
+ * Return value: a copy of the first #GdkEvent on some event queue, or %NULL if no
+ * events are in any queues. The returned #GdkEvent should be freed with
+ * gdk_event_free().
+ **/
 GdkEvent*
 gdk_event_peek (void)
 {
-  GList *tmp_list;
+  GSList *tmp_list;
 
-  tmp_list = gdk_event_queue_find_first ();
-  
-  if (tmp_list)
-    return gdk_event_copy (tmp_list->data);
-  else
-    return NULL;
+  for (tmp_list = _gdk_displays; tmp_list; tmp_list = tmp_list->next)
+    {
+      GdkEvent *event = gdk_display_peek_event (tmp_list->data);
+      if (event)
+       return event;
+    }
+
+  return NULL;
 }
 
+/**
+ * gdk_event_put:
+ * @event: a #GdkEvent.
+ *
+ * Appends a copy of the given event onto the front of the event
+ * queue for event->any.window's display, or the default event
+ * queue if event->any.window is %NULL. See gdk_display_put_event().
+ **/
 void
-gdk_event_put (GdkEvent *event)
+gdk_event_put (const GdkEvent *event)
 {
-  GdkEvent *new_event;
+  GdkDisplay *display;
   
   g_return_if_fail (event != NULL);
-  
-  new_event = gdk_event_copy (event);
 
-  gdk_event_queue_append (new_event);
-}
+  if (event->any.window)
+    display = gdk_drawable_get_display (event->any.window);
+  else
+    {
+      GDK_NOTE (MULTIHEAD,
+               g_message ("Falling back to default display for gdk_event_put()"));
+      display = gdk_display_get_default ();
+    }
 
-/*
- *--------------------------------------------------------------
- * gdk_event_copy
- *
- *   Copy a event structure into new storage.
- *
- * Arguments:
- *   "event" is the event struct to copy.
- *
- * Results:
- *   A new event structure.  Free it with gdk_event_free.
- *
- * Side effects:
- *   The reference count of the window in the event is increased.
- *
- *--------------------------------------------------------------
- */
+  gdk_display_put_event (display, event);
+}
 
-static GMemChunk *event_chunk = NULL;
+static GHashTable *event_hash = NULL;
 
+/**
+ * gdk_event_new:
+ * @type: a #GdkEventType 
+ * 
+ * Creates a new event of the given type. All fields are set to 0.
+ * 
+ * Return value: a newly-allocated #GdkEvent. The returned #GdkEvent 
+ * should be freed with gdk_event_free().
+ *
+ * Since: 2.2
+ **/
 GdkEvent*
-gdk_event_new (void)
+gdk_event_new (GdkEventType type)
 {
-  GdkEventPrivate *new_event;
+  GdkEventPrivate *new_private;
+  GdkEvent *new_event;
   
-  if (event_chunk == NULL)
-    event_chunk = g_mem_chunk_new ("events",
-                                  sizeof (GdkEventPrivate),
-                                  4096,
-                                  G_ALLOC_AND_FREE);
+  if (!event_hash)
+    event_hash = g_hash_table_new (g_direct_hash, NULL);
+
+  new_private = g_slice_new0 (GdkEventPrivate);
   
-  new_event = g_chunk_new (GdkEventPrivate, event_chunk);
-  new_event->flags = 0;
+  new_private->flags = 0;
+  new_private->screen = NULL;
+
+  g_hash_table_insert (event_hash, new_private, GUINT_TO_POINTER (1));
+
+  new_event = (GdkEvent *) new_private;
+
+  new_event->any.type = type;
+
+  /*
+   * Bytewise 0 initialization is reasonable for most of the 
+   * current event types. Explicitely initialize double fields
+   * since I trust bytewise 0 == 0. less than for integers
+   * or pointers.
+   */
+  switch (type)
+    {
+    case GDK_MOTION_NOTIFY:
+      new_event->motion.x = 0.;
+      new_event->motion.y = 0.;
+      new_event->motion.x_root = 0.;
+      new_event->motion.y_root = 0.;
+      break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      new_event->button.x = 0.;
+      new_event->button.y = 0.;
+      new_event->button.x_root = 0.;
+      new_event->button.y_root = 0.;
+      break;
+    case GDK_SCROLL:
+      new_event->scroll.x = 0.;
+      new_event->scroll.y = 0.;
+      new_event->scroll.x_root = 0.;
+      new_event->scroll.y_root = 0.;
+      break;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      new_event->crossing.x = 0.;
+      new_event->crossing.y = 0.;
+      new_event->crossing.x_root = 0.;
+      new_event->crossing.y_root = 0.;
+      break;
+    default:
+      break;
+    }
   
-  return (GdkEvent*) new_event;
+  return new_event;
 }
 
+static gboolean
+gdk_event_is_allocated (const GdkEvent *event)
+{
+  if (event_hash)
+    return g_hash_table_lookup (event_hash, event) != NULL;
+
+  return FALSE;
+}
+/**
+ * gdk_event_copy:
+ * @event: a #GdkEvent
+ * 
+ * Copies a #GdkEvent, copying or incrementing the reference count of the
+ * resources associated with it (e.g. #GdkWindow's and strings).
+ * 
+ * Return value: a copy of @event. The returned #GdkEvent should be freed with
+ * gdk_event_free().
+ **/
 GdkEvent*
-gdk_event_copy (GdkEvent *event)
+gdk_event_copy (const GdkEvent *event)
 {
+  GdkEventPrivate *new_private;
   GdkEvent *new_event;
   
   g_return_val_if_fail (event != NULL, NULL);
   
-  new_event = gdk_event_new ();
-  
+  new_event = gdk_event_new (GDK_NOTHING);
+  new_private = (GdkEventPrivate *)new_event;
+
   *new_event = *event;
   if (new_event->any.window)
-    gdk_window_ref (new_event->any.window);
+    g_object_ref (new_event->any.window);
+
+  if (gdk_event_is_allocated (event))
+    {
+      GdkEventPrivate *private = (GdkEventPrivate *)event;
+
+      new_private->screen = private->screen;
+      new_private->device = private->device;
+    }
   
   switch (event->any.type)
     {
@@ -310,7 +458,7 @@ gdk_event_copy (GdkEvent *event)
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       if (event->crossing.subwindow != NULL)
-       gdk_window_ref (event->crossing.subwindow);
+       g_object_ref (event->crossing.subwindow);
       break;
       
     case GDK_DRAG_ENTER:
@@ -319,43 +467,59 @@ gdk_event_copy (GdkEvent *event)
     case GDK_DRAG_STATUS:
     case GDK_DROP_START:
     case GDK_DROP_FINISHED:
-      gdk_drag_context_ref (event->dnd.context);
+      g_object_ref (event->dnd.context);
+      break;
+      
+    case GDK_EXPOSE:
+    case GDK_DAMAGE:
+      if (event->expose.region)
+       new_event->expose.region = cairo_region_copy (event->expose.region);
+      break;
+      
+    case GDK_SETTING:
+      new_event->setting.name = g_strdup (new_event->setting.name);
+      break;
+
+    case GDK_BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      if (event->button.axes) 
+       new_event->button.axes = g_memdup (event->button.axes, 
+                                            sizeof (gdouble) * event->button.device->num_axes);
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      if (event->motion.axes) 
+       new_event->motion.axes = g_memdup (event->motion.axes, 
+                                          sizeof (gdouble) * event->motion.device->num_axes);
+      
       break;
       
     default:
       break;
     }
+
+  if (gdk_event_is_allocated (event))
+    _gdk_windowing_event_data_copy (event, new_event);
   
   return new_event;
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_event_free
- *
- *   Free a event structure obtained from gdk_event_copy.  Do not use
- *   with other event structures.
- *
- * Arguments:
- *   "event" is the event struct to free.
- *
- * Results:
- *
- * Side effects:
- *   The reference count of the window in the event is decreased and
- *   might be freed, too.
- *
- *-------------------------------------------------------------- */
-
+/**
+ * gdk_event_free:
+ * @event:  a #GdkEvent.
+ * 
+ * Frees a #GdkEvent, freeing or decrementing any resources associated with it.
+ * Note that this function should only be called with events returned from
+ * functions such as gdk_event_peek(), gdk_event_get(), gdk_event_copy()
+ * and gdk_event_new().
+ **/
 void
 gdk_event_free (GdkEvent *event)
 {
   g_return_if_fail (event != NULL);
 
-  g_assert (event_chunk != NULL); /* paranoid */
-  
   if (event->any.window)
-    gdk_window_unref (event->any.window);
+    g_object_unref (event->any.window);
   
   switch (event->any.type)
     {
@@ -367,7 +531,7 @@ gdk_event_free (GdkEvent *event)
     case GDK_ENTER_NOTIFY:
     case GDK_LEAVE_NOTIFY:
       if (event->crossing.subwindow != NULL)
-       gdk_window_unref (event->crossing.subwindow);
+       g_object_unref (event->crossing.subwindow);
       break;
       
     case GDK_DRAG_ENTER:
@@ -376,41 +540,49 @@ gdk_event_free (GdkEvent *event)
     case GDK_DRAG_STATUS:
     case GDK_DROP_START:
     case GDK_DROP_FINISHED:
-      gdk_drag_context_unref (event->dnd.context);
+      g_object_unref (event->dnd.context);
       break;
 
     case GDK_BUTTON_PRESS:
     case GDK_BUTTON_RELEASE:
-      if (event->button.axes)
-       g_free (event->button.axes);
+      g_free (event->button.axes);
       break;
-
+      
+    case GDK_EXPOSE:
+    case GDK_DAMAGE:
+      if (event->expose.region)
+       cairo_region_destroy (event->expose.region);
+      break;
+      
     case GDK_MOTION_NOTIFY:
-      if (event->motion.axes)
-       g_free (event->motion.axes);
+      g_free (event->motion.axes);
+      break;
+      
+    case GDK_SETTING:
+      g_free (event->setting.name);
       break;
       
     default:
       break;
     }
-  
-  g_mem_chunk_free (event_chunk, event);
+
+  _gdk_windowing_event_data_free (event);
+
+  g_hash_table_remove (event_hash, event);
+  g_slice_free (GdkEventPrivate, (GdkEventPrivate*) event);
 }
 
-/*
- *--------------------------------------------------------------
+/**
  * gdk_event_get_time:
- *    Get the timestamp from an event.
- *   arguments:
- *     event:
- *   results:
- *    The event's time stamp, if it has one, otherwise
- *    GDK_CURRENT_TIME.
- *--------------------------------------------------------------
- */
-
+ * @event: a #GdkEvent
+ * 
+ * Returns the time stamp from @event, if there is one; otherwise
+ * returns #GDK_CURRENT_TIME. If @event is %NULL, returns #GDK_CURRENT_TIME.
+ * 
+ * Return value: time stamp field from @event
+ **/
 guint32
-gdk_event_get_time (GdkEvent *event)
+gdk_event_get_time (const GdkEvent *event)
 {
   if (event)
     switch (event->type)
@@ -421,8 +593,9 @@ gdk_event_get_time (GdkEvent *event)
       case GDK_2BUTTON_PRESS:
       case GDK_3BUTTON_PRESS:
       case GDK_BUTTON_RELEASE:
-      case GDK_SCROLL:
        return event->button.time;
+      case GDK_SCROLL:
+        return event->scroll.time;
       case GDK_KEY_PRESS:
       case GDK_KEY_RELEASE:
        return event->key.time;
@@ -445,60 +618,280 @@ gdk_event_get_time (GdkEvent *event)
       case GDK_DROP_START:
       case GDK_DROP_FINISHED:
        return event->dnd.time;
-      default:                 /* use current time */
-       break;
+      case GDK_CLIENT_EVENT:
+      case GDK_VISIBILITY_NOTIFY:
+      case GDK_NO_EXPOSE:
+      case GDK_CONFIGURE:
+      case GDK_FOCUS_CHANGE:
+      case GDK_NOTHING:
+      case GDK_DAMAGE:
+      case GDK_DELETE:
+      case GDK_DESTROY:
+      case GDK_EXPOSE:
+      case GDK_MAP:
+      case GDK_UNMAP:
+      case GDK_WINDOW_STATE:
+      case GDK_SETTING:
+      case GDK_OWNER_CHANGE:
+      case GDK_GRAB_BROKEN:
+      case GDK_EVENT_LAST:
+        /* return current time */
+        break;
       }
   
   return GDK_CURRENT_TIME;
 }
 
 /**
- * gdk_event_get_axis:
- * @event: a #GdkEvent
- * @axis_use: the axis use to look for
- * @value: location to store the value found
+ * gdk_event_get_state:
+ * @event: a #GdkEvent or NULL
+ * @state: (out): return location for state
  * 
- * Extract the axis value for a particular axis use from
- * an event structure.
+ * If the event contains a "state" field, puts that field in @state. Otherwise
+ * stores an empty state (0). Returns %TRUE if there was a state field
+ * in the event. @event may be %NULL, in which case it's treated
+ * as if the event had no state field.
  * 
- * Return value: %TRUE if the specified axis was found, otherwise %FALSE
+ * Return value: %TRUE if there was a state field in the event 
  **/
 gboolean
-gdk_event_get_axis (GdkEvent   *event,
-                   GdkAxisUse  axis_use,
-                   gdouble    *value)
+gdk_event_get_state (const GdkEvent        *event,
+                     GdkModifierType       *state)
 {
-  gdouble *axes;
-  GdkDevice *device;
+  g_return_val_if_fail (state != NULL, FALSE);
   
-  g_return_val_if_fail (event != NULL, FALSE);
-  
-  if (axis_use == GDK_AXIS_X || axis_use == GDK_AXIS_Y)
-    {
-      gdouble x, y;
-      
-      switch (event->type)
-       {
-       case GDK_MOTION_NOTIFY:
-         x = event->motion.x;
-         y = event->motion.y;
-         break;
-       case GDK_SCROLL:
-         x = event->scroll.x;
-         y = event->scroll.y;
-         break;
-       case GDK_BUTTON_PRESS:
-       case GDK_BUTTON_RELEASE:
-         x = event->button.x;
-         y = event->button.y;
-         break;
-       case GDK_ENTER_NOTIFY:
-       case GDK_LEAVE_NOTIFY:
-         x = event->crossing.x;
-         y = event->crossing.y;
-         break;
-         
-       default:
+  if (event)
+    switch (event->type)
+      {
+      case GDK_MOTION_NOTIFY:
+       *state = event->motion.state;
+        return TRUE;
+      case GDK_BUTTON_PRESS:
+      case GDK_2BUTTON_PRESS:
+      case GDK_3BUTTON_PRESS:
+      case GDK_BUTTON_RELEASE:
+        *state =  event->button.state;
+        return TRUE;
+      case GDK_SCROLL:
+       *state =  event->scroll.state;
+        return TRUE;
+      case GDK_KEY_PRESS:
+      case GDK_KEY_RELEASE:
+       *state =  event->key.state;
+        return TRUE;
+      case GDK_ENTER_NOTIFY:
+      case GDK_LEAVE_NOTIFY:
+       *state =  event->crossing.state;
+        return TRUE;
+      case GDK_PROPERTY_NOTIFY:
+       *state =  event->property.state;
+        return TRUE;
+      case GDK_VISIBILITY_NOTIFY:
+      case GDK_CLIENT_EVENT:
+      case GDK_NO_EXPOSE:
+      case GDK_CONFIGURE:
+      case GDK_FOCUS_CHANGE:
+      case GDK_SELECTION_CLEAR:
+      case GDK_SELECTION_REQUEST:
+      case GDK_SELECTION_NOTIFY:
+      case GDK_PROXIMITY_IN:
+      case GDK_PROXIMITY_OUT:
+      case GDK_DAMAGE:
+      case GDK_DRAG_ENTER:
+      case GDK_DRAG_LEAVE:
+      case GDK_DRAG_MOTION:
+      case GDK_DRAG_STATUS:
+      case GDK_DROP_START:
+      case GDK_DROP_FINISHED:
+      case GDK_NOTHING:
+      case GDK_DELETE:
+      case GDK_DESTROY:
+      case GDK_EXPOSE:
+      case GDK_MAP:
+      case GDK_UNMAP:
+      case GDK_WINDOW_STATE:
+      case GDK_SETTING:
+      case GDK_OWNER_CHANGE:
+      case GDK_GRAB_BROKEN:
+      case GDK_EVENT_LAST:
+        /* no state field */
+        break;
+      }
+
+  *state = 0;
+  return FALSE;
+}
+
+/**
+ * gdk_event_get_coords:
+ * @event: a #GdkEvent
+ * @x_win: (out): location to put event window x coordinate
+ * @y_win: (out): location to put event window y coordinate
+ * 
+ * Extract the event window relative x/y coordinates from an event.
+ * 
+ * Return value: %TRUE if the event delivered event window coordinates
+ **/
+gboolean
+gdk_event_get_coords (const GdkEvent *event,
+                     gdouble        *x_win,
+                     gdouble        *y_win)
+{
+  gdouble x = 0, y = 0;
+  gboolean fetched = TRUE;
+  
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  switch (event->type)
+    {
+    case GDK_CONFIGURE:
+      x = event->configure.x;
+      y = event->configure.y;
+      break;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      x = event->crossing.x;
+      y = event->crossing.y;
+      break;
+    case GDK_SCROLL:
+      x = event->scroll.x;
+      y = event->scroll.y;
+      break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      x = event->button.x;
+      y = event->button.y;
+      break;
+    case GDK_MOTION_NOTIFY:
+      x = event->motion.x;
+      y = event->motion.y;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (x_win)
+    *x_win = x;
+  if (y_win)
+    *y_win = y;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_root_coords:
+ * @event: a #GdkEvent
+ * @x_root: (out): location to put root window x coordinate
+ * @y_root: (out): location to put root window y coordinate
+ * 
+ * Extract the root window relative x/y coordinates from an event.
+ * 
+ * Return value: %TRUE if the event delivered root window coordinates
+ **/
+gboolean
+gdk_event_get_root_coords (const GdkEvent *event,
+                          gdouble        *x_root,
+                          gdouble        *y_root)
+{
+  gdouble x = 0, y = 0;
+  gboolean fetched = TRUE;
+  
+  g_return_val_if_fail (event != NULL, FALSE);
+
+  switch (event->type)
+    {
+    case GDK_MOTION_NOTIFY:
+      x = event->motion.x_root;
+      y = event->motion.y_root;
+      break;
+    case GDK_SCROLL:
+      x = event->scroll.x_root;
+      y = event->scroll.y_root;
+      break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      x = event->button.x_root;
+      y = event->button.y_root;
+      break;
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+      x = event->crossing.x_root;
+      y = event->crossing.y_root;
+      break;
+    case GDK_DRAG_ENTER:
+    case GDK_DRAG_LEAVE:
+    case GDK_DRAG_MOTION:
+    case GDK_DRAG_STATUS:
+    case GDK_DROP_START:
+    case GDK_DROP_FINISHED:
+      x = event->dnd.x_root;
+      y = event->dnd.y_root;
+      break;
+    default:
+      fetched = FALSE;
+      break;
+    }
+
+  if (x_root)
+    *x_root = x;
+  if (y_root)
+    *y_root = y;
+
+  return fetched;
+}
+
+/**
+ * gdk_event_get_axis:
+ * @event: a #GdkEvent
+ * @axis_use: (out): the axis use to look for
+ * @value: (out): location to store the value found
+ * 
+ * Extract the axis value for a particular axis use from
+ * an event structure.
+ * 
+ * Return value: %TRUE if the specified axis was found, otherwise %FALSE
+ **/
+gboolean
+gdk_event_get_axis (const GdkEvent *event,
+                   GdkAxisUse      axis_use,
+                   gdouble        *value)
+{
+  gdouble *axes;
+  GdkDevice *device;
+  
+  g_return_val_if_fail (event != NULL, FALSE);
+  
+  if (axis_use == GDK_AXIS_X || axis_use == GDK_AXIS_Y)
+    {
+      gdouble x, y;
+      
+      switch (event->type)
+       {
+       case GDK_MOTION_NOTIFY:
+         x = event->motion.x;
+         y = event->motion.y;
+         break;
+       case GDK_SCROLL:
+         x = event->scroll.x;
+         y = event->scroll.y;
+         break;
+       case GDK_BUTTON_PRESS:
+       case GDK_BUTTON_RELEASE:
+         x = event->button.x;
+         y = event->button.y;
+         break;
+       case GDK_ENTER_NOTIFY:
+       case GDK_LEAVE_NOTIFY:
+         x = event->crossing.x;
+         y = event->crossing.y;
+         break;
+         
+       default:
          return FALSE;
        }
 
@@ -526,195 +919,625 @@ gdk_event_get_axis (GdkEvent   *event,
   return gdk_device_get_axis (device, axes, axis_use, value);
 }
 
-/*
- *--------------------------------------------------------------
- * gdk_set_show_events
+/**
+ * gdk_event_set_device:
+ * @event: a #GdkEvent
+ * @device: a #GdkDevice
  *
- *   Turns on/off the showing of events.
+ * Sets the device for @event to @device. The event must
+ * have been allocated by GTK+, for instance, by
+ * gdk_event_copy().
  *
- * Arguments:
- *   "show_events" is a boolean describing whether or
- *   not to show the events gdk receives.
+ * Since: 3.0
+ **/
+void
+gdk_event_set_device (GdkEvent  *event,
+                      GdkDevice *device)
+{
+  GdkEventPrivate *private;
+
+  g_return_if_fail (gdk_event_is_allocated (event));
+
+  private = (GdkEventPrivate *) event;
+
+  private->device = device;
+
+  switch (event->type)
+    {
+    case GDK_MOTION_NOTIFY:
+      event->motion.device = device;
+      break;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      event->button.device = device;
+      break;
+    case GDK_SCROLL:
+      event->scroll.device = device;
+      break;
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+      event->proximity.device = device;
+      break;
+    default:
+      break;
+    }
+}
+
+/**
+ * gdk_event_get_device:
+ * @event: a #GdkEvent.
  *
- * Results:
+ * If the event contains a "device" field, this function will return
+ * it, else it will return %NULL.
  *
- * Side effects:
- *   When "show_events" is TRUE, calls to "gdk_event_get"
- *   will output debugging informatin regarding the event
- *   received to stdout.
+ * Returns: a #GdkDevice, or %NULL.
  *
- *--------------------------------------------------------------
- */
-
-void
-gdk_set_show_events (gboolean show_events)
+ * Since: 3.0
+ **/
+GdkDevice *
+gdk_event_get_device (const GdkEvent *event)
 {
-  if (show_events)
-    gdk_debug_flags |= GDK_DEBUG_EVENTS;
-  else
-    gdk_debug_flags &= ~GDK_DEBUG_EVENTS;
+  g_return_val_if_fail (event != NULL, NULL);
+
+  if (gdk_event_is_allocated (event))
+    {
+      GdkEventPrivate *private = (GdkEventPrivate *) event;
+
+      if (private->device)
+        return private->device;
+    }
+
+  switch (event->type)
+    {
+    case GDK_MOTION_NOTIFY:
+      return event->motion.device;
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+      return event->button.device;
+    case GDK_SCROLL:
+      return event->scroll.device;
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+      return event->proximity.device;
+    default:
+      break;
+    }
+
+  /* Fallback if event has no device set */
+  switch (event->type)
+    {
+    case GDK_MOTION_NOTIFY:
+    case GDK_BUTTON_PRESS:
+    case GDK_2BUTTON_PRESS:
+    case GDK_3BUTTON_PRESS:
+    case GDK_BUTTON_RELEASE:
+    case GDK_ENTER_NOTIFY:
+    case GDK_LEAVE_NOTIFY:
+    case GDK_FOCUS_CHANGE:
+    case GDK_PROXIMITY_IN:
+    case GDK_PROXIMITY_OUT:
+    case GDK_DRAG_ENTER:
+    case GDK_DRAG_LEAVE:
+    case GDK_DRAG_MOTION:
+    case GDK_DRAG_STATUS:
+    case GDK_DROP_START:
+    case GDK_DROP_FINISHED:
+    case GDK_SCROLL:
+    case GDK_GRAB_BROKEN:
+    case GDK_KEY_PRESS:
+    case GDK_KEY_RELEASE:
+      {
+        GdkDisplay *display;
+        GdkDevice *core_pointer;
+
+        g_warning ("Event with type %d not holding a GdkDevice. "
+                   "It is most likely synthesized outside Gdk/GTK+\n",
+                   event->type);
+
+        display = gdk_drawable_get_display (event->any.window);
+        core_pointer = gdk_display_get_core_pointer (display);
+
+        if (event->type == GDK_KEY_PRESS ||
+            event->type == GDK_KEY_RELEASE)
+          return gdk_device_get_associated_device (core_pointer);
+        else
+          return core_pointer;
+      }
+      break;
+    default:
+      return NULL;
+    }
 }
 
-gboolean
-gdk_get_show_events (void)
+/**
+ * gdk_event_request_motions:
+ * @event: a valid #GdkEvent
+ *
+ * Request more motion notifies if @event is a motion notify hint event.
+ * This function should be used instead of gdk_window_get_pointer() to
+ * request further motion notifies, because it also works for extension
+ * events where motion notifies are provided for devices other than the
+ * core pointer. Coordinate extraction, processing and requesting more
+ * motion events from a %GDK_MOTION_NOTIFY event usually works like this:
+ *
+ * |[
+ * { 
+ *   /&ast; motion_event handler &ast;/
+ *   x = motion_event->x;
+ *   y = motion_event->y;
+ *   /&ast; handle (x,y) motion &ast;/
+ *   gdk_event_request_motions (motion_event); /&ast; handles is_hint events &ast;/
+ * }
+ * ]|
+ *
+ * Since: 2.12
+ **/
+void
+gdk_event_request_motions (const GdkEventMotion *event)
 {
-  return (gdk_debug_flags & GDK_DEBUG_EVENTS) != 0;
+  GdkDisplay *display;
+  
+  g_return_if_fail (event != NULL);
+  
+  if (event->type == GDK_MOTION_NOTIFY && event->is_hint)
+    {
+      gdk_device_get_state (event->device, event->window, NULL, NULL);
+      
+      display = gdk_drawable_get_display (event->window);
+      _gdk_display_enable_motion_hints (display, event->device);
+    }
 }
 
-static void
-gdk_io_destroy (gpointer data)
+static gboolean
+gdk_events_get_axis_distances (GdkEvent *event1,
+                               GdkEvent *event2,
+                               gdouble  *x_distance,
+                               gdouble  *y_distance,
+                               gdouble  *distance)
 {
-  GdkIOClosure *closure = data;
+  gdouble x1, x2, y1, y2;
+  gdouble xd, yd;
 
-  if (closure->notify)
-    closure->notify (closure->data);
+  if (!gdk_event_get_coords (event1, &x1, &y1) ||
+      !gdk_event_get_coords (event2, &x2, &y2))
+    return FALSE;
 
-  g_free (closure);
-}
+  xd = x2 - x1;
+  yd = y2 - y1;
 
-/* What do we do with G_IO_NVAL?
- */
-#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
-#define EXCEPTION_CONDITION (G_IO_PRI)
+  if (x_distance)
+    *x_distance = xd;
 
-static gboolean  
-gdk_io_invoke (GIOChannel   *source,
-              GIOCondition  condition,
-              gpointer      data)
-{
-  GdkIOClosure *closure = data;
-  GdkInputCondition gdk_cond = 0;
+  if (y_distance)
+    *y_distance = yd;
 
-  if (condition & READ_CONDITION)
-    gdk_cond |= GDK_INPUT_READ;
-  if (condition & WRITE_CONDITION)
-    gdk_cond |= GDK_INPUT_WRITE;
-  if (condition & EXCEPTION_CONDITION)
-    gdk_cond |= GDK_INPUT_EXCEPTION;
-
-  if (closure->condition & gdk_cond)
-    closure->function (closure->data, g_io_channel_unix_get_fd (source), gdk_cond);
+  if (distance)
+    *distance = sqrt ((xd * xd) + (yd * yd));
 
   return TRUE;
 }
 
-gint
-gdk_input_add_full (gint             source,
-                   GdkInputCondition condition,
-                   GdkInputFunction  function,
-                   gpointer          data,
-                   GdkDestroyNotify  destroy)
+/**
+ * gdk_events_get_distance:
+ * @event1: first #GdkEvent
+ * @event2: second #GdkEvent
+ * @distance: return location for the distance
+ *
+ * If both events have X/Y information, the distance between both coordinates
+ * (as in a straight line going from @event1 to @event2) will be returned.
+ *
+ * Returns: %TRUE if the distance could be calculated.
+ *
+ * Since: 3.0
+ **/
+gboolean
+gdk_events_get_distance (GdkEvent *event1,
+                         GdkEvent *event2,
+                         gdouble  *distance)
+{
+  return gdk_events_get_axis_distances (event1, event2,
+                                        NULL, NULL,
+                                        distance);
+}
+
+/**
+ * gdk_events_get_angle:
+ * @event1: first #GdkEvent
+ * @event2: second #GdkEvent
+ * @angle: return location for the relative angle between both events
+ *
+ * If both events contain X/Y information, this function will return %TRUE
+ * and return in @angle the relative angle from @event1 to @event2. The rotation
+ * direction for positive angles is from the positive X axis towards the positive
+ * Y axis.
+ *
+ * Returns: %TRUE if the angle could be calculated.
+ *
+ * Since: 3.0
+ **/
+gboolean
+gdk_events_get_angle (GdkEvent *event1,
+                      GdkEvent *event2,
+                      gdouble  *angle)
 {
-  guint result;
-  GdkIOClosure *closure = g_new (GdkIOClosure, 1);
-  GIOChannel *channel;
-  GIOCondition cond = 0;
+  gdouble x_distance, y_distance, distance;
+
+  if (!gdk_events_get_axis_distances (event1, event2,
+                                      &x_distance, &y_distance,
+                                      &distance))
+    return FALSE;
+
+  if (angle)
+    {
+      *angle = atan2 (x_distance, y_distance);
 
-  closure->function = function;
-  closure->condition = condition;
-  closure->notify = destroy;
-  closure->data = data;
+      /* Invert angle */
+      *angle = (2 * G_PI) - *angle;
 
-  if (condition & GDK_INPUT_READ)
-    cond |= READ_CONDITION;
-  if (condition & GDK_INPUT_WRITE)
-    cond |= WRITE_CONDITION;
-  if (condition & GDK_INPUT_EXCEPTION)
-    cond |= EXCEPTION_CONDITION;
+      /* Shift it 90° */
+      *angle += G_PI / 2;
 
-  channel = g_io_channel_unix_new (source);
-  result = g_io_add_watch_full (channel, G_PRIORITY_DEFAULT, cond, 
-                               gdk_io_invoke,
-                               closure, gdk_io_destroy);
-  g_io_channel_unref (channel);
+      /* And constraint it to 0°-360° */
+      *angle = fmod (*angle, 2 * G_PI);
+    }
 
-  return result;
+  return TRUE;
 }
 
-gint
-gdk_input_add (gint             source,
-              GdkInputCondition condition,
-              GdkInputFunction  function,
-              gpointer          data)
+/**
+ * gdk_events_get_center:
+ * @event1: first #GdkEvent
+ * @event2: second #GdkEvent
+ * @x: (out): return location for the X coordinate of the center
+ * @y: (out): return location for the Y coordinate of the center
+ *
+ * If both events contain X/Y information, the center of both coordinates
+ * will be returned in @x and @y.
+ *
+ * Returns: %TRUE if the center could be calculated.
+ *
+ * Since: 3.0
+ **/
+gboolean
+gdk_events_get_center (GdkEvent *event1,
+                       GdkEvent *event2,
+                       gdouble  *x,
+                       gdouble  *y)
 {
-  return gdk_input_add_full (source, condition, function, data, NULL);
+  gdouble x1, x2, y1, y2;
+
+  if (!gdk_event_get_coords (event1, &x1, &y1) ||
+      !gdk_event_get_coords (event2, &x2, &y2))
+    return FALSE;
+
+  if (x)
+    *x = (x2 + x1) / 2;
+
+  if (y)
+    *y = (y2 + y1) / 2;
+
+  return TRUE;
 }
 
+/**
+ * gdk_event_set_screen:
+ * @event: a #GdkEvent
+ * @screen: a #GdkScreen
+ * 
+ * Sets the screen for @event to @screen. The event must
+ * have been allocated by GTK+, for instance, by
+ * gdk_event_copy().
+ *
+ * Since: 2.2
+ **/
 void
-gdk_input_remove (gint tag)
+gdk_event_set_screen (GdkEvent  *event,
+                     GdkScreen *screen)
 {
-  g_source_remove (tag);
+  GdkEventPrivate *private;
+  
+  g_return_if_fail (gdk_event_is_allocated (event));
+
+  private = (GdkEventPrivate *)event;
+  
+  private->screen = screen;
 }
 
-GdkEvent*
-gdk_event_unqueue (void)
+/**
+ * gdk_event_get_screen:
+ * @event: a #GdkEvent
+ * 
+ * Returns the screen for the event. The screen is
+ * typically the screen for <literal>event->any.window</literal>, but
+ * for events such as mouse events, it is the screen
+ * where the pointer was when the event occurs -
+ * that is, the screen which has the root window 
+ * to which <literal>event->motion.x_root</literal> and
+ * <literal>event->motion.y_root</literal> are relative.
+ * 
+ * Return value: the screen for the event
+ *
+ * Since: 2.2
+ **/
+GdkScreen *
+gdk_event_get_screen (const GdkEvent *event)
 {
-  GdkEvent *event = NULL;
-  GList *tmp_list;
-
-  tmp_list = gdk_event_queue_find_first ();
-
-  if (tmp_list)
+  if (gdk_event_is_allocated (event))
     {
-      event = tmp_list->data;
-      gdk_event_queue_remove_link (tmp_list);
-      g_list_free_1 (tmp_list);
+      GdkEventPrivate *private = (GdkEventPrivate *)event;
+
+      if (private->screen)
+       return private->screen;
     }
 
-  return event;
+  if (event->any.window)
+    return gdk_drawable_get_screen (event->any.window);
+
+  return NULL;
 }
 
+/**
+ * gdk_set_show_events:
+ * @show_events:  %TRUE to output event debugging information.
+ * 
+ * Sets whether a trace of received events is output.
+ * Note that GTK+ must be compiled with debugging (that is,
+ * configured using the <option>--enable-debug</option> option)
+ * to use this option.
+ **/
 void
-gdk_synthesize_click (GdkEvent *event,
-                     gint      nclicks)
+gdk_set_show_events (gboolean show_events)
+{
+  if (show_events)
+    _gdk_debug_flags |= GDK_DEBUG_EVENTS;
+  else
+    _gdk_debug_flags &= ~GDK_DEBUG_EVENTS;
+}
+
+/**
+ * gdk_get_show_events:
+ * 
+ * Gets whether event debugging output is enabled.
+ * 
+ * Return value: %TRUE if event debugging output is enabled.
+ **/
+gboolean
+gdk_get_show_events (void)
+{
+  return (_gdk_debug_flags & GDK_DEBUG_EVENTS) != 0;
+}
+
+/* What do we do with G_IO_NVAL?
+ */
+#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR)
+#define EXCEPTION_CONDITION (G_IO_PRI)
+
+static void
+gdk_synthesize_click (GdkDisplay *display,
+                     GdkEvent   *event,
+                     gint        nclicks)
 {
   GdkEvent temp_event;
+  GdkEvent *event_copy;
+  GList *link;
   
   g_return_if_fail (event != NULL);
   
   temp_event = *event;
   temp_event.type = (nclicks == 2) ? GDK_2BUTTON_PRESS : GDK_3BUTTON_PRESS;
-  
-  gdk_event_put (&temp_event);
+
+  event_copy = gdk_event_copy (&temp_event);
+  link = _gdk_event_queue_append (display, event_copy);
 }
 
 void
-gdk_event_button_generate (GdkEvent *event)
+_gdk_event_button_generate (GdkDisplay *display,
+                           GdkEvent   *event)
 {
-  if ((event->button.time < (button_click_time[1] + TRIPLE_CLICK_TIME)) &&
-      (event->button.window == button_window[1]) &&
-      (event->button.button == button_number[1]))
+  GdkMultipleClickInfo *info;
+
+  info = g_hash_table_lookup (display->multiple_click_info, event->button.device);
+
+  if (G_UNLIKELY (!info))
     {
-      gdk_synthesize_click (event, 3);
-      
-      button_click_time[1] = 0;
-      button_click_time[0] = 0;
-      button_window[1] = NULL;
-      button_window[0] = 0;
-      button_number[1] = -1;
-      button_number[0] = -1;
+      info = g_new0 (GdkMultipleClickInfo, 1);
+      info->button_number[0] = info->button_number[1] = -1;
+
+      g_hash_table_insert (display->multiple_click_info,
+                           event->button.device, info);
     }
-  else if ((event->button.time < (button_click_time[0] + DOUBLE_CLICK_TIME)) &&
-          (event->button.window == button_window[0]) &&
-          (event->button.button == button_number[0]))
+
+  if ((event->button.time < (info->button_click_time[1] + 2 * display->double_click_time)) &&
+      (event->button.window == info->button_window[1]) &&
+      (event->button.button == info->button_number[1]) &&
+      (ABS (event->button.x - info->button_x[1]) <= display->double_click_distance) &&
+      (ABS (event->button.y - info->button_y[1]) <= display->double_click_distance))
     {
-      gdk_synthesize_click (event, 2);
+      gdk_synthesize_click (display, event, 3);
+
+      info->button_click_time[1] = 0;
+      info->button_click_time[0] = 0;
+      info->button_window[1] = NULL;
+      info->button_window[0] = NULL;
+      info->button_number[1] = -1;
+      info->button_number[0] = -1;
+      info->button_x[0] = info->button_x[1] = 0;
+      info->button_y[0] = info->button_y[1] = 0;
+    }
+  else if ((event->button.time < (info->button_click_time[0] + display->double_click_time)) &&
+          (event->button.window == info->button_window[0]) &&
+          (event->button.button == info->button_number[0]) &&
+          (ABS (event->button.x - info->button_x[0]) <= display->double_click_distance) &&
+          (ABS (event->button.y - info->button_y[0]) <= display->double_click_distance))
+    {
+      gdk_synthesize_click (display, event, 2);
       
-      button_click_time[1] = button_click_time[0];
-      button_click_time[0] = event->button.time;
-      button_window[1] = button_window[0];
-      button_window[0] = event->button.window;
-      button_number[1] = button_number[0];
-      button_number[0] = event->button.button;
+      info->button_click_time[1] = info->button_click_time[0];
+      info->button_click_time[0] = event->button.time;
+      info->button_window[1] = info->button_window[0];
+      info->button_window[0] = event->button.window;
+      info->button_number[1] = info->button_number[0];
+      info->button_number[0] = event->button.button;
+      info->button_x[1] = info->button_x[0];
+      info->button_x[0] = event->button.x;
+      info->button_y[1] = info->button_y[0];
+      info->button_y[0] = event->button.y;
     }
   else
     {
-      button_click_time[1] = 0;
-      button_click_time[0] = event->button.time;
-      button_window[1] = NULL;
-      button_window[0] = event->button.window;
-      button_number[1] = -1;
-      button_number[0] = event->button.button;
+      info->button_click_time[1] = 0;
+      info->button_click_time[0] = event->button.time;
+      info->button_window[1] = NULL;
+      info->button_window[0] = event->button.window;
+      info->button_number[1] = -1;
+      info->button_number[0] = event->button.button;
+      info->button_x[1] = 0;
+      info->button_x[0] = event->button.x;
+      info->button_y[1] = 0;
+      info->button_y[0] = event->button.y;
     }
 }
+
+void
+gdk_synthesize_window_state (GdkWindow     *window,
+                             GdkWindowState unset_flags,
+                             GdkWindowState set_flags)
+{
+  GdkEvent temp_event;
+  GdkWindowState old;
+  
+  g_return_if_fail (window != NULL);
+  
+  temp_event.window_state.window = window;
+  temp_event.window_state.type = GDK_WINDOW_STATE;
+  temp_event.window_state.send_event = FALSE;
+  
+  old = ((GdkWindowObject*) temp_event.window_state.window)->state;
+  
+  temp_event.window_state.new_window_state = old;
+  temp_event.window_state.new_window_state |= set_flags;
+  temp_event.window_state.new_window_state &= ~unset_flags;
+  temp_event.window_state.changed_mask = temp_event.window_state.new_window_state ^ old;
+
+  if (temp_event.window_state.new_window_state == old)
+    return; /* No actual work to do, nothing changed. */
+
+  /* Actually update the field in GdkWindow, this is sort of an odd
+   * place to do it, but seems like the safest since it ensures we expose no
+   * inconsistent state to the user.
+   */
+  
+  ((GdkWindowObject*) window)->state = temp_event.window_state.new_window_state;
+
+  if (temp_event.window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
+    _gdk_window_update_viewable (window);
+
+  /* We only really send the event to toplevels, since
+   * all the window states don't apply to non-toplevels.
+   * Non-toplevels do use the GDK_WINDOW_STATE_WITHDRAWN flag
+   * internally so we needed to update window->state.
+   */
+  switch (((GdkWindowObject*) window)->window_type)
+    {
+    case GDK_WINDOW_TOPLEVEL:
+    case GDK_WINDOW_DIALOG:
+    case GDK_WINDOW_TEMP: /* ? */
+      gdk_display_put_event (gdk_drawable_get_display (window), &temp_event);
+      break;
+      
+    case GDK_WINDOW_FOREIGN:
+    case GDK_WINDOW_ROOT:
+    case GDK_WINDOW_CHILD:
+      break;
+    }
+}
+
+/**
+ * gdk_display_set_double_click_time:
+ * @display: a #GdkDisplay
+ * @msec: double click time in milliseconds (thousandths of a second) 
+ * 
+ * Sets the double click time (two clicks within this time interval
+ * count as a double click and result in a #GDK_2BUTTON_PRESS event).
+ * Applications should <emphasis>not</emphasis> set this, it is a global 
+ * user-configured setting.
+ *
+ * Since: 2.2
+ **/
+void
+gdk_display_set_double_click_time (GdkDisplay *display,
+                                  guint       msec)
+{
+  display->double_click_time = msec;
+}
+
+/**
+ * gdk_set_double_click_time:
+ * @msec: double click time in milliseconds (thousandths of a second)
+ *
+ * Set the double click time for the default display. See
+ * gdk_display_set_double_click_time(). 
+ * See also gdk_display_set_double_click_distance().
+ * Applications should <emphasis>not</emphasis> set this, it is a 
+ * global user-configured setting.
+ **/
+void
+gdk_set_double_click_time (guint msec)
+{
+  gdk_display_set_double_click_time (gdk_display_get_default (), msec);
+}
+
+/**
+ * gdk_display_set_double_click_distance:
+ * @display: a #GdkDisplay
+ * @distance: distance in pixels
+ * 
+ * Sets the double click distance (two clicks within this distance
+ * count as a double click and result in a #GDK_2BUTTON_PRESS event).
+ * See also gdk_display_set_double_click_time().
+ * Applications should <emphasis>not</emphasis> set this, it is a global 
+ * user-configured setting.
+ *
+ * Since: 2.4
+ **/
+void
+gdk_display_set_double_click_distance (GdkDisplay *display,
+                                      guint       distance)
+{
+  display->double_click_distance = distance;
+}
+
+GType
+gdk_event_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkEvent"),
+                                            (GBoxedCopyFunc)gdk_event_copy,
+                                            (GBoxedFreeFunc)gdk_event_free);
+  return our_type;
+}
+
+/**
+ * gdk_setting_get:
+ * @name: the name of the setting.
+ * @value: location to store the value of the setting.
+ *
+ * Obtains a desktop-wide setting, such as the double-click time,
+ * for the default screen. See gdk_screen_get_setting().
+ *
+ * Returns: %TRUE if the setting existed and a value was stored
+ *   in @value, %FALSE otherwise.
+ **/
+gboolean
+gdk_setting_get (const gchar *name,
+                GValue      *value)
+{
+  return gdk_screen_get_setting (gdk_screen_get_default (), name, value);
+}