]> Pileus Git - ~andy/gtk/blobdiff - gdk/gdkdisplay.c
Revert name change
[~andy/gtk] / gdk / gdkdisplay.c
index e121e426dd3e4852e2242f295567ade741f62c6f..2a5b92c3bd622ab7edbd1c635676e6abb3812fe4 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <glib.h>
 #include "gdk.h"               /* gdk_event_send_client_message() */
 #include "gdkdisplay.h"
 #include "gdkinternals.h"
 #include "gdkmarshalers.h"
 #include "gdkscreen.h"
+#include "gdkalias.h"
 
 enum {
   CLOSED,
   LAST_SIGNAL
 };
 
-static void gdk_display_class_init (GdkDisplayClass *class);
-static void gdk_display_init       (GdkDisplay      *display);
 static void gdk_display_dispose    (GObject         *object);
 static void gdk_display_finalize   (GObject         *object);
 
 
-void       singlehead_get_pointer        (GdkDisplay       *display,
+static void       singlehead_get_pointer (GdkDisplay       *display,
                                          GdkScreen       **screen,
                                          gint             *x,
                                          gint             *y,
                                          GdkModifierType  *mask);
-GdkWindow* singlehead_window_get_pointer (GdkDisplay       *display,
-                                         GdkWindow        *window,
-                                         gint             *x,
-                                         gint             *y,
-                                         GdkModifierType  *mask);
-GdkWindow* singlehead_window_at_pointer  (GdkDisplay       *display,
-                                         gint             *win_x,
-                                         gint             *win_y);
-
-GdkWindow* singlehead_default_window_get_pointer (GdkWindow       *window,
-                                                 gint            *x,
-                                                 gint            *y,
-                                                 GdkModifierType *mask);
-GdkWindow* singlehead_default_window_at_pointer  (GdkScreen       *screen,
-                                                 gint            *win_x,
-                                                 gint            *win_y);
+static GdkWindow* singlehead_window_get_pointer (GdkDisplay       *display,
+                                                GdkWindow        *window,
+                                                gint             *x,
+                                                gint             *y,
+                                                GdkModifierType  *mask);
+static GdkWindow* singlehead_window_at_pointer  (GdkDisplay       *display,
+                                                gint             *win_x,
+                                                gint             *win_y);
+
+static GdkWindow* singlehead_default_window_get_pointer (GdkWindow       *window,
+                                                        gint            *x,
+                                                        gint            *y,
+                                                        GdkModifierType *mask);
+static GdkWindow* singlehead_default_window_at_pointer  (GdkScreen       *screen,
+                                                        gint            *win_x,
+                                                        gint            *win_y);
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-static GObjectClass *parent_class;
 static char *gdk_sm_client_id;
 
 static const GdkDisplayPointerHooks default_pointer_hooks = {
@@ -85,44 +84,28 @@ static const GdkPointerHooks singlehead_default_pointer_hooks = {
 
 static const GdkPointerHooks *singlehead_current_pointer_hooks = &singlehead_default_pointer_hooks;
 
-GType
-gdk_display_get_type (void)
-{
-
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info = {
-       sizeof (GdkDisplayClass),
-       (GBaseInitFunc) NULL,
-       (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gdk_display_class_init,
-       NULL,                   /* class_finalize */
-       NULL,                   /* class_data */
-       sizeof (GdkDisplay),
-       0,                      /* n_preallocs */
-       (GInstanceInitFunc) gdk_display_init
-      };
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                           "GdkDisplay", &object_info, 0);
-    }
-
-  return object_type;
-}
+G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)
 
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   
-  parent_class = g_type_class_peek_parent (class);
-
   object_class->finalize = gdk_display_finalize;
   object_class->dispose = gdk_display_dispose;
 
+  /**
+   * GdkDisplay::closed:
+   * @display: the object on which the signal is emitted
+   * @is_error: %TRUE if the display was closed due to an error
+   *
+   * The ::closed signal is emitted when the connection to the windowing
+   * system for @display is closed.
+   *
+   * Since: 2.2
+   */   
   signals[CLOSED] =
-    g_signal_new ("closed",
+    g_signal_new (g_intern_static_string ("closed"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GdkDisplayClass, closed),
@@ -141,8 +124,11 @@ gdk_display_init (GdkDisplay *display)
   display->button_click_time[0] = display->button_click_time[1] = 0;
   display->button_window[0] = display->button_window[1] = NULL;
   display->button_number[0] = display->button_number[1] = -1;
+  display->button_x[0] = display->button_x[1] = 0;
+  display->button_y[0] = display->button_y[1] = 0;
 
   display->double_click_time = 250;
+  display->double_click_distance = 5;
 
   display->pointer_hooks = &default_pointer_hooks;
 }
@@ -160,21 +146,32 @@ gdk_display_dispose (GObject *object)
   _gdk_displays = g_slist_remove (_gdk_displays, object);
 
   if (gdk_display_get_default() == display)
-    gdk_display_manager_set_default_display (gdk_display_manager_get(), NULL);
+    {
+      if (_gdk_displays)
+        gdk_display_manager_set_default_display (gdk_display_manager_get(),
+                                                 _gdk_displays->data);
+      else
+        gdk_display_manager_set_default_display (gdk_display_manager_get(),
+                                                 NULL);
+    }
+
+  G_OBJECT_CLASS (gdk_display_parent_class)->dispose (object);
 }
 
 static void
 gdk_display_finalize (GObject *object)
 {
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (gdk_display_parent_class)->finalize (object);
 }
 
 /**
  * gdk_display_close:
  * @display: a #GdkDisplay
  *
- * Closes the connection windowing system for the given display,
+ * Closes the connection to the windowing system for the given display,
  * and cleans up associated resources.
+ *
+ * Since: 2.2
  */
 void
 gdk_display_close (GdkDisplay *display)
@@ -201,6 +198,8 @@ gdk_display_close (GdkDisplay *display)
  * 
  * 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().
+ *
+ * Since: 2.2
  **/
 GdkEvent*
 gdk_display_get_event (GdkDisplay *display)
@@ -220,9 +219,11 @@ gdk_display_get_event (GdkDisplay *display)
  * not get more events from the windowing system.  It only checks the events
  * that have already been moved to the GDK event queue.)
  * 
