cursor-renderer: Remove the MetaScreen

It's unused.
This commit is contained in:
Jasper St. Pierre 2014-04-22 14:27:38 -04:00
parent ca11b88fcd
commit 4ea9a28eee
3 changed files with 5 additions and 14 deletions

View File

@ -38,8 +38,6 @@
struct _MetaCursorRendererPrivate struct _MetaCursorRendererPrivate
{ {
MetaScreen *screen;
gboolean has_hw_cursor; gboolean has_hw_cursor;
int current_x, current_y; int current_x, current_y;
@ -313,16 +311,9 @@ update_pipeline (MetaCursorRenderer *renderer)
} }
MetaCursorRenderer * MetaCursorRenderer *
meta_cursor_renderer_new (MetaScreen *screen) meta_cursor_renderer_new (void)
{ {
MetaCursorRenderer *renderer; return g_object_new (META_TYPE_CURSOR_RENDERER, NULL);
MetaCursorRendererPrivate *priv;
renderer = META_CURSOR_RENDERER (g_object_new (META_TYPE_CURSOR_RENDERER, NULL));
priv = meta_cursor_renderer_get_instance_private (renderer);
priv->screen = screen;
return renderer;
} }
void void

View File

@ -54,7 +54,7 @@ struct _MetaCursorRendererClass
GType meta_cursor_renderer_get_type (void) G_GNUC_CONST; GType meta_cursor_renderer_get_type (void) G_GNUC_CONST;
MetaCursorRenderer * meta_cursor_renderer_new (MetaScreen *screen); MetaCursorRenderer * meta_cursor_renderer_new (void);
void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer, void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
MetaCursorReference *cursor); MetaCursorReference *cursor);

View File

@ -139,7 +139,7 @@ make_wayland_cursor_tracker (MetaScreen *screen)
self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL); self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
self->screen = screen; self->screen = screen;
self->renderer = meta_cursor_renderer_new (screen); self->renderer = meta_cursor_renderer_new ();
compositor = meta_wayland_compositor_get_default (); compositor = meta_wayland_compositor_get_default ();
compositor->seat->pointer.cursor_tracker = self; compositor->seat->pointer.cursor_tracker = self;
@ -154,7 +154,7 @@ make_x11_cursor_tracker (MetaScreen *screen)
MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL); MetaCursorTracker *self = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
self->screen = screen; self->screen = screen;
self->renderer = meta_cursor_renderer_new (screen); self->renderer = meta_cursor_renderer_new ();
XFixesSelectCursorInput (screen->display->xdisplay, XFixesSelectCursorInput (screen->display->xdisplay,
screen->xroot, screen->xroot,