summaryrefslogtreecommitdiff
path: root/gdk/wayland
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/wayland')
-rw-r--r--gdk/wayland/gdkdevice-wayland.c24
-rw-r--r--gdk/wayland/gdkscreen-wayland.c2
-rw-r--r--gdk/wayland/gdkwindow-wayland.c4
3 files changed, 15 insertions, 15 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index cd4a6955aa..292509660d 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -135,14 +135,14 @@ gdk_wayland_device_get_state (GdkDevice *device,
gdouble *axes,
GdkModifierType *mask)
{
- gint x_int, y_int;
+ gdouble x, y;
- gdk_window_get_device_position (window, device, &x_int, &y_int, mask);
+ gdk_window_get_device_position_double (window, device, &x, &y, mask);
if (axes)
{
- axes[0] = x_int;
- axes[1] = y_int;
+ axes[0] = x;
+ axes[1] = y;
}
}
@@ -228,8 +228,8 @@ gdk_wayland_device_set_window_cursor (GdkDevice *device,
static void
gdk_wayland_device_warp (GdkDevice *device,
GdkScreen *screen,
- gint x,
- gint y)
+ gdouble x,
+ gdouble y)
{
}
@@ -238,10 +238,10 @@ gdk_wayland_device_query_state (GdkDevice *device,
GdkWindow *window,
GdkWindow **root_window,
GdkWindow **child_window,
- gint *root_x,
- gint *root_y,
- gint *win_x,
- gint *win_y,
+ gdouble *root_x,
+ gdouble *root_y,
+ gdouble *win_x,
+ gdouble *win_y,
GdkModifierType *mask)
{
GdkWaylandDeviceData *wd;
@@ -345,8 +345,8 @@ gdk_wayland_device_ungrab (GdkDevice *device,
static GdkWindow *
gdk_wayland_device_window_at_position (GdkDevice *device,
- gint *win_x,
- gint *win_y,
+ gdouble *win_x,
+ gdouble *win_y,
GdkModifierType *mask,
gboolean get_toplevel)
{
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index 7fa9add755..6768fabea1 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -928,7 +928,7 @@ output_handle_done(void *data,
static void
output_handle_scale(void *data,
struct wl_output *wl_output,
- uint32_t factor)
+ int32_t factor)
{
GdkWaylandMonitor *monitor = (GdkWaylandMonitor *)data;
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index f872049d04..a6e68d5f66 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1237,8 +1237,8 @@ gdk_window_wayland_get_root_coords (GdkWindow *window,
static gboolean
gdk_window_wayland_get_device_state (GdkWindow *window,
GdkDevice *device,
- gint *x,
- gint *y,
+ gdouble *x,
+ gdouble *y,
GdkModifierType *mask)
{
gboolean return_val;