- * Return value: a copy of the first #GdkEvent on the event queue, or %NULL if no
- * events are in the queue. The returned #GdkEvent should be freed with
+ * Return value: a copy of the first #GdkEvent on the event queue, or %NULL 
+ * if no events are in the queue. The returned #GdkEvent should be freed with
  * gdk_event_free().
+ *
+ * Since: 2.2
  **/
 GdkEvent*
 gdk_display_peek_event (GdkDisplay *display)
@@ -246,10 +247,12 @@ gdk_display_peek_event (GdkDisplay *display)
  *
  * Appends a copy of the given event onto the front of the event
  * queue for @display.
+ *
+ * Since: 2.2
  **/
 void
-gdk_display_put_event (GdkDisplay *display,
-                      GdkEvent   *event)
+gdk_display_put_event (GdkDisplay     *display,
+                      const GdkEvent *event)
 {
   g_return_if_fail (GDK_IS_DISPLAY (display));
   g_return_if_fail (event != NULL);
@@ -259,10 +262,11 @@ gdk_display_put_event (GdkDisplay *display,
 
 /**
  * gdk_pointer_ungrab:
- * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no timestamp is
- *        available.
+ * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no 
+ *  timestamp is available.
  *
- * Ungrabs the pointer, if it is grabbed by this application.
+ * Ungrabs the pointer on the default display, if it is grabbed by this 
+ * application.
  **/
 void
 gdk_pointer_ungrab (guint32 time)
@@ -273,7 +277,8 @@ gdk_pointer_ungrab (guint32 time)
 /**
  * gdk_pointer_is_grabbed:
  * 
- * Returns %TRUE if the pointer is currently grabbed by this application.
+ * Returns %TRUE if the pointer on the default display is currently 
+ * grabbed by this application.
  *
  * Note that this does not take the inmplicit pointer grab on button
  * presses into account.
@@ -291,7 +296,8 @@ gdk_pointer_is_grabbed (void)
  * @time_: a timestamp from a #GdkEvent, or %GDK_CURRENT_TIME if no
  *        timestamp is available.
  * 
- * Ungrabs the keyboard, if it is grabbed by this application.
+ * Ungrabs the keyboard on the default display, if it is grabbed by this 
+ * application.
  **/
 void
 gdk_keyboard_ungrab (guint32 time)
@@ -302,7 +308,7 @@ gdk_keyboard_ungrab (guint32 time)
 /**
  * gdk_beep:
  * 
- * Emits a short beep.
+ * Emits a short beep on the default display.
  **/
 void
 gdk_beep (void)
@@ -374,6 +380,8 @@ gdk_device_get_core_pointer (void)
  * 
  * Return value: the core pointer device; this is owned by the
  *   display and should not be freed.
+ *
+ * Since: 2.2
  **/
 GdkDevice *
 gdk_display_get_core_pointer (GdkDisplay *display)
@@ -435,6 +443,8 @@ _gdk_get_sm_client_id (void)
  * 
  * Gets the current location of the pointer and the current modifier
  * mask for a given display.
+ *
+ * Since: 2.2
  **/
 void
 gdk_display_get_pointer (GdkDisplay      *display,
@@ -473,6 +483,8 @@ gdk_display_get_pointer (GdkDisplay      *display,
  * another application).
  * 
  * Returns: the window under the mouse pointer, or %NULL
+ *
+ * Since: 2.2
  **/
 GdkWindow *
 gdk_display_get_window_at_pointer (GdkDisplay *display,
@@ -480,15 +492,18 @@ gdk_display_get_window_at_pointer (GdkDisplay *display,
                                   gint       *win_y)
 {
   gint tmp_x, tmp_y;
+  GdkWindow *window;
 
   g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
-  
-  return display->pointer_hooks->window_at_pointer (display, &tmp_x, &tmp_y);
+
+  window = display->pointer_hooks->window_at_pointer (display, &tmp_x, &tmp_y);
 
   if (win_x)
     *win_x = tmp_x;
   if (win_y)
     *win_y = tmp_y;
+
+  return window;
 }
 
 /**
@@ -505,6 +520,8 @@ gdk_display_get_window_at_pointer (GdkDisplay *display,
  * reason to use this facility.
  *
  * Return value: the previous pointer hook table
+ *
+ * Since: 2.2
  **/
 GdkDisplayPointerHooks *
 gdk_display_set_pointer_hooks (GdkDisplay                   *display,
@@ -523,7 +540,7 @@ gdk_display_set_pointer_hooks (GdkDisplay                   *display,
   return (GdkDisplayPointerHooks *)result;
 }
 
-void
+static void
 singlehead_get_pointer (GdkDisplay       *display,
                        GdkScreen       **screen,
                        gint             *x,
@@ -538,7 +555,7 @@ singlehead_get_pointer (GdkDisplay       *display,
   singlehead_current_pointer_hooks->get_pointer (root_window, x, y, mask);
 }
 
-GdkWindow*
+static GdkWindow*
 singlehead_window_get_pointer (GdkDisplay       *display,
                               GdkWindow        *window,
                               gint             *x,
@@ -548,7 +565,7 @@ singlehead_window_get_pointer (GdkDisplay       *display,
   return singlehead_current_pointer_hooks->get_pointer (window, x, y, mask);
 }
 
-GdkWindow*
+static GdkWindow*
 singlehead_window_at_pointer   (GdkDisplay *display,
                                gint       *win_x,
                                gint       *win_y)
@@ -559,7 +576,7 @@ singlehead_window_at_pointer   (GdkDisplay *display,
                                                              win_x, win_y);
 }
 
-GdkWindow*
+static GdkWindow*
 singlehead_default_window_get_pointer (GdkWindow       *window,
                                       gint            *x,
                                       gint            *y,
@@ -569,7 +586,7 @@ singlehead_default_window_get_pointer (GdkWindow       *window,
                                            window, x, y, mask);
 }
 
-GdkWindow*
+static GdkWindow*
 singlehead_default_window_at_pointer  (GdkScreen       *screen,
                                       gint            *win_x,
                                       gint            *win_y)
@@ -611,4 +628,5 @@ gdk_set_pointer_hooks (const GdkPointerHooks *new_hooks)
   return (GdkPointerHooks *)result;
 }
 
-
+#define __GDK_DISPLAY_C__
+#include "gdkaliasdef.c"