[gtk+/gdk-backend-quartz] quartz: Rename GdkDeviceCore -> GdkQuartzDeviceCore



commit 27f5b0aa7c7a7f7f058ce46346a9f2e3351c6530
Author: Kristian Rietveld <kris gtk org>
Date:   Wed Dec 22 17:25:46 2010 +0100

    quartz: Rename GdkDeviceCore -> GdkQuartzDeviceCore

 gdk/quartz/Makefile.am             |    3 +-
 gdk/quartz/gdkdevice-core-quartz.c |  366 ++++++++++++++++++++++++++++++++++++
 gdk/quartz/gdkdevice-core-quartz.h |   51 +++++
 gdk/quartz/gdkdevice-core.c        |  366 ------------------------------------
 gdk/quartz/gdkdevice-core.h        |   51 -----
 gdk/quartz/gdkdevicemanager-core.c |    6 +-
 6 files changed, 422 insertions(+), 421 deletions(-)
---
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 57c602d..076858a 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -23,7 +23,8 @@ libgdk_quartz_la_SOURCES =    	\
 	GdkQuartzWindow.h	\
 	gdkcursor-quartz.c	\
 	gdkcursor-quartz.h	\
-	gdkdevice-core.c	\
+	gdkdevice-core-quartz.c	\
+	gdkdevice-core-quartz.h	\
 	gdkdevicemanager-core.c	\
 	gdkdisplay-quartz.c	\
 	gdkdisplay-quartz.h	\
