Commit d515c43d authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Make gdk_surface_get_origin internal

We still use this function inside gdk in
a number of places, so keep it around.
parent 879f22fd
......@@ -255,7 +255,6 @@ gdk_surface_set_type_hint
gdk_surface_get_type_hint
gdk_surface_set_shadow_width
gdk_surface_get_position
gdk_surface_get_origin
gdk_surface_get_device_position
GdkModifierType
GdkModifierIntent
......
......@@ -1646,6 +1646,7 @@ gdk_display_get_monitor_at_surface (GdkDisplay *display,
return best;
}
/* the fallback implementation requires global coordinates */
gdk_surface_get_geometry (surface, &win.x, &win.y, &win.width, &win.height);
gdk_surface_get_origin (surface, &win.x, &win.y);
......
......@@ -250,6 +250,10 @@ void gdk_surface_get_root_coords (GdkSurface *surface,
gint y,
gint *root_x,
gint *root_y);
void gdk_surface_get_origin (GdkSurface *surface,
gint *x,
gint *y);
void gdk_surface_get_geometry (GdkSurface *surface,
gint *x,
......
......@@ -2419,37 +2419,28 @@ gdk_surface_get_height (GdkSurface *surface)
return surface->height;
}
/**
/*
* gdk_surface_get_origin:
* @surface: a #GdkSurface
* @x: (out) (allow-none): return location for X coordinate
* @y: (out) (allow-none): return location for Y coordinate
* @x: (out): return location for X coordinate
* @y: (out): return location for Y coordinate
*
* Obtains the position of a surface in root window coordinates.
* (Compare with gdk_surface_get_position() and
* gdk_surface_get_geometry() which return the position of a surface
* relative to its parent surface.)
*
* Returns: not meaningful, ignore
* gdk_surface_get_geometry() which return the position
* of a surface relative to its parent surface.)
*/
gint
void
gdk_surface_get_origin (GdkSurface *surface,
gint *x,
gint *y)
gint *x,
gint *y)
{
gint dummy_x, dummy_y;
g_return_val_if_fail (GDK_IS_SURFACE (surface), 0);
gdk_surface_get_root_coords (surface,
0, 0,
x ? x : &dummy_x,
y ? y : &dummy_y);
g_return_if_fail (GDK_IS_SURFACE (surface));
return TRUE;
gdk_surface_get_root_coords (surface, 0, 0, x, y);
}
/**
/*
* gdk_surface_get_root_coords:
* @surface: a #GdkSurface
* @x: X coordinate in surface
......
......@@ -553,10 +553,6 @@ void gdk_surface_get_position (GdkSurface *surface,
gint *x,
gint *y);
GDK_AVAILABLE_IN_ALL
gint gdk_surface_get_origin (GdkSurface *surface,
gint *x,
gint *y);
GDK_AVAILABLE_IN_ALL
gboolean gdk_surface_translate_coordinates (GdkSurface *from,
GdkSurface *to,
double *x,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment