From c6530551de992359803da0a08ed7667cc786bb2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 15 Sep 2021 12:13:26 +0200 Subject: [PATCH] clutter/backend/x11: Don't keep track of a Screen pointer It was used during init, and nowhere else. Part-of: --- src/backends/x11/meta-clutter-backend-x11.c | 9 +++++---- src/backends/x11/meta-clutter-backend-x11.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backends/x11/meta-clutter-backend-x11.c b/src/backends/x11/meta-clutter-backend-x11.c index c8227e969..fcf267f11 100644 --- a/src/backends/x11/meta-clutter-backend-x11.c +++ b/src/backends/x11/meta-clutter-backend-x11.c @@ -114,6 +114,7 @@ meta_clutter_backend_x11_finish_init (ClutterBackend *clutter_backend, MetaClutterBackendX11 *clutter_backend_x11 = META_CLUTTER_BACKEND_X11 (clutter_backend); Atom atoms[N_ATOM_NAMES]; + Screen *xscreen; if (_foreign_dpy) backend_x11->xdisplay = _foreign_dpy; @@ -157,10 +158,10 @@ meta_clutter_backend_x11_finish_init (ClutterBackend *clutter_backend, /* add event filter for Cogl events */ meta_clutter_x11_add_filter (cogl_xlib_filter, clutter_backend); - clutter_backend_x11->xscreen = DefaultScreenOfDisplay (clutter_backend_x11->xdisplay); - clutter_backend_x11->xscreen_num = XScreenNumberOfScreen (clutter_backend_x11->xscreen); - clutter_backend_x11->xscreen_width = WidthOfScreen (clutter_backend_x11->xscreen); - clutter_backend_x11->xscreen_height = HeightOfScreen (clutter_backend_x11->xscreen); + xscreen = DefaultScreenOfDisplay (clutter_backend_x11->xdisplay); + clutter_backend_x11->xscreen_num = XScreenNumberOfScreen (xscreen); + clutter_backend_x11->xscreen_width = WidthOfScreen (xscreen); + clutter_backend_x11->xscreen_height = HeightOfScreen (xscreen); clutter_backend_x11->xwin_root = RootWindow (clutter_backend_x11->xdisplay, clutter_backend_x11->xscreen_num); diff --git a/src/backends/x11/meta-clutter-backend-x11.h b/src/backends/x11/meta-clutter-backend-x11.h index 9cbb72f9c..03e6e44d0 100644 --- a/src/backends/x11/meta-clutter-backend-x11.h +++ b/src/backends/x11/meta-clutter-backend-x11.h @@ -35,7 +35,6 @@ struct _MetaClutterBackendX11 Display *xdisplay; - Screen *xscreen; int xscreen_num; int xscreen_width; int xscreen_height;