Use C99 named initializers to fill in events passed to XSendEvent

Forces compiler to zero-fill unset fields in the struct (fixing bug 81236) and allows optimizer to order field initialization to best fit cache layout or other considerations. Before & after output of gcc -S on AMD64 shows insertion of "rep stosq" instructions to rapidly zero-fill structs. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matthieu Herrb <matthieu@herrb.eu> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Use C99 named initializers to fill in events passed to XSendEvent
0f1fa85f · Alan Coopersmith · Ulrich Sibiller · f20f91ee · 0f1fa85f · 0f1fa85f
Commit 0f1fa85f authored Jul 11, 2014 by Alan Coopersmith Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 47 additions and 38 deletions

Iconify.c nx-X11/lib/X11/Iconify.c +15 -11

ReconfWM.c nx-X11/lib/X11/ReconfWM.c +20 -17

Withdraw.c nx-X11/lib/X11/Withdraw.c +12 -10

No files found.
--- a/nx-X11/lib/X11/Iconify.c
+++ b/nx-X11/lib/X11/Iconify.c
@@ -67,19 +67,23 @@ Status XIconifyWindow (
    Window w,
    int screen)
 {
-    XClientMessageEvent ev;
-    Window root = RootWindow (dpy, screen);
    Atom prop;
    prop = XInternAtom (dpy, "WM_CHANGE_STATE", False);
-    if (prop == None) return False;
+    if (prop == None)
+        return False;
+    else {
+        XClientMessageEvent ev = {
+            .type = ClientMessage,
+            .window = w,
+            .message_type = prop,
+            .format = 32,
+            .data.l[0] = IconicState
+        };
+        Window root = RootWindow (dpy, screen);
-    ev.type = ClientMessage;
+        return (XSendEvent (dpy, root, False,
-    ev.window = w;
+                            SubstructureRedirectMask|SubstructureNotifyMask,
-    ev.message_type = prop;
+                            (XEvent *)&ev));
-    ev.format = 32;
+    }
-    ev.data.l[0] = IconicState;
-    return (XSendEvent (dpy, root, False,
-			SubstructureRedirectMask|SubstructureNotifyMask,
-			(XEvent *)&ev));
 }
--- a/nx-X11/lib/X11/ReconfWM.c
+++ b/nx-X11/lib/X11/ReconfWM.c
@@ -41,7 +41,6 @@ Status XReconfigureWMWindow (
    unsigned int mask,
    XWindowChanges *changes)
 {
-    XConfigureRequestEvent ev;
    Window root = RootWindow (dpy, screen);
    _XAsyncHandler async;
    _XAsyncErrorState async_state;
@@ -120,20 +119,24 @@ Status XReconfigureWMWindow (
    /*
     * If the request succeeded, then everything is okay; otherwise, send event
     */
-    if (!async_state.error_count) return True;
+    if (!async_state.error_count)
+        return True;
-    ev.type		= ConfigureRequest;
+    else {
-    ev.window		= w;
+        XConfigureRequestEvent ev = {
-    ev.parent		= root;
+            .type		= ConfigureRequest,
-    ev.value_mask	= (mask & AllMaskBits);
+            .window		= w,
-    ev.x		= changes->x;
+            .parent		= root,
-    ev.y		= changes->y;
+            .value_mask		= (mask & AllMaskBits),
-    ev.width		= changes->width;
+            .x			= changes->x,
-    ev.height		= changes->height;
+            .y			= changes->y,
-    ev.border_width	= changes->border_width;
+            .width		= changes->width,
-    ev.above		= changes->sibling;
+            .height		= changes->height,
-    ev.detail		= changes->stack_mode;
+            .border_width	= changes->border_width,
-    return (XSendEvent (dpy, root, False,
+            .above		= changes->sibling,
-			SubstructureRedirectMask|SubstructureNotifyMask,
+            .detail		= changes->stack_mode,
-			(XEvent *)&ev));
+        };
+        return (XSendEvent (dpy, root, False,
+                            SubstructureRedirectMask|SubstructureNotifyMask,
+                            (XEvent *)&ev));
+    }
 }
--- a/nx-X11/lib/X11/Withdraw.c
+++ b/nx-X11/lib/X11/Withdraw.c
@@ -67,16 +67,18 @@ Status XWithdrawWindow (
    Window w,
    int screen)
 {
-    XUnmapEvent ev;
-    Window root = RootWindow (dpy, screen);
    XUnmapWindow (dpy, w);
-    ev.type = UnmapNotify;
+    {
-    ev.event = root;
+        Window root = RootWindow (dpy, screen);
-    ev.window = w;
+        XUnmapEvent ev = {
-    ev.from_configure = False;
+            .type = UnmapNotify,
-    return (XSendEvent (dpy, root, False,
+            .event = root,
-			SubstructureRedirectMask|SubstructureNotifyMask,
+            .window = w,
-			(XEvent *)&ev));
+            .from_configure = False
+        };
+        return (XSendEvent (dpy, root, False,
+                            SubstructureRedirectMask|SubstructureNotifyMask,
+                            (XEvent *)&ev));
+    }
 }