diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c index 7f36f6db6..9111dc5c0 100644 --- a/src/backends/meta-cursor-renderer.c +++ b/src/backends/meta-cursor-renderer.c @@ -82,13 +82,12 @@ static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE_WITH_PRIVATE (MetaCursorRenderer, meta_cursor_renderer, G_TYPE_OBJECT); static gboolean -meta_hw_cursor_inhibitor_is_cursor_sprite_inhibited (MetaHwCursorInhibitor *inhibitor, - MetaCursorSprite *cursor_sprite) +meta_hw_cursor_inhibitor_is_cursor_inhibited (MetaHwCursorInhibitor *inhibitor) { MetaHwCursorInhibitorInterface *iface = META_HW_CURSOR_INHIBITOR_GET_IFACE (inhibitor); - return iface->is_cursor_sprite_inhibited (inhibitor, cursor_sprite); + return iface->is_cursor_inhibited (inhibitor); } static void @@ -499,8 +498,7 @@ meta_cursor_renderer_remove_hw_cursor_inhibitor (MetaCursorRenderer *renderer } gboolean -meta_cursor_renderer_is_hw_cursors_inhibited (MetaCursorRenderer *renderer, - MetaCursorSprite *cursor_sprite) +meta_cursor_renderer_is_hw_cursors_inhibited (MetaCursorRenderer *renderer) { MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer); @@ -510,8 +508,7 @@ meta_cursor_renderer_is_hw_cursors_inhibited (MetaCursorRenderer *renderer, { MetaHwCursorInhibitor *inhibitor = l->data; - if (meta_hw_cursor_inhibitor_is_cursor_sprite_inhibited (inhibitor, - cursor_sprite)) + if (meta_hw_cursor_inhibitor_is_cursor_inhibited (inhibitor)) return TRUE; } diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h index 37ddb9100..b16d5cbe2 100644 --- a/src/backends/meta-cursor-renderer.h +++ b/src/backends/meta-cursor-renderer.h @@ -38,8 +38,7 @@ struct _MetaHwCursorInhibitorInterface { GTypeInterface parent_iface; - gboolean (* is_cursor_sprite_inhibited) (MetaHwCursorInhibitor *inhibitor, - MetaCursorSprite *cursor_sprite); + gboolean (* is_cursor_inhibited) (MetaHwCursorInhibitor *inhibitor); }; #define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ()) @@ -73,8 +72,7 @@ void meta_cursor_renderer_add_hw_cursor_inhibitor (MetaCursorRenderer *render void meta_cursor_renderer_remove_hw_cursor_inhibitor (MetaCursorRenderer *renderer, MetaHwCursorInhibitor *inhibitor); -gboolean meta_cursor_renderer_is_hw_cursors_inhibited (MetaCursorRenderer *renderer, - MetaCursorSprite *cursor_sprite); +gboolean meta_cursor_renderer_is_hw_cursors_inhibited (MetaCursorRenderer *renderer); graphene_rect_t meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer, MetaCursorSprite *cursor_sprite); diff --git a/src/backends/meta-screen-cast-area-stream-src.c b/src/backends/meta-screen-cast-area-stream-src.c index 7b1e4cc3d..2d5d295d5 100644 --- a/src/backends/meta-screen-cast-area-stream-src.c +++ b/src/backends/meta-screen-cast-area-stream-src.c @@ -570,8 +570,7 @@ meta_screen_cast_area_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc *s } static gboolean -meta_screen_cast_area_stream_src_is_cursor_sprite_inhibited (MetaHwCursorInhibitor *inhibitor, - MetaCursorSprite *cursor_sprite) +meta_screen_cast_area_stream_src_is_cursor_inhibited (MetaHwCursorInhibitor *inhibitor) { MetaScreenCastAreaStreamSrc *area_src = META_SCREEN_CAST_AREA_STREAM_SRC (inhibitor); @@ -582,8 +581,8 @@ meta_screen_cast_area_stream_src_is_cursor_sprite_inhibited (MetaHwCursorInhibit static void hw_cursor_inhibitor_iface_init (MetaHwCursorInhibitorInterface *iface) { - iface->is_cursor_sprite_inhibited = - meta_screen_cast_area_stream_src_is_cursor_sprite_inhibited; + iface->is_cursor_inhibited = + meta_screen_cast_area_stream_src_is_cursor_inhibited; } MetaScreenCastAreaStreamSrc * diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c b/src/backends/meta-screen-cast-monitor-stream-src.c index 45aff9126..775a83bea 100644 --- a/src/backends/meta-screen-cast-monitor-stream-src.c +++ b/src/backends/meta-screen-cast-monitor-stream-src.c @@ -671,8 +671,7 @@ meta_screen_cast_monitor_stream_src_set_cursor_metadata (MetaScreenCastStreamSrc } static gboolean -meta_screen_cast_monitor_stream_src_is_cursor_sprite_inhibited (MetaHwCursorInhibitor *inhibitor, - MetaCursorSprite *cursor_sprite) +meta_screen_cast_monitor_stream_src_is_cursor_inhibited (MetaHwCursorInhibitor *inhibitor) { MetaScreenCastMonitorStreamSrc *monitor_src = META_SCREEN_CAST_MONITOR_STREAM_SRC (inhibitor); @@ -683,8 +682,8 @@ meta_screen_cast_monitor_stream_src_is_cursor_sprite_inhibited (MetaHwCursorInhi static void hw_cursor_inhibitor_iface_init (MetaHwCursorInhibitorInterface *iface) { - iface->is_cursor_sprite_inhibited = - meta_screen_cast_monitor_stream_src_is_cursor_sprite_inhibited; + iface->is_cursor_inhibited = + meta_screen_cast_monitor_stream_src_is_cursor_inhibited; } MetaScreenCastMonitorStreamSrc * diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index 84aa32bce..f37f84cc1 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -880,8 +880,7 @@ should_have_hw_cursor (MetaCursorRenderer *renderer, if (!cursor_sprite) return FALSE; - if (meta_cursor_renderer_is_hw_cursors_inhibited (renderer, - cursor_sprite)) + if (meta_cursor_renderer_is_hw_cursors_inhibited (renderer)) return FALSE; for (l = gpus; l; l = l->next)