[mutter/wip/tablet-protocol-v2: 7/13] wayland: Implement zwp_tablet_pad_ring_v1



commit e678e4fea38bec4e767d66ec092fd874681236c0
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue May 10 17:10:25 2016 +0200

    wayland: Implement zwp_tablet_pad_ring_v1
    
    This object represents pad "wheels"

 src/Makefile.am                            |    2 +
 src/wayland/meta-wayland-tablet-pad-ring.c |  205 ++++++++++++++++++++++++++++
 src/wayland/meta-wayland-tablet-pad-ring.h |   58 ++++++++
 src/wayland/meta-wayland-types.h           |    1 +
 4 files changed, 266 insertions(+), 0 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 77e8e02..4929f36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -302,6 +302,8 @@ libmutter_la_SOURCES +=                             \
        wayland/meta-wayland-tablet-seat.h      \
        wayland/meta-wayland-tablet-tool.c      \
        wayland/meta-wayland-tablet-tool.h      \
+       wayland/meta-wayland-tablet-pad-ring.c  \
+       wayland/meta-wayland-tablet-pad-ring.h  \
        wayland/meta-wayland-touch.c            \
        wayland/meta-wayland-touch.h            \
        wayland/meta-wayland-surface.c          \
diff --git a/src/wayland/meta-wayland-tablet-pad-ring.c b/src/wayland/meta-wayland-tablet-pad-ring.c
new file mode 100644
index 0000000..cb21947
--- /dev/null
+++ b/src/wayland/meta-wayland-tablet-pad-ring.c
@@ -0,0 +1,205 @@
+/*
+ * Wayland Support
+ *
+ * Copyright (C) 2016 Red Hat
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ * Author: Carlos Garnacho <carlosg gnome org>
+ */
+
+#define _GNU_SOURCE
+
+#include "config.h"
+
+#include <glib.h>
+
+#include <wayland-server.h>
+#include "tablet-unstable-v1-server-protocol.h"
+
+#include "meta-surface-actor-wayland.h"
+#include "meta-wayland-private.h"
+#include "meta-wayland-tablet-pad.h"
+#include "meta-wayland-tablet-pad-ring.h"
+
+static void
+unbind_resource (struct wl_resource *resource)
+{
+  wl_list_remove (wl_resource_get_link (resource));
+}
+
+MetaWaylandTabletPadRing *
+meta_wayland_tablet_pad_ring_new (MetaWaylandTabletPad *pad)
+{
+  MetaWaylandTabletPadRing *ring;
+
+  ring = g_slice_new0 (MetaWaylandTabletPadRing);
+  wl_list_init (&ring->resource_list);
+  wl_list_init (&ring->focus_resource_list);
+  ring->pad = pad;
+
+  g_print ("create ring %p: %p\n", pad, ring);
+
+  return ring;
+}
+
+void
+meta_wayland_tablet_pad_ring_free (MetaWaylandTabletPadRing *ring)
+{
+  struct wl_resource *resource, *next;
+
+  g_print ("free ring: %p %p\n", ring, ring->pad);
+
+  wl_resource_for_each_safe (resource, next, &ring->resource_list)
+    {
+      zwp_tablet_tool_v1_send_removed (resource);
+      wl_list_remove (wl_resource_get_link (resource));
+      wl_list_init (wl_resource_get_link (resource));
+    }
+
+  g_slice_free (MetaWaylandTabletPadRing, ring);
+}
+
+static void
+tablet_pad_ring_set_feedback (struct wl_client   *client,
+                              struct wl_resource *resource,
+                              const char         *str)
+{
+  /* FIXME */
+}
+
+static void
+tablet_pad_ring_destroy (struct wl_client   *client,
+                         struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static const struct zwp_tablet_pad_ring_v1_interface ring_interface = {
+  tablet_pad_ring_set_feedback,
+  tablet_pad_ring_destroy,
+};
+
+struct wl_resource *
+meta_wayland_tablet_pad_ring_create_new_resource (MetaWaylandTabletPadRing *ring,
+                                                  struct wl_client         *client,
+                                                  struct wl_resource       *seat_resource,
+                                                  uint32_t                  id)
+{
+  struct wl_resource *resource;
+
+  resource = wl_resource_create (client, &zwp_tablet_pad_ring_v1_interface,
+                                 wl_resource_get_version (seat_resource), id);
+  wl_resource_set_implementation (resource, &ring_interface,
+                                  ring, unbind_resource);
+  wl_resource_set_user_data (resource, ring);
+  wl_list_insert (&ring->resource_list, wl_resource_get_link (resource));
+
+  return resource;
+}
+
+struct wl_resource *
+meta_wayland_tablet_pad_ring_lookup_resource (MetaWaylandTabletPadRing *ring,
+                                              struct wl_client         *client)
+{
+  struct wl_resource *resource;
+
+  resource = wl_resource_find_for_client (&ring->resource_list, client);
+
+  if (!resource)
+    resource = wl_resource_find_for_client (&ring->focus_resource_list, client);
+
+  return resource;
+}
+
+gboolean
+meta_wayland_tablet_pad_ring_handle_event (MetaWaylandTabletPadRing *ring,
+                                           const ClutterEvent       *event)
+{
+  struct wl_list *l = &ring->focus_resource_list;
+  enum zwp_tablet_pad_ring_v1_source source;
+  struct wl_resource *resource;
+
+  if (wl_list_empty (l))
+    return FALSE;
+  if (event->type != CLUTTER_PAD_RING)
+    return FALSE;
+
+  if (event->pad_ring.ring_source == CLUTTER_INPUT_DEVICE_PAD_SOURCE_FINGER)
+    source = ZWP_TABLET_PAD_RING_V1_SOURCE_FINGER;
+  else
+    source = ZWP_TABLET_PAD_RING_V1_SOURCE_UNKNOWN;
+
+  wl_resource_for_each (resource, l)
+    {
+      gdouble angle = event->pad_ring.angle;
+
+      zwp_tablet_pad_ring_v1_send_source (resource, source);
+
+      if (angle >= 0)
+        zwp_tablet_pad_ring_v1_send_angle (resource, (uint32_t) (angle * 100));
+      else
+        zwp_tablet_pad_ring_v1_send_stop (resource, source);
+
+      zwp_tablet_pad_ring_v1_send_frame (resource,
+                                         clutter_event_get_time (event));
+    }
+
+  return TRUE;
+}
+
+static void
+move_resources (struct wl_list *destination, struct wl_list *source)
+{
+  wl_list_insert_list (destination, source);
+  wl_list_init (source);
+}
+
+static void
+move_resources_for_client (struct wl_list *destination,
+                          struct wl_list *source,
+                          struct wl_client *client)
+{
+  struct wl_resource *resource, *tmp;
+  wl_resource_for_each_safe (resource, tmp, source)
+    {
+      if (wl_resource_get_client (resource) == client)
+        {
+          wl_list_remove (wl_resource_get_link (resource));
+          wl_list_insert (destination, wl_resource_get_link (resource));
+        }
+    }
+}
+
+void
+meta_wayland_tablet_pad_ring_sync_focus (MetaWaylandTabletPadRing *ring)
+{
+  struct wl_list *l = &ring->focus_resource_list;
+
+  g_print ("update focus: %p\n", ring);
+
+  if (!wl_list_empty (l))
+    {
+      move_resources (&ring->resource_list, &ring->focus_resource_list);
+    }
+
+  if (ring->pad->focus_surface != NULL)
+    {
+      move_resources_for_client (&ring->focus_resource_list,
+                                 &ring->resource_list,
+                                 wl_resource_get_client (ring->pad->focus_surface->resource));
+    }
+}
diff --git a/src/wayland/meta-wayland-tablet-pad-ring.h b/src/wayland/meta-wayland-tablet-pad-ring.h
new file mode 100644
index 0000000..e434354
--- /dev/null
+++ b/src/wayland/meta-wayland-tablet-pad-ring.h
@@ -0,0 +1,58 @@
+/*
+ * Wayland Support
+ *
+ * Copyright (C) 2016 Red Hat
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg gnome org>
+ */
+
+#ifndef META_WAYLAND_TABLET_PAD_RING_H
+#define META_WAYLAND_TABLET_PAD_RING_H
+
+#include <wayland-server.h>
+
+#include <glib.h>
+
+#include "meta-wayland-types.h"
+#include "meta-cursor-renderer.h"
+
+struct _MetaWaylandTabletPadRing
+{
+  MetaWaylandTabletPad *pad;
+
+  struct wl_list resource_list;
+  struct wl_list focus_resource_list;
+};
+
+MetaWaylandTabletPadRing * meta_wayland_tablet_pad_ring_new  (MetaWaylandTabletPad *pad);
+void                       meta_wayland_tablet_pad_ring_free (MetaWaylandTabletPadRing *ring);
+
+struct wl_resource *
+             meta_wayland_tablet_pad_ring_create_new_resource (MetaWaylandTabletPadRing *ring,
+                                                               struct wl_client         *client,
+                                                               struct wl_resource       *pad_resource,
+                                                               uint32_t                  id);
+struct wl_resource *
+             meta_wayland_tablet_pad_ring_lookup_resource     (MetaWaylandTabletPadRing *ring,
+                                                               struct wl_client         *client);
+
+gboolean     meta_wayland_tablet_pad_ring_handle_event        (MetaWaylandTabletPadRing *ring,
+                                                               const ClutterEvent       *event);
+
+void         meta_wayland_tablet_pad_ring_sync_focus          (MetaWaylandTabletPadRing *ring);
+
+#endif /* META_WAYLAND_TABLET_PAD_RING_H */
+
diff --git a/src/wayland/meta-wayland-types.h b/src/wayland/meta-wayland-types.h
index e56182c..c40b940 100644
--- a/src/wayland/meta-wayland-types.h
+++ b/src/wayland/meta-wayland-types.h
@@ -41,6 +41,7 @@ typedef struct _MetaWaylandTabletManager MetaWaylandTabletManager;
 typedef struct _MetaWaylandTabletSeat MetaWaylandTabletSeat;
 typedef struct _MetaWaylandTabletTool MetaWaylandTabletTool;
 typedef struct _MetaWaylandTablet MetaWaylandTablet;
+typedef struct _MetaWaylandTabletPadRing MetaWaylandTabletPadRing;
 
 typedef struct _MetaWaylandBuffer MetaWaylandBuffer;
 typedef struct _MetaWaylandRegion MetaWaylandRegion;


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