From 6deff39f74f2d8b4f4bd951594afa3bec4698c31 Mon Sep 17 00:00:00 2001 From: Chris Cummins Date: Thu, 28 Mar 2013 14:47:03 +0000 Subject: [PATCH] wayland: Use more explicit out parameter names Prevent confusion between positional values and hotspot values. Signed-off-by: Rob Bradford --- gdk/wayland/gdkcursor-wayland.c | 12 ++++++------ gdk/wayland/gdkprivate-wayland.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c index fc51473677..25a86de74a 100644 --- a/gdk/wayland/gdkcursor-wayland.c +++ b/gdk/wayland/gdkcursor-wayland.c @@ -183,8 +183,8 @@ gdk_wayland_cursor_get_image (GdkCursor *cursor) struct wl_buffer * _gdk_wayland_cursor_get_buffer (GdkCursor *cursor, guint image_index, - int *x, - int *y, + int *hotspot_x, + int *hotspot_y, int *w, int *h) { @@ -204,8 +204,8 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor, image = wayland_cursor->wl_cursor->images[image_index]; - *x = image->hotspot_x; - *y = image->hotspot_y; + *hotspot_x = image->hotspot_x; + *hotspot_y = image->hotspot_y; *w = image->width; *h = image->height; @@ -214,8 +214,8 @@ _gdk_wayland_cursor_get_buffer (GdkCursor *cursor, } else /* From pixbuf */ { - *x = wayland_cursor->pixbuf.hotspot_x; - *y = wayland_cursor->pixbuf.hotspot_y; + *hotspot_x = wayland_cursor->pixbuf.hotspot_x; + *hotspot_y = wayland_cursor->pixbuf.hotspot_y; *w = wayland_cursor->pixbuf.width; *h = wayland_cursor->pixbuf.height; diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h index e078952572..a39893dffc 100644 --- a/gdk/wayland/gdkprivate-wayland.h +++ b/gdk/wayland/gdkprivate-wayland.h @@ -81,8 +81,8 @@ gboolean _gdk_wayland_display_supports_cursor_color (GdkDisplay *display); struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkCursor *cursor, guint image_index, - int *x, - int *y, + int *hotspot_x, + int *hotspot_y, int *w, int *h); guint _gdk_wayland_cursor_get_next_image_index (GdkCursor *cursor,