mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Input: Convert pointer co-ordinates to signed_24_8

Browse source 
This offers more precision when using devices like tablets, and also for
transformed surfaces.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2012-05-08 17:17:26 +01:00 • committed by Kristian Høgsberg
parent c5aba11acc
commit 0c20496e1a
4 changed files with 35 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/data-device.c
View file

@ -178,7 +178,7 @@ destroy_drag_focus(struct wl_listener *listener, void *data)
static void
drag_grab_focus(struct wl_pointer_grab *grab,
struct wl_surface *surface, int32_t x, int32_t y)
struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y)
{
struct wl_input_device *device =
container_of(grab, struct wl_input_device, drag_grab);
@ -217,7 +217,7 @@ drag_grab_focus(struct wl_pointer_grab *grab,
static void
drag_grab_motion(struct wl_pointer_grab *grab,
uint32_t time, int32_t x, int32_t y)
uint32_t time, wl_fixed_t x, wl_fixed_t y)
{
struct wl_input_device *device =
container_of(grab, struct wl_input_device, drag_grab);
@ -243,7 +243,8 @@ data_device_end_drag_grab(struct wl_input_device *device)
wl_list_remove(&device->drag_icon_listener.link);
}
drag_grab_focus(&device->drag_grab, NULL, 0, 0);
drag_grab_focus(&device->drag_grab, NULL,
wl_fixed_from_int(0), wl_fixed_from_int(0));
wl_input_device_end_pointer_grab(device);
@ -324,7 +325,9 @@ data_device_start_drag(struct wl_client *client, struct wl_resource *resource,
wl_signal_emit(&device->drag_icon_signal, icon_resource);
}
wl_input_device_set_pointer_focus(device, NULL, 0, 0);
wl_input_device_set_pointer_focus(device, NULL,
wl_fixed_from_int(0),
wl_fixed_from_int(0));
wl_input_device_start_pointer_grab(device, &device->drag_grab);
}

10
src/wayland-server.c
View file

@ -472,7 +472,7 @@ lose_keyboard_focus(struct wl_listener *listener, void *data)
static void
default_grab_focus(struct wl_pointer_grab *grab,
struct wl_surface *surface, int32_t x, int32_t y)
struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y)
{
struct wl_input_device *device = grab->input_device;
@ -484,7 +484,7 @@ default_grab_focus(struct wl_pointer_grab *grab,
static void
default_grab_motion(struct wl_pointer_grab *grab,
uint32_t time, int32_t x, int32_t y)
uint32_t time, wl_fixed_t x, wl_fixed_t y)
{
struct wl_resource *resource;
@ -564,8 +564,8 @@ wl_input_device_init(struct wl_input_device *device)
wl_signal_init(&device->selection_signal);
wl_signal_init(&device->drag_icon_signal);
device->x = 100;
device->y = 100;
device->x = wl_fixed_from_int(100);
device->y = wl_fixed_from_int(100);
}
WL_EXPORT void
@ -601,7 +601,7 @@ find_resource_for_surface(struct wl_list *list, struct wl_surface *surface)
WL_EXPORT void
wl_input_device_set_pointer_focus(struct wl_input_device *device,
struct wl_surface *surface,
int32_t sx, int32_t sy)
wl_fixed_t sx, wl_fixed_t sy)
{
struct wl_resource *resource;
uint32_t serial;

18
src/wayland-server.h
View file

@ -185,9 +185,13 @@ struct wl_surface {
struct wl_pointer_grab;
struct wl_pointer_grab_interface {
void (*focus)(struct wl_pointer_grab *grab,
struct wl_surface *surface, int32_t x, int32_t y);
struct wl_surface *surface,
wl_fixed_t x,
wl_fixed_t y);
void (*motion)(struct wl_pointer_grab *grab,
uint32_t time, int32_t x, int32_t y);
uint32_t time,
wl_fixed_t x,
wl_fixed_t y);
void (*button)(struct wl_pointer_grab *grab,
uint32_t time, uint32_t button, uint32_t state);
};
@ -196,7 +200,7 @@ struct wl_pointer_grab {
const struct wl_pointer_grab_interface *interface;
struct wl_input_device *input_device;
struct wl_surface *focus;
int32_t x, y;
wl_fixed_t x, y;
};
struct wl_keyboard_grab;
@ -238,9 +242,9 @@ struct wl_input_device {
struct wl_listener pointer_focus_listener;
struct wl_listener keyboard_focus_listener;
int32_t x, y;
wl_fixed_t x, y;
struct wl_surface *current;
int32_t current_x, current_y;
wl_fixed_t current_x, current_y;
struct wl_pointer_grab *pointer_grab;
struct wl_pointer_grab default_pointer_grab;
@ -249,7 +253,7 @@ struct wl_input_device {
uint32_t button_count;
uint32_t grab_time;
uint32_t grab_serial;
int32_t grab_x, grab_y;
wl_fixed_t grab_x, grab_y;
uint32_t grab_button;
uint32_t grab_key;
struct wl_listener grab_listener;
@ -320,7 +324,7 @@ wl_input_device_release(struct wl_input_device *device);
void
wl_input_device_set_pointer_focus(struct wl_input_device *device,
struct wl_surface *surface,
int32_t sx, int32_t sy);
wl_fixed_t sx, wl_fixed_t sy);
void
wl_input_device_set_keyboard_focus(struct wl_input_device *device,