[X2Go-Commits] [nx-libs] 05/30: Some small Keyboard.c improvements

git-admin at x2go.org git-admin at x2go.org
Tue Jul 3 22:23:57 CEST 2018


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 7a627e644242bdbb00e5cdac4536c64268454af3
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Jun 21 22:16:58 2018 +0200

    Some small Keyboard.c improvements
    
    as in xorg-xserver upstream's hw/xnest/Keyboard.c
---
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 758ec92..51a11b4 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -704,7 +704,7 @@ int nxagentKeyboardProc(DeviceIntPtr pDev, int onoff)
   int mapWidth;
   int min_keycode, max_keycode;
   KeySymsRec keySyms;
-  CARD8 modmap[256];
+  CARD8 modmap[MAP_LENGTH];
   int i, j;
   XKeyboardState values;
   char *model = NULL, *layout = NULL;
@@ -765,7 +765,7 @@ N/A
 #ifdef _XSERVER64
       {
         KeySym64 *keymap64;
-        int i, len;
+        int len;
         keymap64 = XGetKeyboardMapping(nxagentDisplay,
                                      min_keycode,
                                      max_keycode - min_keycode + 1,
@@ -807,8 +807,7 @@ N/A
       nxagentCapsMask = 0;
       nxagentNumlockMask = 0;
 
-      for (i = 0; i < 256; i++)
-        modmap[i] = 0;
+      memset(modmap, 0, sizeof(modmap));
       for (j = 0; j < 8; j++)
         for(i = 0; i < modifier_keymap->max_keypermod; i++) {
           CARD8 keycode;
@@ -823,6 +822,7 @@ N/A
           }
         }
       XFreeModifiermap(modifier_keymap);
+      modifier_keymap = NULL;
 
       nxagentCheckRemoteKeycodes();
 

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