callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wayland: trivial reshuffle

Browse Source 
Avoid a forward declaration by moving things around.
This commit is contained in:
Matthias Clasen
2015-05-08 09:00:15 -04:00
parent 724cc00f9b
commit b1e10f5312
1 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
gdk/wayland/gdkcursor-wayland.c
View File

@ -262,45 +262,6 @@ _gdk_wayland_cursor_init (GdkWaylandCursor *cursor)
{ {
} }
static GdkCursor *
_gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
const gchar *name,
guint scale);
GdkCursor *
_gdk_wayland_display_get_cursor_for_type_with_scale (GdkDisplay *display,
GdkCursorType cursor_type,
guint scale)
{
GEnumClass *enum_class;
GEnumValue *enum_value;
gchar *cursor_name;
GdkCursor *result;
enum_class = g_type_class_ref (GDK_TYPE_CURSOR_TYPE);
enum_value = g_enum_get_value (enum_class, cursor_type);
cursor_name = g_strdup (enum_value->value_nick);
g_strdelimit (cursor_name, "-", '_');
g_type_class_unref (enum_class);
result = _gdk_wayland_display_get_cursor_for_name_with_scale (display,
cursor_name,
scale);
g_free (cursor_name);
return result;
}
GdkCursor *
_gdk_wayland_display_get_cursor_for_type (GdkDisplay *display,
GdkCursorType cursor_type)
{
return _gdk_wayland_display_get_cursor_for_type_with_scale (display,
cursor_type,
1);
}
static GdkCursor * static GdkCursor *
_gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display, _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
const gchar *name, const gchar *name,
@ -341,6 +302,40 @@ _gdk_wayland_display_get_cursor_for_name (GdkDisplay *display,
return _gdk_wayland_display_get_cursor_for_name_with_scale (display, name, 1); return _gdk_wayland_display_get_cursor_for_name_with_scale (display, name, 1);
} }
GdkCursor *
_gdk_wayland_display_get_cursor_for_type_with_scale (GdkDisplay *display,
GdkCursorType cursor_type,
guint scale)
{
GEnumClass *enum_class;
GEnumValue *enum_value;
gchar *cursor_name;
GdkCursor *result;
enum_class = g_type_class_ref (GDK_TYPE_CURSOR_TYPE);
enum_value = g_enum_get_value (enum_class, cursor_type);
cursor_name = g_strdup (enum_value->value_nick);
g_strdelimit (cursor_name, "-", '_');
g_type_class_unref (enum_class);
result = _gdk_wayland_display_get_cursor_for_name_with_scale (display,
cursor_name,
scale);
g_free (cursor_name);
return result;
}
GdkCursor *
_gdk_wayland_display_get_cursor_for_type (GdkDisplay *display,
GdkCursorType cursor_type)
{
return _gdk_wayland_display_get_cursor_for_type_with_scale (display,
cursor_type,
1);
}
GdkCursor * GdkCursor *
_gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display, _gdk_wayland_display_get_cursor_for_surface (GdkDisplay *display,
cairo_surface_t *surface, cairo_surface_t *surface,