1. 29 Sep, 2019 1 commit
  2. 27 Aug, 2019 2 commits
    • Ulrich Sibiller's avatar
      dix: add whiteroot flag · 8eeaa40b
      Ulrich Sibiller authored
      Before there was no way of getting a white background despite having
      the approriate code.
      
      Backport of this commit:
      
        commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1
        Author: Daniel Stone <daniel@fooishbar.org>
        Date:   Fri Aug 18 17:04:48 2006 +0300
      
          dix: add whiteroot flag
          Add a -wr option to use a white root window, and use a BackPixel rather
          than BackPixmap for both white and black root windows.
      
      Fixes ArcticaProject/nx-libs#832
      8eeaa40b
    • Ulrich Sibiller's avatar
      dix: add whiteroot flag · a539aaa6
      Ulrich Sibiller authored
      Before there was no way of getting a white background despite having
      the approriate code.
      
      Backport of this commit:
      
        commit cb0a565d2b2cf8823abbd77b4426cc2237731dc1
        Author: Daniel Stone <daniel@fooishbar.org>
        Date:   Fri Aug 18 17:04:48 2006 +0300
      
          dix: add whiteroot flag
          Add a -wr option to use a white root window, and use a BackPixel rather
          than BackPixmap for both white and black root windows.
      
      Fixes ArcticaProject/nx-libs#832
      a539aaa6
  3. 12 Jun, 2019 1 commit
    • Ulrich Sibiller's avatar
      Remove the Must_have_memory hack. · a765857a
      Ulrich Sibiller authored
      We are not using any alloc function that respects that variable, so
      lets drop it. Backport of this commit:
      
        commit 0ce61e21d6d7dcca0090e319bbcdb678570f2c3f
        Author: Adam Jackson <ajax@redhat.com>
        Date:   Fri Oct 3 16:05:19 2008 -0400
      
          Remove the Must_have_memory hack.
      
          Also remove an astonishing amount of misunderstanding of how casts work.
      a765857a
  4. 28 Feb, 2018 1 commit
  5. 27 Feb, 2018 1 commit
  6. 26 Feb, 2018 3 commits
  7. 07 Dec, 2017 1 commit
    • Ulrich Sibiller's avatar
      Reintroduce -co as no-op · eff0f366
      Ulrich Sibiller authored
      nxagent will abort if it encounters an unknown command line option. As
      we want 3.6 to be a drop-in replacement for 3.5 we cannot simply drop old
      options but must accept them as no-op.
      eff0f366
  8. 10 Apr, 2017 1 commit
    • Mike Gabriel's avatar
      Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API alike. · f4c80a78
      Mike Gabriel authored
       Fixes ArcticaProject/nx-libs#296.
      
       Inspired by the following X.org commit. Other than X.org, we will continue
       support for building nx-libs against libXfont1 for a while.
      
       commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7
       Author: Keith Packard <keithp@keithp.com>
       Date:   Tue Sep 1 18:50:55 2015 -0700
      
          dix: Switch to the libXfont2 API (v2)
      
          This new libXfont API eliminates exposing internal X server symbols to
          the font library, replacing those with a struct full of the entire API
          needed to use that library.
      
          v2: Use libXfont2 instead of libXfont_2
      Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
      Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
      f4c80a78
  9. 21 Mar, 2017 6 commits
    • Adam Jackson's avatar
      os: Remove the useless -x option · 565421ba
      Adam Jackson authored
       commit cbb165ab88cb0810268001e84d87671440baf837
       Author: Adam Jackson <ajax@redhat.com>
       Date:   Fri Apr 3 18:34:45 2009 -0400
      
          os: Remove the useless -x option
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      565421ba
    • Jon TURNEY's avatar
      Handle -displayfd and an explicit display number sensibly · 3be144ff
      Jon TURNEY authored
       commit bc348bd2c42f3f18786085ccef2f010eff5bf3d2
       Author: Jon TURNEY <jon.turney@dronecode.org.uk>
       Date:   Mon Mar 11 14:34:32 2013 +0000
      
          Handle -displayfd and an explicit display number sensibly
      
          Handle -displayfd and an explicit display number sensibly, e.g. use the
          explicitly specified display number, and write it to the displayfd
      
          v2: displayfd might be 0, so use -1 as invalid value
          v3: Rebase for addition of NoListenAll flag
      Signed-off-by: 's avatarJon TURNEY <jon.turney@dronecode.org.uk>
      Reviewed-by: 's avatarKristian Høgsberg <krh@bitplanet.net>
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      3be144ff
    • Mike Gabriel's avatar
      Xserver/os/utils.c: Add NXAGENT_SERVER specific -nolisten parameter: ANY. · 506aedbc
      Mike Gabriel authored
       This allows us to trigger the NoListenAll := TRUE code path in nxagent.
      506aedbc
    • Kristian Høgsberg's avatar
      os: Add a mechanism to prevent creating any listen sockets · e8bc4c7e
      Kristian Høgsberg authored
       commit 44fe1b8ea284df6bbaef67e246016d104665b2fe
       Author: Kristian Høgsberg <krh@bitplanet.net>
       Date:   Wed Mar 19 14:03:13 2014 -0700
      
          os: Add a mechanism to prevent creating any listen sockets
      
          A socket-activated server will receive its listening sockets from the
          parent process and should not create its own sockets.  This patch
          introduces a NoListen flag that can be set by a DDX to prevent
          the server from creating the sockets.  When NoListen is enabled, we
          also disable the server lock checking, since the parent process is
          responsible for checking the lock before picking the display name and
          creating the sockets.
      Signed-off-by: 's avatarKristian Høgsberg <krh@bitplanet.net>
      Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      Reviewed-by: 's avatarDaniel Stone <daniel@fooishbar.org>
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      e8bc4c7e
    • Chase Douglas's avatar
      os: Add -displayfd option · 89496d98
      Chase Douglas authored
       commit 88bacc49f06da5927f716869f5a32672a8297ed0
       Author: Chase Douglas <chase.douglas@canonical.com>
       Date:   Wed Apr 4 15:29:42 2012 -0700
      
          os: Add -displayfd option
      
          This option specifies a file descriptor in the launching process.  X
          will scan for an available display number and write that number back to
          the launching process, at the same time as SIGUSR1 generation.  This
          means display managers don't need to guess at available display numbers.
          As a consequence, if X fails to start when using -displayfd, it's not
          because the display was in use, so there's no point in retrying the X
          launch on a higher display number.
      Signed-off-by: 's avatarAdam Jackson <ajax@redhat.com>
      Signed-off-by: 's avatarChase Douglas <chase.douglas@canonical.com>
      Reviewed-by: 's avatarJulien Cristau <jcristau@debian.org>
      Tested-by: 's avatarJulien Cristau <jcristau@debian.org>
      Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
      Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      89496d98
    • Mike Gabriel's avatar
      dix/os: backport various signal handling and smart scheduler changes from X.org · 366067b7
      Mike Gabriel authored
       Backported from X.org:
      
       commit 6178b1c91cfc9e860914acc6f0be2f2d2e07a124
       Author: Adam Jackson <ajax@redhat.com>
       Date:   Tue Jun 7 15:52:11 2016 -0400
      
          dix: Use OsSignal() not signal()
      
          As the man page for the latter states:
      
              The effects of signal() in a multithreaded process are unspecified.
      
          We already have an interface to call sigaction() instead, use it.
      Signed-off-by: 's avatarAdam Jackson <ajax@redhat.com>
      Reviewed-by: 's avatarKeith Packard <keithp@keithp.com>
      
       commit e10ba9e4b52269b2ac75c4802dce4ca47d169657
       Author: Keith Packard <keithp@keithp.com>
       Date:   Wed Nov 11 22:02:01 2015 -0800
      
          Remove non-smart scheduler. Don't require setitimer.
      
          This allows the server to call GetTimeInMillis() after each request is
          processed to avoid needing setitimer. -dumbSched now turns off the
          setitimer.
      Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
      Signed-off-by: 's avatarKeith Packard <keithp@keithp.com>
      
       commit 1f915e8b524dd02011158aa038935970684c7630
       Author: Daniel Drake <drake@endlessm.com>
       Date:   Wed May 20 13:16:12 2015 -0600
      
          Keep SIGALRM restart flag after Popen
      
          Commit 94ab7455 added SA_RESTART to the SIGALRM handler.  However, the
          Popen code tears down and recreates the SIGALRM handler via OsSignal(),
          and this flag is dropped at this time.
      
          Clean the code to use just a single codepath for creating this signal
          handler, always applying SA_RESTART.
      
          [ajax: Fixed commit id]
      Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
      Signed-off-by: 's avatarDaniel Drake <drake@endlessm.com>
      
       commit 94ab7455abc213fc96760e29ab2e943ec682fb22
       Author: Daniel Drake <drake@endlessm.com>
       Date:   Tue May 12 16:39:22 2015 -0600
      
          Allow system call restarts upon signal interruption
      
          The X server frequently deals with SIGIO and SIGALRM interruptions.
          If process execution is inside certain blocking system calls
          when these signals arrive, e.g. with the kernel blocked on
          a contended semaphore, the system calls will be interrupted.
      
          Some system calls are automatically restartable (the kernel re-executes
          them with the same parameters once the signal handler returns) but
          only if the signal handler allows it.
      
          Set SA_RESTART on the signal handlers to enable this convenient
          behaviour.
      Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
      Signed-off-by: 's avatarDaniel Drake <drake@endlessm.com>
      
       commit a6c71ce5d2d2fe89e07a2ef5041c915acc3dc686
       Author: Tiago Vignatti <tiago.vignatti@nokia.com>
       Date:   Mon Mar 28 19:21:28 2011 +0300
      
          os: fix memory and fd leaks in Popen
      Signed-off-by: 's avatarTiago Vignatti <tiago.vignatti@nokia.com>
      Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      Reviewed-by: 's avatarNicolas Peninguy <nico@lostgeeks.org>
      
       commit c9051b684b524549eab6d5b88ee3e195a6f6fbe8
       Author: Alan Coopersmith <alan.coopersmith@sun.com>
       Date:   Wed Nov 5 18:25:57 2008 -0800
      
          Use OsSignal in Popen/Pclose to avoid SysV signal() stupidity
      
       commit 0e9ef65fa583bf2393dd0fda82df6f092387b425
       Author: Keith Packard <keithp@koto.keithp.com>
       Date:   Wed Nov 7 16:33:10 2007 -0800
      
          Don't frob timers unless SmartSchedule is running
      
       commit 2338d5c9914e2a43c3a4f7ee0f4355ad0a1ad9e7
       Author: Arjan van de Ven <arjan@linux.intel.com>
       Date:   Sun Oct 28 09:37:52 2007 +0100
      
          reduce wakeups from smart scheduler
      
          The smart scheduler itimer currently always fires after each request
          (which in turn causes the CPU to wake out of idle, burning precious
          power). Rather than doing this, just stop the timer before going into
          the select() portion of the WaitFor loop. It's a cheap system call, and
          it will only get called if there's no more commands batched up from the
          active fd.
      
          This change also allows some of the functions to be simplified;
          setitimer() will only fail if it's passed invalid data, and we don't do
          that... so make it void and remove all the conditional code that deals
          with failure.
      
          The change also allows us to remove a few variables that were used for
          housekeeping between the signal handler and the main loop.
      Signed-off-by: 's avatarKeith Packard <keithp@koto.keithp.com>
      
       **Note**: The above change also required ABI changes in hw/nxagent/.
      
       commit abe0a51f3f790f8c055289465e130177c4b647cc
       Author: Ben Byer <bbyer@bbyer.apple.com>
       Date:   Fri Sep 21 17:07:36 2007 -0700
      
          So, like, checking return codes of system calls (signal, etc) is good.
          Also, only restore an old signal handler if one was actually set
          (prevents the server from dying on OS X).
      
       commit 6da39c67905500ab2db00a45cda4a9f756cdde96
       Author: Eric Anholt <eric@anholt.net>
       Date:   Wed Sep 12 13:23:13 2007 +0000
      
          Fix build on FreeBSD after Popen changes.
      
       commit a5b8053606d6e786cdcf6734f271acc05f9cc588
       Author: Adam Jackson <ajax@benzedrine.nwnk.net>
       Date:   Tue Sep 11 11:37:06 2007 -0400
      
          Ignore - not just block - SIGALRM around Popen()/Pclose().
      
          Because our "popen" implementation uses stdio, and because nobody's stdio
          library is capable of surviving signals, we need to make absolutely sure
          that we hide the SIGALRM from the smart scheduler.  Otherwise, when you
          open a menu in openoffice, and it recompiles XKB to deal with the
          accelerators, and you popen xkbcomp because we suck, then the scheduler
          will tell you you're taking forever doing something stupid, and the
          wait() code will get confused, and input will hang and your CPU usage
          slams to 100%.  Down, not across.
      Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
      366067b7
  10. 01 Mar, 2017 8 commits
  11. 26 Feb, 2017 1 commit
    • Mike Gabriel's avatar
      Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely.… · f6a11402
      Mike Gabriel authored
      Xserver/os/oscolor.c: Follow X.org in dropping the rgb.txt file entirely. Content of that file is now hard-coded.
      
       Adopting an exact copy of os/oscolor.c from X.org leads to this compiler warning:
      
       ```
       oscolor.c:844:1: warning: string length ‘7614’ is greater than the length ‘4095’ ISO C99 compilers are required to support [-Woverlength-strings]
       };
       ^
       ```
      
       This will be address later in coordination with X.org.
      
       Note: there is a tiny change in oscolor.c as we ship it. The original X.org file includes <X11/keysym.h> which seems
       unneeded. We drop that one line from oscolor.c.
      
       Fixes ArcticaProject/nx-libs#259.
      f6a11402
  12. 15 Feb, 2017 1 commit
  13. 08 Feb, 2017 6 commits
  14. 02 Nov, 2016 1 commit
  15. 06 Oct, 2016 3 commits
  16. 05 Jul, 2016 2 commits
  17. 02 Jul, 2016 1 commit
    • Mike Gabriel's avatar
      os: Remove deprecated malloc/free wrappers, clean… · f779b2e3
      Mike Gabriel authored
      os: Remove deprecated malloc/free wrappers, clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage
      
       Backported from X.org:
      
       commit cad9b053d52f62432dfd70e42e0240de77027cae
       Author: Adam Jackson <ajax@redhat.com>
       Date:   Tue Jul 8 13:24:25 2014 -0400
      
          os: Remove deprecated malloc/free wrappers
      Reviewed-by: 's avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: 's avatarAdam Jackson <ajax@redhat.com>
      
       commit e983848ab44b0769f97f6207f1aa8b4f127be6a9
       Author: Mikhail Gusarov <dottedmag@dottedmag.net>
       Date:   Thu May 6 00:16:24 2010 +0700
      
          Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage
      
          C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so
          stop fiddling with alignment manually and just pass the arguments to library
          functions.
      
          Also convert silent error when negative size is passed into function into
          warning in log file.
      Signed-off-by: 's avatarMikhail Gusarov <dottedmag@dottedmag.net>
      Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
      
       Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
      f779b2e3