1. 21 Jun, 2016 5 commits
    • Mike Gabriel's avatar
      Properly enable/disable Xinerama support in nxagent via cmdline options provider… · d1304940
      Mike Gabriel authored
      Properly enable/disable Xinerama support in nxagent via cmdline options provider in Xserver/os/utils.c.
      
        * Xinerama defaults to enabled, using RRXineramaExtension
          (i.e. cmdline option: +rrxinerama).
        * Cmdline option -rrxinerama disables Xinerama support entirely.
        * Cmdline option +xinerama switches from RRXineramaExtension to
          PanoramiXExtension.
        * Cmdline option -xinerama is actually non-functional (i.e. the
          default).
        * If the nx/nx option "xinerama" is handed over to nxagent,
          then Xinerama is only switched on if that given option enables it
          (value: 1) _and_ if either of the Xinerama extensions (PanoramiX
          or RRXinerama) has been initialized (via cmdline options above).
      
       Fixes ArcticaProject/nx-libs#117.
       Fixes ArcticaProject/nx-libs#134 (makes flawed PR#134 obsolete).
      d1304940
    • Mike Gabriel's avatar
    • Mihai Moldovan's avatar
      {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},… · 4d6d3c56
      Mihai Moldovan authored
      {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options.h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended.
      4d6d3c56
    • Mike Gabriel's avatar
      nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always greater… · 04d2fe3a
      Mike Gabriel authored
      nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always greater than zero. We have seen Xevent.xbutton.button being set to AnyButton (equaling 0).
      
      Fixes ArcticaProject/nx-libs#92
      Fixes X2GoBTS#791
      04d2fe3a
    • Mihai Moldovan's avatar
      nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to… · 129cc6af
      Mihai Moldovan authored
      nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to different data type sizes between Xserver and Xlib.
      
      While on the X server side we were expecting a 32bit value, the Xlib side in
      nxcompext wrote a 64bit integer to the 32bit location, hence overwriting
      "random" data on the stack (most notably the return adress.)
      
      We can work around this by using the Xlib-based Window data type on the
      server-side as well, but this problem is likely a more general one.
      
      Calling functions from libcompext in nxagent sounds like a bad idea. Other code
      locations might well be affected by issues alike to that as well.
      
      In order to silence compiler warnings, use a "macro hack" for overriding the
      "Window" type in NXlib.h.
      129cc6af
  2. 12 Jun, 2016 3 commits
  3. 09 Jun, 2016 1 commit
  4. 03 Jun, 2016 2 commits
  5. 01 Jun, 2016 15 commits
  6. 31 May, 2016 8 commits
  7. 30 May, 2016 3 commits
  8. 25 May, 2016 1 commit
  9. 13 May, 2016 2 commits
    • Mihai Moldovan's avatar
    • Mike Gabriel's avatar
      hw/nxagent/Display.c: Avoid incompatible pointer type. · 52dc4960
      Mike Gabriel authored
       Amends the following compiler warning
      
       Display.c: In function ‘nxagentMakeIcon’:
       Display.c:1949:18: warning: assignment from incompatible pointer type
            agentIconData=x2goagentIconData;
                        ^
       Display.c:1954:18: warning: assignment from incompatible pointer type
            agentIconData=nxagentIconData;
                        ^
       Display.c:2001:41: warning: passing argument 3 of ‘XpmCreatePixmapFromData’ from incompatible pointer type
                                                agentIconData,
                                                ^
       In file included from Icons.h:22:0,
                        from Display.c:67:
       X11/include/xpm_nxagent.h:242:6: note: expected ‘char **’ but argument is of type ‘char *’
        FUNC(XpmCreatePixmapFromData, int, (Display *display,
             ^
       X11/include/xpm_nxagent.h:230:32: note: in definition of macro ‘FUNC’
        #define FUNC(f, t, p) extern t f p
      52dc4960