[X2Go-Commits] [nx-libs] 68/429: Screen.c: fix indentation in nxagentMaximizeToFullScreen

git-admin at x2go.org git-admin at x2go.org
Mon Oct 18 09:36:07 CEST 2021


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit b1efdd94da317f376106895b787b549900716da3
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Jun 3 00:09:40 2020 +0200

    Screen.c: fix indentation in nxagentMaximizeToFullScreen
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 74 ++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index f8507aa59..148f9e1dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -341,7 +341,7 @@ void nxagentMaximizeToFullScreen(ScreenPtr pScreen)
   XUnmapWindow(nxagentDisplay, nxagentIconWindow);
 */
 
-    Window root = RootWindow(nxagentDisplay, DefaultScreen(nxagentDisplay));
+  Window root = RootWindow(nxagentDisplay, DefaultScreen(nxagentDisplay));
 
 /*
 FIXME: We'll check for ReparentNotify and LeaveNotify events after
@@ -351,55 +351,55 @@ FIXME: We'll check for ReparentNotify and LeaveNotify events after
        unnecessary.
 */
 
-    /* only reparent if necessary. FIXME: also check if the desired coordinates match */
+  /* only reparent if necessary. FIXME: also check if the desired coordinates match */
 
-    if (!nxagentIsParentOf(nxagentDisplay, root, nxagentFullscreenWindow))
-    {
-      XReparentWindow(nxagentDisplay, nxagentFullscreenWindow,
-                      root, 0, 0);
+  if (!nxagentIsParentOf(nxagentDisplay, root, nxagentFullscreenWindow))
+  {
+    XReparentWindow(nxagentDisplay, nxagentFullscreenWindow,
+                        root, 0, 0);
 
-      for (int i = 0; i < 100 && nxagentWMIsRunning; i++)
-      {
-        XEvent e;
+    for (int i = 0; i < 100 && nxagentWMIsRunning; i++)
+    {
+      XEvent e;
 
-        #ifdef TEST
-        fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event [%d].\n", i);
-        #endif
+      #ifdef TEST
+      fprintf(stderr, "nxagentMaximizeToFullscreen: WARNING! Going to wait for the ReparentNotify event [%d].\n", i);
+      #endif
 
-        if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))
-        {
-          break;
-        }
+      if (XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, ReparentNotify, &e))
+      {
+        break;
+      }
 
-        XSync(nxagentDisplay, 0);
+      XSync(nxagentDisplay, 0);
 
-        nxagentWaitEvents(nxagentDisplay, 50);
-      }
-    }
-    else
-    {
-      #ifdef TEST
-      fprintf(stderr, "%s: FullscreenWindow already is child of root window - skipping reparenting,\n", __func__);
-      #endif
+      nxagentWaitEvents(nxagentDisplay, 50);
     }
+  }
+  else
+  {
+    #ifdef TEST
+    fprintf(stderr, "%s: FullscreenWindow already is child of root window - skipping reparenting,\n", __func__);
+    #endif
+  }
 
   XMapRaised(nxagentDisplay, nxagentFullscreenWindow);
 
   XIconifyWindow(nxagentDisplay, nxagentIconWindow,
                      DefaultScreen(nxagentDisplay));
 
-    /* swallow all LeaveNotify events for the FullscreenWindow;
-       Normally this does not swallow anything these days, but when
-       using fvwm you see one of these events here. */
-    while (1)
-    {
-      XEvent e;
-      if (!XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, LeaveNotify, &e))
-        break;
-      #ifdef TEST
-      fprintf(stderr, "%s: swallowing LeaveNotify event\n", __func__);
-      #endif
-    }
+  /* swallow all LeaveNotify events for the FullscreenWindow;
+     Normally this does not swallow anything these days, but when
+     using fvwm you see one of these events here. */
+  while (1)
+  {
+    XEvent e;
+    if (!XCheckTypedWindowEvent(nxagentDisplay, nxagentFullscreenWindow, LeaveNotify, &e))
+      break;
+    #ifdef TEST
+    fprintf(stderr, "%s: swallowing LeaveNotify event\n", __func__);
+    #endif
+  }
 
 /*
   XMapWindow(nxagentDisplay, nxagentIconWindow);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list