1. 03 Jul, 2018 19 commits
    • Mike Gabriel's avatar
      Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b3. · e734ca21
      Mike Gabriel authored
       Spotted in and backported from X.org:
      
       commit 021fc5cb2cb4a7972b4a6fcb570c1da92787d68d
       Author: Adam Jackson <ajax@benzedrine.nwnk.net>
       Date:   Sun Mar 18 16:31:19 2007 -0400
      
          Static markup and dead code cull over xkb/.
      
          The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
          include/xkbsrv.h, and the world updated to look for it in the new place,
          since it made no sense to define server API in an extension header.  Any
          further work along this line will need to do similar things with XKBgeom.h
          and friends.
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      e734ca21
    • Daniel Stone's avatar
      Xserver/xkb: Remove -xkbmap argument. · ec0cfcec
      Daniel Stone authored
       Backported from X.org:
      
       commit fd8bde8bb0f9d796b3464973b53285c0a6d22a31
       Author: Daniel Stone <daniel@fooishbar.org>
       Date:   Mon May 29 11:14:03 2006 +0000
      
          Remove -xkbmap argument.
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      ec0cfcec
    • Mike Gabriel's avatar
      hw/nxagent/Keyboard.c: Drop support for loading XKB config from file. · cc27ebb2
      Mike Gabriel authored
       * Support for XkbCF has been dropped in XKB extension by X.org
       * Has never been used in recent NXv3 implementations (e.g. X2Go)
       * Config file parsing is error prone, use setxkbmap API instead
      cc27ebb2
    • Mike Gabriel's avatar
      b1e4d6e8
    • Ulrich Sibiller's avatar
      Atoms.c: more debugging output · f2d3eac8
      Ulrich Sibiller authored
      f2d3eac8
    • Mike Gabriel's avatar
      ce83b566
    • Mike Gabriel's avatar
      dixfonts.c: use calloc for LFclosurePtr · b394eac8
      Mike Gabriel authored
          ... to keep dix/dixfonts and hw/nxagnet/NXdixfonts.c in sync.
      b394eac8
    • Mike Gabriel's avatar
      dix/dixfonts.c: free() can handle NULL · 59e46dc5
      Mike Gabriel authored
      so let's remove some superflous tests
      59e46dc5
    • Ulrich Sibiller's avatar
      NXdixfonts.c: free() can handle NULL · a2008b28
      Ulrich Sibiller authored
      so let's remove some superflous tests
      a2008b28
    • Ulrich Sibiller's avatar
      NXdixfonts.c: use calloc for LFclosurePtr · e0291f30
      Ulrich Sibiller authored
      Just to be sure. It is used at lots of locations afterwards.
      e0291f30
    • Ulrich Sibiller's avatar
      xkb/xkb.c: init all reply structs · cfcaa442
      Ulrich Sibiller authored
      and do it identically everywhere. As we are using C99 designated
      initializers here we remove the memset and bzero calls that had been
      used for this at some locations.
      cfcaa442
    • Ulrich Sibiller's avatar
      os/io.c: fix unitialised bytes · e5975a70
      Ulrich Sibiller authored
      ... by implementing some kind of recalloc (mix of realloc and calloc).
      
      Fixes this valgrind finding:
      
      ==7061== Syscall param writev(vector[...]) points to uninitialised byte(s)
      ==7061==    at 0x781EFE0: __writev_nocancel (syscall-template.S:84)
      ==7061==    by 0x488974: _XSERVTransSocketWritev (Xtranssock.c:2914)
      ==7061==    by 0x47DBD3: FlushClient (io.c:1080)
      ==7061==    by 0x47DBD3: FlushAllOutput.part.0 (io.c:817)
      ==7061==    by 0x477304: WaitForSomething (WaitFor.c:246)
      ==7061==    by 0x434369: Dispatch (NXdispatch.c:360)
      ==7061==    by 0x40EB92: main (main.c:353)
      ==7061==  Address 0x102106f3 is 50,211 bytes inside a block of size 54,308 alloc'd
      ==7061==    at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==7061==    by 0x47F08F: FlushClient (io.c:1123)
      ==7061==    by 0x47F307: WriteToClient (io.c:991)
      ==7061==    by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
      ==7061==    by 0x42B7D6: ListFonts (NXdixfonts.c:735)
      ==7061==    by 0x433A6D: ProcListFonts (NXdispatch.c:989)
      ==7061==    by 0x4344A5: Dispatch (NXdispatch.c:482)
      ==7061==    by 0x40EB92: main (main.c:353)
      ==7061==  Uninitialised value was created by a heap allocation
      ==7061==    at 0x4C2FD5F: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
      ==7061==    by 0x47F08F: FlushClient (io.c:1123)
      ==7061==    by 0x47F307: WriteToClient (io.c:991)
      ==7061==    by 0x42903C: doListFontsAndAliases (NXdixfonts.c:660)
      ==7061==    by 0x42B7D6: ListFonts (NXdixfonts.c:735)
      ==7061==    by 0x433A6D: ProcListFonts (NXdispatch.c:989)
      ==7061==    by 0x4344A5: Dispatch (NXdispatch.c:482)
      ==7061==    by 0x40EB92: main (main.c:353)
      ==7061==
      e5975a70
    • Ulrich Sibiller's avatar
      ProcGetPointerMapping uses rep.nElts before it is initialized · 389e3a44
      Ulrich Sibiller authored
      Backport of this xorg upstream commit (with omitting the mentioned
      d792ac125a0462a04a930af543cbc732f8cdab7d).
      
        commit 34cf559bcf99dad550527b5ff53f247f0e8e73ee
        Author: Keith Packard <keithp@keithp.com>
        Date:   Tue Jul 10 15:58:48 2012 -0700
      
          ProcGetPointerMapping uses rep.nElts before it is initialized
      
          In:
      
                  commit d792ac125a0462a04a930af543cbc732f8cdab7d
                  Author: Alan Coopersmith <alan.coopersmith@oracle.com>
                  Date:   Mon Jul 9 19:12:43 2012 -0700
      
                      Use C99 designated initializers in dix Replies
      
          the initializer for the .length element of the xGetPointerMappingReply
          structure uses the value of rep.nElts, but that won't be set until
          after this initializer runs, so we get garbage in the length element
          and clients using it will generally wedge.
      
          Easy to verify:
      
                  $ xmodmap -pp
      
          Fixed by creating a local nElts variable and using that.
      Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
      Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
      Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
      389e3a44
    • Ulrich Sibiller's avatar
      Fix some valgrind findings · 1e3db85a
      Ulrich Sibiller authored
      Some of them have not been seen in the wild yet.
      
      Partly fixes ArcticaProject/nx-libs#711
      1e3db85a
    • Ulrich Sibiller's avatar
      Some small Keyboard.c improvements · 7a627e64
      Ulrich Sibiller authored
      as in xorg-xserver upstream's hw/xnest/Keyboard.c
      7a627e64
    • Mike Gabriel's avatar
      Merge branch 'sunweaver-pr/idletime-counter' into 3.6.x · 98349512
      Mike Gabriel authored
       Attributes GH PR #713: https://github.com/ArcticaProject/nx-libs/pull/713
      
       Reviewed by Ulrich Sibiller <uli42@gmx.de> -- Tue,  3 Jul 2018 15:24:31 +0200 (CEST)
      98349512
    • Mike Gabriel's avatar
      Don't reset the lastDeviceEventTime when doing DPMS actions · 222153af
      Mike Gabriel authored
       Backported from X.org's Xserver:
      
          commit c1d901d723c3bee523736eacc15b44a7dff484fe
          Author: Richard Hughes <richard@hughsie.com>
          Date:   Fri Aug 14 11:44:35 2009 +0100
      
              Don't reset the lastDeviceEventTime when doing DPMS actions
      
              When we change the DPMS mode, don't play games with the last event time as
              this breaks applications using IDLETIME to turn the backlight off after a
              preset time.
      
              This patch fixes gnome-power-manager and xfce-power-manager
      Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      Backport-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      222153af
    • Richard Hughes's avatar
      Do not reset lastDeviceEventTime when we do dixSaveScreens · 7401a669
      Richard Hughes authored
       Backported from X.org's Xserver:
      
          commit 6b5978dcf1f7ac3ecc2f22df06f7000f360e2066
          Author: Richard Hughes <richard@hughsie.com>
          Date:   Mon Aug 17 09:15:32 2009 +0100
      
              Do not reset lastDeviceEventTime when we do dixSaveScreens
      
              When we turn off DPMS with DPMSModeOff and do dixSaveScreens, don't reset the
              event time else session clients using IDLETIME will be reset.
      Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      7401a669
    • Mike Gabriel's avatar
      Backport IDLETIME system counter to nx-X11 Xserver. · 14f73487
      Mike Gabriel authored
       This resolves issues with non-starting mate-screensaver which
       relies on the IDLETIME API these days.
      
       This commit backports the following X.org Xserver commits:
      
          commit a2e67a6412386782cb8b644b86a5744591397d45
          Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
          Date:   Mon Dec 6 11:24:01 2010 +1100
      
              IDLETIME: Fix edge-case in IdleTimeBlockHandler
      
              Ensure that if we're called exactly on the threshold of a
              NegativeTransition trigger that we reshedule to pick up
              an idle time over the threshold.
      Signed-off-by: 's avatarChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>
      Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
      Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
      
          commit 1f4fb0225b278d1cf4145aebeb0bdd23dc8f62d5
          Author: Adam Jackson <ajax@redhat.com>
          Date:   Wed Dec 10 16:13:20 2008 -0500
      
              xsync: Fix wakeup storm in idletime counter.
      
              Wakeup scheduling only considered the threshold values, and not whether
              the trigger was edge or level.
      
              See also:
              https://bugzilla.redhat.com/show_bug.cgi?id=474586
              http://svn.gnome.org/viewvc/gnome-screensaver/trunk/src/test-idle-ext.c?view=markup
      
          commit 0f9e89b4e309e570d7d366489d250ca2143f0ad7
          Author: Fredrik Höglund <fredrik@kde.org>
          Date:   Tue Aug 14 22:47:49 2007 +0200
      
              Fix the value comparisons in the IDLETIME wakeup handler.
      
              LessThan/GreaterThan comparisons were used in the wakeup handler,
              and LessOrEqual/GreaterOrEqual in the block handler.
      
              Change it to use LessOrEqual/GreaterOrEqual in both functions,
              since this is what XSyncNegativeComparison and
              XSyncPositiveComparison imply.
      
          commit 7e2c935920cafadbd87c351f1a3239932864fb90
          Author: Fredrik Höglund <fredrik@kde.org>
          Date:   Fri May 18 20:06:14 2007 +0200
      
              Add a new IDLETIME system sync counter.
      
              This counter exposes the time in milliseconds since the last
              input event. Clients such as screen savers and power managers
              can set an alarm on this counter to find out when the idle time
              reaches a certain value, without having to poll the server.
      Backport-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      14f73487
  2. 16 Jun, 2018 4 commits
  3. 06 Jun, 2018 1 commit
  4. 05 Jun, 2018 1 commit
  5. 24 May, 2018 15 commits