wayland: Implement wl_pointer_gestures

The global wl_pointer_gestures object is now created, effectively
bridging pinch/swipe gestures with clients, so they're now
accessible to clients implementing the protocol.
This commit is contained in:
Carlos Garnacho 2015-07-22 16:50:20 +02:00
parent 0db347d642
commit 3b17f67b97
6 changed files with 119 additions and 0 deletions

View File

@ -255,6 +255,8 @@ libmutter_la_SOURCES += \
wayland/meta-wayland-data-device.c \ wayland/meta-wayland-data-device.c \
wayland/meta-wayland-data-device.h \ wayland/meta-wayland-data-device.h \
wayland/meta-wayland-data-device-private.h \ wayland/meta-wayland-data-device-private.h \
wayland/meta-wayland-pointer-gestures.c \
wayland/meta-wayland-pointer-gestures.h \
wayland/meta-wayland-pointer-gesture-swipe.c \ wayland/meta-wayland-pointer-gesture-swipe.c \
wayland/meta-wayland-pointer-gesture-swipe.h \ wayland/meta-wayland-pointer-gesture-swipe.h \
wayland/meta-wayland-pointer-gesture-pinch.c \ wayland/meta-wayland-pointer-gesture-pinch.c \

View File

@ -0,0 +1,82 @@
/*
* Wayland Support
*
* Copyright (C) 2015 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 "meta-wayland-pointer-gestures.h"
#include "pointer-gestures-server-protocol.h"
#include "meta-wayland-versions.h"
#include "meta-wayland-private.h"
static void
gestures_get_swipe (struct wl_client *client,
struct wl_resource *resource,
uint32_t id,
struct wl_resource *pointer_resource)
{
MetaWaylandPointer *pointer = wl_resource_get_user_data (pointer_resource);
meta_wayland_pointer_gesture_swipe_create_new_resource (pointer, client, resource, id);
}
static void
gestures_get_pinch (struct wl_client *client,
struct wl_resource *resource,
uint32_t id,
struct wl_resource *pointer_resource)
{
MetaWaylandPointer *pointer = wl_resource_get_user_data (pointer_resource);
meta_wayland_pointer_gesture_pinch_create_new_resource (pointer, client, resource, id);
}
static const struct _wl_pointer_gestures_interface pointer_gestures_interface = {
gestures_get_swipe,
gestures_get_pinch
};
static void
bind_pointer_gestures (struct wl_client *client,
void *data,
guint32 version,
guint32 id)
{
MetaWaylandPointerGestures *gestures = data;
struct wl_resource *resource;
resource = wl_resource_create (client, &_wl_pointer_gestures_interface, version, id);
wl_resource_set_implementation (resource, &pointer_gestures_interface,
gestures, NULL);
}
void
meta_wayland_pointer_gestures_init (MetaWaylandCompositor *compositor)
{
wl_global_create (compositor->wayland_display,
&_wl_pointer_gestures_interface,
META_WL_POINTER_GESTURES_VERSION,
gestures, bind_pointer_gestures);
}

View File

@ -0,0 +1,32 @@
/*
* Wayland Support
*
* Copyright (C) 2015 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_POINTER_GESTURES_H
#define META_WAYLAND_POINTER_GESTURES_H
#include <wayland-server.h>
#include <glib.h>
#include "meta-wayland-types.h"
void meta_wayland_pointer_gestures_init (MetaWaylandCompositor *compositor);
#endif /* META_WAYLAND_POINTER_GESTURES_H */

View File

@ -32,6 +32,7 @@
#include "meta-wayland-versions.h" #include "meta-wayland-versions.h"
#include "meta-wayland-surface.h" #include "meta-wayland-surface.h"
#include "meta-wayland-seat.h" #include "meta-wayland-seat.h"
#include "meta-wayland-pointer-gestures.h"
typedef struct _MetaXWaylandSelection MetaXWaylandSelection; typedef struct _MetaXWaylandSelection MetaXWaylandSelection;

View File

@ -44,5 +44,6 @@
#define META_XSERVER_VERSION 1 #define META_XSERVER_VERSION 1
#define META_GTK_SHELL_VERSION 2 #define META_GTK_SHELL_VERSION 2
#define META_WL_SUBCOMPOSITOR_VERSION 1 #define META_WL_SUBCOMPOSITOR_VERSION 1
#define META_WL_POINTER_GESTURES_VERSION 1
#endif #endif

View File

@ -310,6 +310,7 @@ meta_wayland_init (void)
meta_wayland_outputs_init (compositor); meta_wayland_outputs_init (compositor);
meta_wayland_data_device_manager_init (compositor); meta_wayland_data_device_manager_init (compositor);
meta_wayland_shell_init (compositor); meta_wayland_shell_init (compositor);
meta_wayland_pointer_gestures_init (compositor);
meta_wayland_seat_init (compositor); meta_wayland_seat_init (compositor);
compositor->display_name = wl_display_add_socket_auto (compositor->wayland_display); compositor->display_name = wl_display_add_socket_auto (compositor->wayland_display);