[X2Go-Commits] [nx-libs] 157/219: Events.c: refactor nxagentHandleKeypress

git-admin at x2go.org git-admin at x2go.org
Sat Sep 28 12:10:45 CEST 2019


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 c260ae425475597120a65ad413d4341f7698a469
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Fri Jun 28 22:07:00 2019 +0200

    Events.c: refactor nxagentHandleKeypress
---
 nx-X11/programs/Xserver/hw/nxagent/Events.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index d8bf4df60..666302606 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -2225,8 +2225,6 @@ FIXME: Don't enqueue the KeyRelease event if the key was
 
 int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
 {
-  xEvent x;
-
   if (nxagentXkbState.Initialized == 0)
   {
     if (X -> xkey.keycode == nxagentCapsLockKeycode)
@@ -2258,15 +2256,15 @@ int nxagentHandleKeyPress(XEvent *X, enum HandleEventResult *result)
     nxagentXkbState.Num = (~nxagentXkbState.Num & 1);
   }
 
+  nxagentLastServerTime = X -> xkey.time;
+
   nxagentLastEventTime = nxagentLastKeyPressTime = GetTimeInMillis();
-  
-  memset(&x, 0, sizeof(xEvent));
+
+  xEvent x = {0};
   x.u.u.type = KeyPress;
   x.u.u.detail = nxagentConvertKeycode(X -> xkey.keycode);
   x.u.keyButtonPointer.time = nxagentLastKeyPressTime;
 
-  nxagentLastServerTime = X -> xkey.time;
-
   mieqEnqueue(&x);
 
   CriticalOutputPending = 1;

--
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