Commit d501d48c authored by Ulrich Sibiller's avatar Ulrich Sibiller

Events.c: use designated initializers

parent 9358eaed
...@@ -1610,9 +1610,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already ...@@ -1610,9 +1610,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already
if (nxagentOption(ViewOnly) == 0 && nxagentOption(Shadow)) if (nxagentOption(ViewOnly) == 0 && nxagentOption(Shadow))
{ {
XEvent xM; XEvent xM = {0};
memset(&xM, 0, sizeof(XEvent));
xM.type = KeyRelease; xM.type = KeyRelease;
xM.xkey.display = nxagentDisplay; xM.xkey.display = nxagentDisplay;
xM.xkey.type = KeyRelease; xM.xkey.type = KeyRelease;
...@@ -2539,10 +2537,12 @@ int nxagentHandleGraphicsExposeEvent(XEvent *X) ...@@ -2539,10 +2537,12 @@ int nxagentHandleGraphicsExposeEvent(XEvent *X)
* Rectangle affected by GraphicsExpose event. * Rectangle affected by GraphicsExpose event.
*/ */
rect.x1 = X -> xgraphicsexpose.x; BoxRec rect = {
rect.y1 = X -> xgraphicsexpose.y; .x1 = X -> xgraphicsexpose.x,
rect.x2 = rect.x1 + X -> xgraphicsexpose.width; .y1 = X -> xgraphicsexpose.y,
rect.y2 = rect.y1 + X -> xgraphicsexpose.height; .x2 = rect.x1 + X -> xgraphicsexpose.width,
.y2 = rect.y1 + X -> xgraphicsexpose.height,
};
RegionPtr exposeRegion = RegionCreate(&rect, 0); RegionPtr exposeRegion = RegionCreate(&rect, 0);
...@@ -2635,12 +2635,9 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) ...@@ -2635,12 +2635,9 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result)
if (message_type == MakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), False)) if (message_type == MakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), False))
{ {
xEvent x; xEvent x = {0};
memset(&x, 0, sizeof(xEvent));
x.u.u.type = ClientMessage; x.u.u.type = ClientMessage;
x.u.u.detail = X -> xclient.format; x.u.u.detail = X -> xclient.format;
x.u.clientMessage.window = pWin -> drawable.id; x.u.clientMessage.window = pWin -> drawable.id;
x.u.clientMessage.u.l.type = message_type; x.u.clientMessage.u.l.type = message_type;
x.u.clientMessage.u.l.longs0 = nxagentRemoteToLocalAtom(X -> xclient.data.l[0]); x.u.clientMessage.u.l.longs0 = nxagentRemoteToLocalAtom(X -> xclient.data.l[0]);
...@@ -2854,8 +2851,6 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X) ...@@ -2854,8 +2851,6 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X)
int i = nxagentFindCurrentSelectionIndex(local); int i = nxagentFindCurrentSelectionIndex(local);
if (i < NumCurrentSelections) if (i < NumCurrentSelections)
{ {
SelectionInfoRec info;
if (CurrentSelections[i].client != 0) if (CurrentSelections[i].client != 0)
{ {
#ifdef TEST #ifdef TEST
...@@ -2889,8 +2884,10 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X) ...@@ -2889,8 +2884,10 @@ int nxagentHandleXFixesSelectionNotify(XEvent *X)
} }
#endif #endif
info.selection = &CurrentSelections[i]; SelectionInfoRec info = {
info.kind = xfixesEvent->xfixesselection.subtype; .selection = &CurrentSelections[i],
.kind = xfixesEvent->xfixesselection.subtype
};
/* /*
* The trap indicates that we are triggered by a clipboard event * The trap indicates that we are triggered by a clipboard event
...@@ -3232,9 +3229,8 @@ int nxagentHandleConfigureNotify(XEvent* X) ...@@ -3232,9 +3229,8 @@ int nxagentHandleConfigureNotify(XEvent* X)
if (sendEventAnyway || X -> xconfigure.send_event) if (sendEventAnyway || X -> xconfigure.send_event)
{ {
xEvent x; xEvent x = {0};
memset(&x, 0, sizeof(xEvent));
x.u.u.type = X -> xconfigure.type | 0x80; x.u.u.type = X -> xconfigure.type | 0x80;
x.u.configureNotify.event = pWinWindow -> drawable.id; x.u.configureNotify.event = pWinWindow -> drawable.id;
...@@ -3677,10 +3673,9 @@ void nxagentDisablePointerEvents(void) ...@@ -3677,10 +3673,9 @@ void nxagentDisablePointerEvents(void)
void nxagentSendFakeKey(int key) void nxagentSendFakeKey(int key)
{ {
xEvent fake;
Time now = GetTimeInMillis(); Time now = GetTimeInMillis();
memset(&fake, 0, sizeof(xEvent)); xEvent fake = {0};
fake.u.u.type = KeyPress; fake.u.u.type = KeyPress;
fake.u.u.detail = key; fake.u.u.detail = key;
fake.u.keyButtonPointer.time = now; fake.u.keyButtonPointer.time = now;
...@@ -3696,7 +3691,7 @@ void nxagentSendFakeKey(int key) ...@@ -3696,7 +3691,7 @@ void nxagentSendFakeKey(int key)
int nxagentInitXkbKeyboardState(void) int nxagentInitXkbKeyboardState(void)
{ {
XEvent X; XEvent X = {0};
XkbEvent *xkbev = (XkbEvent *) &X; XkbEvent *xkbev = (XkbEvent *) &X;
...@@ -3709,8 +3704,6 @@ int nxagentInitXkbKeyboardState(void) ...@@ -3709,8 +3704,6 @@ int nxagentInitXkbKeyboardState(void)
fprintf(stderr, "%s: Initializing XKB state.\n", __func__); fprintf(stderr, "%s: Initializing XKB state.\n", __func__);
#endif #endif
memset(&X, 0, sizeof(XEvent));
unsigned int modifiers; unsigned int modifiers;
XkbGetIndicatorState(nxagentDisplay, XkbUseCoreKbd, &modifiers); XkbGetIndicatorState(nxagentDisplay, XkbUseCoreKbd, &modifiers);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment