[gnome-panel/wip-warnings-next: 7/20] multiscreen: reformat code

[Sebastian Geiger <segeiger src gnome org>]

commit 8cdcc040cc98019b301f8591e3274e13a299e0dc
Author: Sebastian Geiger <sbastig gmx net>
Date:   Tue Feb 25 11:49:11 2020 +0100

    multiscreen: reformat code

 gnome-panel/panel-multiscreen.c | 223 +++++++++++++++++++++-------------------
 1 file changed, 115 insertions(+), 108 deletions(-)
---
diff --git a/gnome-panel/panel-multiscreen.c b/gnome-panel/panel-multiscreen.c
index 0537c09a7..e77bf46aa 100644
--- a/gnome-panel/panel-multiscreen.c
+++ b/gnome-panel/panel-multiscreen.c
@@ -90,134 +90,141 @@ _panel_multiscreen_output_should_be_first (Display       *xdisplay,
 
 static gboolean
 panel_multiscreen_get_randr_monitors_for_screen (int           *monitors_ret,
-                                                GdkRectangle **geometries_ret)
+                                                 GdkRectangle **geometries_ret)
 {
-       GdkScreen          *screen;
-       Display            *xdisplay;
-       Window              xroot;
-       XRRScreenResources *resources;
-       RROutput            primary;
-       GArray             *geometry_array;
-       int                 i;
-       gboolean            driver_is_pre_randr_1_2;
-
-       if (!have_randr)
-               return FALSE;
-
-       /* GTK+ 2.14.x uses the Xinerama API, instead of RANDR, to get the
-        * monitor geometries. It does this to avoid calling
-        * XRRGetScreenResources(), which is slow as it re-detects all the
-        * monitors --- note that XRRGetScreenResourcesCurrent() had not been
-        * introduced yet.  Using Xinerama in GTK+ has the bad side effect that
-        * gdk_screen_get_monitor_plug_name() will return NULL, as Xinerama
-        * does not provide that information, unlike RANDR.
-        *
-        * Here we need to identify the output names, so that we can put the
-        * built-in LCD in a laptop *before* all other outputs.  This is so
-        * that gnome-panel will normally prefer to appear on the "native"
-        * display rather than on an external monitor.
-        *
-        * To get the output names and geometries, we will not use
-        * gdk_screen_get_n_monitors() and friends, but rather we will call
-        * XRR*() directly.
-        *
-        * See https://bugzilla.novell.com/show_bug.cgi?id=479684 for this
-        * particular bug, and and
-        * http://bugzilla.gnome.org/show_bug.cgi?id=562944 for a more
-        * long-term solution.
-        */
+  GdkScreen          *screen;
+  Display            *xdisplay;
+  Window              xroot;
+  XRRScreenResources *resources;
+  RROutput            primary;
+  GArray             *geometry_array;
+  int                 i;
+  gboolean            driver_is_pre_randr_1_2;
+
+  if (!have_randr)
+    return FALSE;
+
+  /* GTK+ 2.14.x uses the Xinerama API, instead of RANDR, to get the
+   * monitor geometries. It does this to avoid calling
+   * XRRGetScreenResources(), which is slow as it re-detects all the
+   * monitors --- note that XRRGetScreenResourcesCurrent() had not been
+   * introduced yet.  Using Xinerama in GTK+ has the bad side effect that
+   * gdk_screen_get_monitor_plug_name() will return NULL, as Xinerama
+   * does not provide that information, unlike RANDR.
+   *
+   * Here we need to identify the output names, so that we can put the
+   * built-in LCD in a laptop *before* all other outputs.  This is so
+   * that gnome-panel will normally prefer to appear on the "native"
+   * display rather than on an external monitor.
+   *
+   * To get the output names and geometries, we will not use
+   * gdk_screen_get_n_monitors() and friends, but rather we will call
+   * XRR*() directly.
+   *
+   * See https://bugzilla.novell.com/show_bug.cgi?id=479684 for this
+   * particular bug, and and
+   * http://bugzilla.gnome.org/show_bug.cgi?id=562944 for a more
+   * long-term solution.
+   */
 
-       screen = gdk_screen_get_default ();
-       xdisplay = GDK_SCREEN_XDISPLAY (screen);
-       xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
-
-       if (have_randr_1_3) {
-               resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
-               if (resources->noutput == 0) {
-                       /* This might happen if nothing tried to get randr
-                        * resources from the server before, so we need an
-                        * active probe. See comment #27 in
-                        * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
-                       XRRFreeScreenResources (resources);
-                       resources = XRRGetScreenResources (xdisplay, xroot);
-               }
-       } else
-               resources = XRRGetScreenResources (xdisplay, xroot);
+  screen = gdk_screen_get_default ();
+  xdisplay = GDK_SCREEN_XDISPLAY (screen);
+  xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
 
-       if (!resources)
-               return FALSE;
+  if (have_randr_1_3)
+    {
+      resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
+      if (resources->noutput == 0)
+        {
+          /* This might happen if nothing tried to get randr
+           * resources from the server before, so we need an
+           * active probe. See comment #27 in
+           * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
+          XRRFreeScreenResources (resources);
+          resources = XRRGetScreenResources (xdisplay, xroot);
+        }
+    } else
+      resources = XRRGetScreenResources (xdisplay, xroot);
 
-       primary = None;
-       if (have_randr_1_3)
-               primary = XRRGetOutputPrimary (xdisplay, xroot);
+  if (!resources)
+    return FALSE;
 
-       geometry_array = g_array_sized_new (FALSE, FALSE,
-                                       sizeof (GdkRectangle),
-                                       resources->noutput);
+  primary = None;
 
-       driver_is_pre_randr_1_2 = FALSE;
+  if (have_randr_1_3)
+    primary = XRRGetOutputPrimary (xdisplay, xroot);
 
-       for (i = 0; i < resources->noutput; i++) {
-               XRROutputInfo *output;
+  geometry_array = g_array_sized_new (FALSE, FALSE,
+                                      sizeof (GdkRectangle),
+                                      resources->noutput);
 
-               output = XRRGetOutputInfo (xdisplay, resources,
-                                          resources->outputs[i]);
+  driver_is_pre_randr_1_2 = FALSE;
 
-               /* Drivers before RANDR 1.2 return "default" for the output
-                * name */
-               if (g_strcmp0 (output->name, "default") == 0)
-                       driver_is_pre_randr_1_2 = TRUE;
+  for (i = 0; i < resources->noutput; i++) {
+    XRROutputInfo *output;
 
-               if (output->connection != RR_Disconnected &&
-                   output->crtc != 0) {
-                       XRRCrtcInfo  *crtc;
-                       GdkRectangle  rect;
+    output = XRRGetOutputInfo (xdisplay, resources,
+                               resources->outputs[i]);
 
-                       crtc = XRRGetCrtcInfo (xdisplay, resources,
-                                              output->crtc);
+    /* Drivers before RANDR 1.2 return "default" for the output
+     * name */
+    if (g_strcmp0 (output->name, "default") == 0)
+      driver_is_pre_randr_1_2 = TRUE;
 
-                       rect.x      = crtc->x;
-                       rect.y      = crtc->y;
-                       rect.width  = crtc->width;
-                       rect.height = crtc->height;
+    if (output->connection != RR_Disconnected &&
+        output->crtc != 0)
+      {
+        XRRCrtcInfo  *crtc;
+        GdkRectangle  rect;
 
-                       XRRFreeCrtcInfo (crtc);
+        crtc = XRRGetCrtcInfo (xdisplay, resources,
+                               output->crtc);
 
-                       if (_panel_multiscreen_output_should_be_first (xdisplay,
-                                                                      resources->outputs[i],
-                                                                      output, primary))
-                               g_array_prepend_vals (geometry_array, &rect, 1);
-                       else
-                               g_array_append_vals (geometry_array, &rect, 1);
-               }
+        rect.x      = crtc->x;
+        rect.y      = crtc->y;
+        rect.width  = crtc->width;
+        rect.height = crtc->height;
 
-               XRRFreeOutputInfo (output);
-       }
+        XRRFreeCrtcInfo (crtc);
 
-       XRRFreeScreenResources (resources);
+        if (_panel_multiscreen_output_should_be_first (xdisplay,
+                                                       resources->outputs[i],
+                                                       output, primary))
+          g_array_prepend_vals (geometry_array, &rect, 1);
+        else
+          g_array_append_vals (geometry_array, &rect, 1);
+      }
 
-       if (driver_is_pre_randr_1_2) {
-               /* Drivers before RANDR 1.2 don't provide useful info about
-                * outputs */
-               g_array_free (geometry_array, TRUE);
-               return FALSE;
-       }
+    XRRFreeOutputInfo (output);
+  }
 
-       if (geometry_array->len == 0) {
-               /* This can happen in at least one case:
-                * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
-                * monitors appear disconnected (possibly because the  screen
-                * is behing a KVM switch) -- see comment #8.
-                * There might be other cases too, so we stay on the safe side.
-                */
-               g_array_free (geometry_array, TRUE);
-               return FALSE;
-       }
+  XRRFreeScreenResources (resources);
+
+  if (driver_is_pre_randr_1_2)
+    {
+      /* Drivers before RANDR 1.2 don't provide useful info about
+       * outputs */
+      g_array_free (geometry_array, TRUE);
+      return FALSE;
+    }
+
+  if (geometry_array->len == 0)
+    {
+      /* This can happen in at least one case:
+       * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
+       * monitors appear disconnected (possibly because the  screen
+       * is behing a KVM switch) -- see comment #8.
+       * There might be other cases too, so we stay on the safe side.
+       */
+      g_array_free (geometry_array, TRUE);
+
+      return FALSE;
+    }
 
-       *monitors_ret = geometry_array->len;
-       *geometries_ret = (GdkRectangle *) g_array_free (geometry_array, FALSE);
+  *monitors_ret = geometry_array->len;
+  *geometries_ret = (GdkRectangle *) g_array_free (geometry_array, FALSE);
 
-       return TRUE;
+  return TRUE;
 }
 
 static void