diff --git a/gdk/quartz/gdkdevice-core-quartz.c b/gdk/quartz/gdkdevice-core-quartz.c
new file mode 100644
index 0000000..9aaba34
--- /dev/null
+++ b/gdk/quartz/gdkdevice-core-quartz.c
@@ -0,0 +1,366 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2009 Carlos Garnacho <carlosg gnome org>
+ * Copyright (C) 2010 Kristian Rietveld <kris gtk org>
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "config.h"
+
+#include <gdk/gdkdisplayprivate.h>
+
+#import "GdkQuartzView.h"
+#include "gdkwindow-quartz.h"
+#include "gdkcursor-quartz.h"
+#include "gdkprivate-quartz.h"
+#include "gdkdevice-core-quartz.h"
+
+static gboolean gdk_quartz_device_core_get_history (GdkDevice      *device,
+                                                    GdkWindow      *window,
+                                                    guint32         start,
+                                                    guint32         stop,
+                                                    GdkTimeCoord ***events,
+                                                    gint           *n_events);
+static void gdk_quartz_device_core_get_state (GdkDevice       *device,
+                                              GdkWindow       *window,
+                                              gdouble         *axes,
+                                              GdkModifierType *mask);
+static void gdk_quartz_device_core_set_window_cursor (GdkDevice *device,
+                                                      GdkWindow *window,
+                                                      GdkCursor *cursor);
+static void gdk_quartz_device_core_warp (GdkDevice *device,
+                                         GdkScreen *screen,
+                                         gint       x,
+                                         gint       y);
+static gboolean gdk_quartz_device_core_query_state (GdkDevice        *device,
+                                                    GdkWindow        *window,
+                                                    GdkWindow       **root_window,
+                                                    GdkWindow       **child_window,
+                                                    gint             *root_x,
+                                                    gint             *root_y,
+                                                    gint             *win_x,
+                                                    gint             *win_y,
+                                                    GdkModifierType  *mask);
+static GdkGrabStatus gdk_quartz_device_core_grab   (GdkDevice     *device,
+                                                    GdkWindow     *window,
+                                                    gboolean       owner_events,
+                                                    GdkEventMask   event_mask,
+                                                    GdkWindow     *confine_to,
+                                                    GdkCursor     *cursor,
+                                                    guint32        time_);
+static void          gdk_quartz_device_core_ungrab (GdkDevice     *device,
+                                                    guint32        time_);
+static GdkWindow * gdk_quartz_device_core_window_at_position (GdkDevice       *device,
+                                                              gint            *win_x,
+                                                              gint            *win_y,
+                                                              GdkModifierType *mask,
+                                                              gboolean         get_toplevel);
+static void      gdk_quartz_device_core_select_window_events (GdkDevice       *device,
+                                                              GdkWindow       *window,
+                                                              GdkEventMask     event_mask);
+
+
+G_DEFINE_TYPE (GdkQuartzDeviceCore, gdk_quartz_device_core, GDK_TYPE_DEVICE)
+
+static void
+gdk_quartz_device_core_class_init (GdkQuartzDeviceCoreClass *klass)
+{
+  GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass);
+
+  device_class->get_history = gdk_quartz_device_core_get_history;
+  device_class->get_state = gdk_quartz_device_core_get_state;
+  device_class->set_window_cursor = gdk_quartz_device_core_set_window_cursor;
+  device_class->warp = gdk_quartz_device_core_warp;
+  device_class->query_state = gdk_quartz_device_core_query_state;
+  device_class->grab = gdk_quartz_device_core_grab;
+  device_class->ungrab = gdk_quartz_device_core_ungrab;
+  device_class->window_at_position = gdk_quartz_device_core_window_at_position;
+  device_class->select_window_events = gdk_quartz_device_core_select_window_events;
+}
+
+static void
+gdk_quartz_device_core_init (GdkQuartzDeviceCore *quartz_device_core)
+{
+  GdkDevice *device;
+
+  device = GDK_DEVICE (quartz_device_core);
+
+  _gdk_device_add_axis (device, GDK_NONE, GDK_AXIS_X, 0, 0, 1);
+  _gdk_device_add_axis (device, GDK_NONE, GDK_AXIS_Y, 0, 0, 1);
+}
+
+static gboolean
+gdk_quartz_device_core_get_history (GdkDevice      *device,
+                                    GdkWindow      *window,
+                                    guint32         start,
+                                    guint32         stop,
+                                    GdkTimeCoord ***events,
+                                    gint           *n_events)
+{
+  return FALSE;
+}
+
+static void
+gdk_quartz_device_core_get_state (GdkDevice       *device,
+                                  GdkWindow       *window,
+                                  gdouble         *axes,
+                                  GdkModifierType *mask)
+{
+  gint x_int, y_int;
+
+  gdk_window_get_pointer (window, &x_int, &y_int, mask);
+
+  if (axes)
+    {
+      axes[0] = x_int;
+      axes[1] = y_int;
+    }
+}
+
+static void
+translate_coords_to_child_coords (GdkWindow *parent,
+                                  GdkWindow *child,
+                                  gint      *x,
+                                  gint      *y)
+{
+  GdkWindow *current = child;
+
+  if (child == parent)
+    return;
+
+  while (current != parent)
+    {
+      gint tmp_x, tmp_y;
+
+      gdk_window_get_origin (current, &tmp_x, &tmp_y);
+
+      *x -= tmp_x;
+      *y -= tmp_y;
+
+      current = gdk_window_get_effective_parent (current);
+    }
+}
+
+static void
+gdk_quartz_device_core_set_window_cursor (GdkDevice *device,
+                                          GdkWindow *window,
+                                          GdkCursor *cursor)
+{
+  GdkQuartzCursor *cursor_private;
+  NSCursor *nscursor;
+
+  cursor_private = (GdkQuartzCursor *) cursor;
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
+  if (!cursor)
+    nscursor = [NSCursor arrowCursor];
+  else
+    nscursor = cursor_private->nscursor;
+
+  [nscursor set];
+}
+
+static void
+gdk_quartz_device_core_warp (GdkDevice *device,
+                             GdkScreen *screen,
+                             gint       x,
+                             gint       y)
+{
+  CGDisplayMoveCursorToPoint (CGMainDisplayID (), CGPointMake (x, y));
+}
+
+static GdkWindow *
+gdk_quartz_device_core_query_state_helper (GdkWindow       *window,
+                                           GdkDevice       *device,
+                                           gint            *x,
+                                           gint            *y,
+                                           GdkModifierType *mask)
+{
+  GdkWindow *toplevel;
+  NSPoint point;
+  gint x_tmp, y_tmp;
+  GdkWindow *found_window;
+
+  g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), NULL);
+
+  if (GDK_WINDOW_DESTROYED (window))
+    {
+      *x = 0;
+      *y = 0;
+      *mask = 0;
+      return NULL;
+    }
+
+  toplevel = gdk_window_get_effective_toplevel (window);
+
+  *mask = _gdk_quartz_events_get_current_event_mask ();
+
+  /* Get the y coordinate, needs to be flipped. */
+  if (window == _gdk_root)
+    {
+      point = [NSEvent mouseLocation];
+      _gdk_quartz_window_nspoint_to_gdk_xy (point, &x_tmp, &y_tmp);
+    }
+  else
+    {
+      GdkWindowImplQuartz *impl;
+      NSWindow *nswindow;
+
+      impl = GDK_WINDOW_IMPL_QUARTZ (toplevel->impl);
+      nswindow = impl->toplevel;
+
+      point = [nswindow mouseLocationOutsideOfEventStream];
+
+      x_tmp = point.x;
+      y_tmp = toplevel->height - point.y;
+
+      window = toplevel;
+    }
+
+  found_window = _gdk_quartz_window_find_child (window, x_tmp, y_tmp,
+                                                FALSE);
+
+  if (found_window == _gdk_root)
+    found_window = NULL;
+  else if (found_window)
+    translate_coords_to_child_coords (window, found_window,
+                                      &x_tmp, &y_tmp);
+
+  if (x)
+    *x = x_tmp;
+
+  if (y)
+    *y = y_tmp;
+
+  return found_window;
+}
+
+static gboolean
+gdk_quartz_device_core_query_state (GdkDevice        *device,
+                                    GdkWindow        *window,
+                                    GdkWindow       **root_window,
+                                    GdkWindow       **child_window,
+                                    gint             *root_x,
+                                    gint             *root_y,
+                                    gint             *win_x,
+                                    gint             *win_y,
+                                    GdkModifierType  *mask)
+{
+  GdkDisplay *display;
+  GdkWindow *found_window;
+  NSPoint point;
+  gint x_tmp, y_tmp;
+
+  found_window = gdk_quartz_device_core_query_state_helper (window, device,
+                                                            win_x, win_y,
+                                                            mask);
+  if (!found_window)
+    return FALSE;
+
+  display = gdk_window_get_display (window);
+
+  if (root_window)
+    *root_window = _gdk_root;
+
+  if (child_window)
+    *child_window = found_window;
+
+  point = [NSEvent mouseLocation];
+  _gdk_quartz_window_nspoint_to_gdk_xy (point, &x_tmp, &y_tmp);
+
+  if (root_x)
+    *root_x = x_tmp;
+
+  if (root_y)
+    *root_y = y_tmp;
+
+  return TRUE;
+}
+
+static GdkGrabStatus
+gdk_quartz_device_core_grab (GdkDevice    *device,
+                             GdkWindow    *window,
+                             gboolean      owner_events,
+                             GdkEventMask  event_mask,
+                             GdkWindow    *confine_to,
+                             GdkCursor    *cursor,
+                             guint32       time_)
+{
+  /* Should remain empty */
+  return GDK_GRAB_SUCCESS;
+}
+
+static void
+gdk_quartz_device_core_ungrab (GdkDevice *device,
+                               guint32    time_)
+{
+  GdkDeviceGrabInfo *grab;
+
+  grab = _gdk_display_get_last_device_grab (_gdk_display, device);
+  if (grab)
+    grab->serial_end = 0;
+
+  _gdk_display_device_grab_update (_gdk_display, device, NULL, 0);
+}
+
+static GdkWindow *
+gdk_quartz_device_core_window_at_position (GdkDevice       *device,
+                                           gint            *win_x,
+                                           gint            *win_y,
+                                           GdkModifierType *mask,
+                                           gboolean         get_toplevel)
+{
+  GdkDisplay *display;
+  GdkScreen *screen;
+  GdkWindow *found_window;
+  NSPoint point;
+  gint x_tmp, y_tmp;
+
+  display = gdk_device_get_display (device);
+  screen = gdk_display_get_default_screen (display);
+
+  /* Get mouse coordinates, find window under the mouse pointer */
+  point = [NSEvent mouseLocation];
+  _gdk_quartz_window_nspoint_to_gdk_xy (point, &x_tmp, &y_tmp);
+
+  found_window = _gdk_quartz_window_find_child (_gdk_root, x_tmp, y_tmp,
+                                                get_toplevel);
+
+  if (found_window)
+    translate_coords_to_child_coords (_gdk_root, found_window,
+                                      &x_tmp, &y_tmp);
+
+  if (win_x)
+    *win_x = found_window ? x_tmp : -1;
+
+  if (win_y)
+    *win_y = found_window ? y_tmp : -1;
+
+  if (mask)
+    *mask = _gdk_quartz_events_get_current_event_mask ();
+
+  return found_window;
+}
+
+static void
+gdk_quartz_device_core_select_window_events (GdkDevice    *device,
+                                             GdkWindow    *window,
+                                             GdkEventMask  event_mask)
+{
+  /* The mask is set in the common code. */
+}
diff --git a/gdk/quartz/gdkdevice-core-quartz.h b/gdk/quartz/gdkdevice-core-quartz.h
new file mode 100644
index 0000000..abf6892
--- /dev/null
+++ b/gdk/quartz/gdkdevice-core-quartz.h
@@ -0,0 +1,51 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2009 Carlos Garnacho <carlosg gnome org>
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef __GDK_QUARTZ_DEVICE_CORE_H__
+#define __GDK_QUARTZ_DEVICE_CORE_H__
+
+#include <gdk/gdkdeviceprivate.h>
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_QUARTZ_DEVICE_CORE         (gdk_quartz_device_core_get_type ())
+#define GDK_QUARTZ_DEVICE_CORE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_QUARTZ_DEVICE_CORE, GdkQuartzDeviceCore))
+#define GDK_QUARTZ_DEVICE_CORE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), GDK_TYPE_QUARTZ_DEVICE_CORE, GdkQuartzDeviceCoreClass))
+#define GDK_IS_QUARTZ_DEVICE_CORE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_QUARTZ_DEVICE_CORE))
+#define GDK_IS_QUARTZ_DEVICE_CORE_CLASS(c)  (G_TYPE_CHECK_CLASS_TYPE ((c), GDK_TYPE_QUARTZ_DEVICE_CORE))
+#define GDK_QUARTZ_DEVICE_CORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDK_TYPE_QUARTZ_DEVICE_CORE, GdkQuartzDeviceCoreClass))
+
+typedef struct _GdkQuartzDeviceCore GdkQuartzDeviceCore;
+typedef struct _GdkQuartzDeviceCoreClass GdkQuartzDeviceCoreClass;
+
+struct _GdkQuartzDeviceCore
+{
+  GdkDevice parent_instance;
+};
+
+struct _GdkQuartzDeviceCoreClass
+{
+  GdkDeviceClass parent_class;
+};
+
+GType gdk_quartz_device_core_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* __GDK_QUARTZ_DEVICE_CORE_H__ */
diff --git a/gdk/quartz/gdkdevicemanager-core.c b/gdk/quartz/gdkdevicemanager-core.c
index e96e9a9..c05e617 100644
--- a/gdk/quartz/gdkdevicemanager-core.c
+++ b/gdk/quartz/gdkdevicemanager-core.c
@@ -22,7 +22,7 @@
 #include <gdk/gdktypes.h>
 #include <gdk/gdkdevicemanager.h>
 #include "gdkdevicemanager-core.h"
-#include "gdkdevice-core.h"
+#include "gdkdevice-core-quartz.h"
 #include "gdkkeysyms.h"
 
 
@@ -55,7 +55,7 @@ static GdkDevice *
 create_core_pointer (GdkDeviceManager *device_manager,
                      GdkDisplay       *display)
 {
-  return g_object_new (GDK_TYPE_DEVICE_CORE,
+  return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
                        "name", "Core Pointer",
                        "type", GDK_DEVICE_TYPE_MASTER,
                        "input-source", GDK_SOURCE_MOUSE,
@@ -70,7 +70,7 @@ static GdkDevice *
 create_core_keyboard (GdkDeviceManager *device_manager,
                       GdkDisplay       *display)
 {
-  return g_object_new (GDK_TYPE_DEVICE_CORE,
+  return g_object_new (GDK_TYPE_QUARTZ_DEVICE_CORE,
                        "name", "Core Keyboard",
                        "type", GDK_DEVICE_TYPE_MASTER,
                        "input-source", GDK_SOURCE_KEYBOARD,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]