libweston: Migrate functions that operate on input objects

This include 'weston_keyboard', 'weston_touch', 'weston_pointer' and
other released classes.

Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
dev
Marius Vlad 5 years ago committed by Daniel Stone
parent 0bf3f5ac2c
commit 9eb2064b85
  1. 1
      compositor/screen-share.c
  2. 32
      include/libweston/libweston.h
  3. 1
      libweston/libinput-device.c
  4. 42
      libweston/libweston-internal.h

@ -41,6 +41,7 @@
#include <wayland-client.h>
#include <libweston/libweston.h>
#include "libweston-internal.h"
#include "weston.h"
#include "shared/helpers.h"
#include "shared/os-compatibility.h"

@ -645,18 +645,8 @@ weston_pointer_start_grab(struct weston_pointer *pointer,
void
weston_pointer_end_grab(struct weston_pointer *pointer);
void
weston_pointer_clamp(struct weston_pointer *pointer,
wl_fixed_t *fx, wl_fixed_t *fy);
void
weston_pointer_move(struct weston_pointer *pointer,
struct weston_pointer_motion_event *event);
void
weston_pointer_set_default_grab(struct weston_pointer *pointer,
const struct weston_pointer_grab_interface *interface);
void
weston_pointer_constraint_destroy(struct weston_pointer_constraint *constraint);
void
weston_keyboard_set_focus(struct weston_keyboard *keyboard,
struct weston_surface *surface);
@ -673,8 +663,6 @@ int
weston_keyboard_set_locks(struct weston_keyboard *keyboard,
uint32_t mask, uint32_t value);
bool
weston_keyboard_has_focus_resource(struct weston_keyboard *keyboard);
void
weston_keyboard_send_key(struct weston_keyboard *keyboard,
const struct timespec *time, uint32_t key,
@ -694,8 +682,6 @@ weston_touch_start_grab(struct weston_touch *touch,
void
weston_touch_end_grab(struct weston_touch *touch);
bool
weston_touch_has_focus_resource(struct weston_touch *touch);
void
weston_touch_send_down(struct weston_touch *touch, const struct timespec *time,
int touch_id, wl_fixed_t x, wl_fixed_t y);
@ -709,18 +695,6 @@ weston_touch_send_motion(struct weston_touch *touch,
void
weston_touch_send_frame(struct weston_touch *touch);
struct weston_touch_device *
weston_touch_create_touch_device(struct weston_touch *touch,
const char *syspath,
void *backend_data,
const struct weston_touch_device_ops *ops);
void
weston_touch_device_destroy(struct weston_touch_device *device);
bool
weston_touch_device_can_calibrate(struct weston_touch_device *device);
int
wl_data_device_manager_init(struct wl_display *display);
@ -734,12 +708,6 @@ weston_pointer_start_drag(struct weston_pointer *pointer,
struct weston_data_source *source,
struct weston_surface *icon,
struct wl_client *client);
int
weston_touch_start_drag(struct weston_touch *touch,
struct weston_data_source *source,
struct weston_surface *icon,
struct wl_client *client);
struct weston_xkb_info {
struct xkb_keymap *keymap;
size_t keymap_size;

@ -39,6 +39,7 @@
#include <libinput.h>
#include <libweston/libweston.h>
#include "libweston-internal.h"
#include "libinput-device.h"
#include "shared/helpers.h"
#include "shared/timespec-util.h"

@ -207,4 +207,46 @@ weston_seat_update_keymap(struct weston_seat *seat, struct xkb_keymap *keymap);
void
wl_data_device_set_keyboard_focus(struct weston_seat *seat);
/* weston_pointer */
void
weston_pointer_clamp(struct weston_pointer *pointer,
wl_fixed_t *fx, wl_fixed_t *fy);
void
weston_pointer_set_default_grab(struct weston_pointer *pointer,
const struct weston_pointer_grab_interface *interface);
void
weston_pointer_constraint_destroy(struct weston_pointer_constraint *constraint);
/* weston_keyboard */
bool
weston_keyboard_has_focus_resource(struct weston_keyboard *keyboard);
/* weston_touch */
struct weston_touch_device *
weston_touch_create_touch_device(struct weston_touch *touch,
const char *syspath,
void *backend_data,
const struct weston_touch_device_ops *ops);
void
weston_touch_device_destroy(struct weston_touch_device *device);
bool
weston_touch_has_focus_resource(struct weston_touch *touch);
int
weston_touch_start_drag(struct weston_touch *touch,
struct weston_data_source *source,
struct weston_surface *icon,
struct wl_client *client);
/* weston_touch_device */
bool
weston_touch_device_can_calibrate(struct weston_touch_device *device);
#endif

Loading…
Cancel
Save