1. 02 May, 2016 26 commits
    • Mike Gabriel's avatar
      hw/nxagent/NXglyphcurs.c: Don't declare and set gcval, if not being used later on. · 292d88d0
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       NXglyphcurs.c: In function ‘ServerBitsFromGlyph’:
       NXglyphcurs.c:109:17: warning: variable ‘gcval’ set but not used [-Wunused-but-set-variable]
           ChangeGCVal gcval[3];
                       ^
       ```
      292d88d0
    • Mike Gabriel's avatar
      hw/nxagent/Keyboard.c: The ret variable is only used later on when compiled with -DTEST. · 182569bf
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Keyboard.c: In function ‘nxagentKeyboardProc’:
       Keyboard.c:688:7: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]
          int ret;
              ^
       ```
      182569bf
    • Mike Gabriel's avatar
      hw/nxagent/Handlers.c: Don't declare and assign result variable if not used later on. · 66f88954
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Handlers.c: In function ‘nxagentShadowBlockHandler’:
       Handlers.c:732:7: warning: variable ‘result’ set but not used [-Wunused-but-set-variable]
          int result;
              ^
       ```
      66f88954
    • Mike Gabriel's avatar
      hw/nxagent/Keyboard.c: Don't declare and set XkbDescPtr xkb if not used later on. · fc393174
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Keyboard.c: In function ‘nxagentNotifyKeyboardChanges’:
       Keyboard.c:1211:16: warning: variable ‘xkb’ set but not used [-Wunused-but-set-variable]
            XkbDescPtr xkb;
                       ^
       ```
      fc393174
    • Mike Gabriel's avatar
      hw/nxagent/*.c: Drop various declarations of unused ScreenPtr pScreen. · eb682184
      Mike Gabriel authored
       These can be dropped after we have turned REGION_* macros into
       static inline function calls in some of the previous commits.
      eb682184
    • Mike Gabriel's avatar
      hw/nxagent/Screen.c: Cast proper types before handing values over to fprintf(). · b5b7a2d2
      Mike Gabriel authored
       Amends the following compiler warnings:
      
       ```
       Screen.c: In function ‘nxagentCreateIconWindow’:
       Screen.c:394:15: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Window’ [-Wformat=]
                      nxagentIconWindow);
                      ^
       Screen.c: In function ‘nxagentSetScreenSaverTime’:
       Screen.c:456:19: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘CARD32’ [-Wformat=]
                          ScreenSaverTime, ScreenSaverInterval);
                          ^
       Screen.c:456:19: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘CARD32’ [-Wformat=]
       Screen.c:476:19: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘CARD32’ [-Wformat=]
                          ScreenSaverTime, ScreenSaverInterval);
                          ^
       Screen.c:476:19: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘CARD32’ [-Wformat=]
       Screen.c: In function ‘nxagentOpenScreen’:
       Screen.c:1234:19: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘VisualID’ [-Wformat=]
                          visuals[numVisuals].vid);
                          ^
       Screen.c:1274:23: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘VisualID’ [-Wformat=]
                              depths[depthIndex].depth);
                              ^
       Screen.c:1282:17: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘VisualID’ [-Wformat=]
                        defaultVisualIndex, visuals[defaultVisualIndex].vid);
                        ^
       Screen.c:1319:19: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘VisualID’ [-Wformat=]
                          rootDepth, defaultVisual);
                          ^
       Screen.c:1336:19: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘VisualID’ [-Wformat=]
                          rootDepth, defaultVisual);
                          ^
       Screen.c:1348:19: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘VisualID’ [-Wformat=]
                          rootDepth, defaultVisual);
                          ^
       Screen.c:1357:19: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 6 has type ‘VisualID’ [-Wformat=]
                          rootDepth, defaultVisual);
                          ^
       Screen.c:1723:21: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Window’ [-Wformat=]
                            nxagentDefaultWindows[pScreen->myNum]);
                            ^
       Screen.c:1763:19: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Window’ [-Wformat=]
                          nxagentDefaultWindows[pScreen->myNum]);
                          ^
       Screen.c:1775:17: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Window’ [-Wformat=]
                        nxagentDefaultWindows[pScreen->myNum]);
                        ^
       Screen.c:1790:17: warning: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘Window’ [-Wformat=]
                        nxagentDefaultWindows[pScreen->myNum]);
                        ^
       Screen.c: In function ‘nxagentShadowAdaptDepth’:
       Screen.c:3189:14: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘long unsigned int’ [-Wformat=]
                     pVisual -> red_mask, pVisual -> green_mask, pVisual -> blue_mask);
                     ^
       Screen.c:3189:14: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘long unsigned int’ [-Wformat=]
       Screen.c:3189:14: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long unsigned int’ [-Wformat=]
       Screen.c:3198:15: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘long unsigned int’ [-Wformat=]
                      redMask, greenMask, blueMask);
                      ^
       Screen.c:3198:15: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 4 has type ‘long unsigned int’ [-Wformat=]
       Screen.c:3198:15: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long unsigned int’ [-Wformat=]
       ```
      b5b7a2d2
    • Mike Gabriel's avatar
      hw/nxagent/Screen.c: Drop various unused variables. · ab50f84b
      Mike Gabriel authored
       Amends the following compiler warnings:
      
       ```
       Screen.c: In function ‘nxagentReconnectScreen’:
       Screen.c:3547:7: warning: variable ‘flexibility’ set but not used [-Wunused-but-set-variable]
         int flexibility;
             ^
       Screen.c: In function ‘nxagentAdjustRandRXinerama’:
       Screen.c:3746:12: warning: unused variable ‘j’ [-Wunused-variable]
            int i, j;
                   ^
       Screen.c: In function ‘nxagentSaveAreas’:
       Screen.c:4116:15: warning: variable ‘pDrawable’ set but not used [-Wunused-but-set-variable]
          DrawablePtr pDrawable;
                      ^
       Screen.c: In function ‘nxagentRestoreAreas’:
       Screen.c:4236:15: warning: variable ‘pDrawable’ set but not used [-Wunused-but-set-variable]
          DrawablePtr pDrawable;
                      ^
       ```
      ab50f84b
    • Mike Gabriel's avatar
      hw/nxagent/Screen.h: Provide prototype for nxagentAdjustRandRXinerama(). Avoid… · ef287b54
      Mike Gabriel authored
      hw/nxagent/Screen.h: Provide prototype for nxagentAdjustRandRXinerama(). Avoid implicit-declaration compiler warning.
      
       Amends the following compiler warning:
      
       ```
       Screen.c:3716:5: warning: implicit declaration of function ‘nxagentAdjustRandRXinerama’ [-Wimplicit-function-declaration]
            nxagentAdjustRandRXinerama(pScreen);
            ^
       ```
      ef287b54
    • Mike Gabriel's avatar
      hw/nxagent/Screen.c: Correctly use already defined MIN/MAX macros. · 72386e17
      Mike Gabriel authored
       Use MIN(A,B) macro as defined in Utils.h. Add MAX(A,B) macro in Utils.h,
       as well. Don't have another set of MIN/MAX macro definitions in
       Screen.c.
      
       Amends the following compiler warnings:
      
       ```
       Screen.c:3600:0: warning: "MIN" redefined
        #define MIN(a,b) ((a) < (b)) ? (a) : (b);
        ^
       In file included from Screen.c:78:0:
       Utils.h:36:0: note: this is the location of the previous definition
        #define MIN(A, B) ( (A) < (B) ? (A) : (B) )
        ^
       ```
      72386e17
    • Mike Gabriel's avatar
      hw/nxagent/Window.c: Don't declare "XWindowChanges changes;" and later not use it. · 7d3d47f1
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Window.c:2179:24: warning: variable ‘changes’ set but not used [-Wunused-but-set-variable]
               XWindowChanges changes;
                              ^
       ```
      7d3d47f1
    • Mike Gabriel's avatar
      hw/nxagent/Pixmap.c: pBool pointer is only required when compiled in -DTEST mode. · 5ea2457e
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Pixmap.c: In function ‘nxagentDisconnectPixmap’:
       Pixmap.c:755:9: warning: variable ‘pBool’ set but not used [-Wunused-but-set-variable]
          Bool *pBool;
                ^
       ```
      5ea2457e
    • Mike Gabriel's avatar
      hw/nxagent/Extension.c: Don't declare pRandRScrPriv without using it later on. · 08d38484
      Mike Gabriel authored
       Amends the following the compiler warnings:
      
       ```
       Extensions.c: In function ‘nxagentRandRInitSizes’:
       Extensions.c:159:16: warning: unused variable ‘pRandRScrPriv’ [-Wunused-variable]
          rrScrPrivPtr pRandRScrPriv = rrGetScrPriv(pScreen);
                       ^
       Extensions.c: In function ‘nxagentRandRSetConfig’:
       Extensions.c:263:16: warning: unused variable ‘pRandRScrPriv’ [-Wunused-variable]
          rrScrPrivPtr pRandRScrPriv;
                       ^
       Extensions.c: In function ‘nxagentRandRScreenSetSize’:
       Extensions.c:322:16: warning: unused variable ‘pRandRScrPriv’ [-Wunused-variable]
          rrScrPrivPtr pRandRScrPriv;
                       ^
       ```
      08d38484
    • Mike Gabriel's avatar
      hw/nxagent/Rootless.c: Type cast type Atom to type long unsigned int before… · 802f5816
      Mike Gabriel authored
      hw/nxagent/Rootless.c: Type cast type Atom to type long unsigned int before handing it over to %lu in fprintf().
      
       Amends the following compiler warnings:
      
       ```
       Rootless.c: In function ‘nxagentExportProperty’:
       Rootless.c:775:21: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘Atom’ [-Wformat=]
                            "Property [%lu] too long.\n", propertyX);
                            ^
       ```
      802f5816
    • Mike Gabriel's avatar
      hw/nxagent/Splash.c: Drop unused variable declaration "XPoint m[12];". · c206a0c6
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Splash.c: In function ‘nxagentPaintLogo’:
       Splash.c:168:13: warning: unused variable ‘m’ [-Wunused-variable]
          XPoint    m[12];
                    ^
       ```
      c206a0c6
    • Mike Gabriel's avatar
      hw/nxagent/Clipboard.c: The result variable is only needed when combiled with -DDEBUG. · 5bbdbfce
      Mike Gabriel authored
       Amends the following compiler warning:
      
       ```
       Clipboard.c: In function ‘nxagentRequestSelection’:
       Clipboard.c:272:7: warning: variable ‘result’ set but not used [-Wunused-but-set-variable]
          int result;
              ^
       ```
      5bbdbfce
    • Mike Gabriel's avatar
    • Mike Gabriel's avatar
      Add REGION_ macros for source compatibility with existing drivers. · 12020463
      Mike Gabriel authored
      This makes the region code changes source compatible with existing
      code, although none of them are used within the server source itself.
      
      In NX, this patch is not really necessary, but it has been backported
      with the previous patches for the sake of backporting the complete
      mi/miregion.c -> dix/region.c change in X.Org.
      
      v1: Keith Packard <keithp@keithp.com>
      v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
      12020463
    • Mike Gabriel's avatar
      Change region implementation names to eliminate the 'mi' prefix · b0e69fe3
      Mike Gabriel authored
      This prepares the file to be moved from mi to dix. This patch
      was done mechanically with the included scripts 'fix-miregion' run over
      the entire X server and 'fix-miregion-private' run over
      include/regionstr.h and mi/miregion.c.
      
      v1: Keith Packard <keithp@keithp.com>
      v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
      b0e69fe3
    • Keith Packard's avatar
      Move mi/miregion.c to dix/region.c · 28813651
      Keith Packard authored
      v1: Keith Packard <keithp@keithp.com>
      v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
      28813651
    • Mike Gabriel's avatar
    • Mike Gabriel's avatar
      Change region implementation from macros to inline functions. · 4a8d6eca
      Mike Gabriel authored
      This makes all of the previous macros into inline functions and also
      turns all of the direct calls to pixman region code into inline
      functions as well.
      
      v1: Keith Packard <keithp@keithp.com>
      v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
      4a8d6eca
    • Mike Gabriel's avatar
      Rename region macros to eliminate screen argument · 63f1fff8
      Mike Gabriel authored
      This is a huge mechanical patch and a few small fixups required to finish
      the job. They were reviewed separately, but because the server does not
      build without both pieces, I've merged them together at this time.
      
      The mechanical changes were performed by running the included
      'fix-region' script over the whole nx-X11/programs/Xserver tree:
      
      $ cd nx-X11/programs/Xserver && ( git ls-files | grep -v '^fix-' | xargs ./fix-region; )
      
      And then, the white space errors in the resulting patch were fixed
      using the provided fix-patch-whitespace script.
      
      $ sh ./fix-patch-whitespace
      
      Thanks to Jamey Sharp for the mighty fine sed-generating sed script.
      
      v1: Keith Packard <keithp@keithp.com> (X.Org xserver commit: 2dc138922b7588515d5f2447e4b9dcdc0bef15e0)
      v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (apply fix-region script to nx-libs)
      63f1fff8
    • Mike Gabriel's avatar
      gcc: Build using -std=c99 instead of -ansi. · 28ba8778
      Mike Gabriel authored
      28ba8778
    • Mike Gabriel's avatar
    • Mike Gabriel's avatar
      NXwindow.c: Don't set w and h, not used later on. · eaa19eb5
      Mike Gabriel authored
       Amends the following compiler warnings:
      
       ```
       NXwindow.c: In function ‘nxagentClearSplash’:
       NXwindow.c:342:12: warning: variable ‘h’ set but not used [-Wunused-but-set-variable]
            int w, h;
                   ^
       NXwindow.c:342:9: warning: variable ‘w’ set but not used [-Wunused-but-set-variable]
            int w, h;
                ^
       ```
      eaa19eb5
    • Mike Gabriel's avatar
      lib/Imakefile: Drop $(XINERAMADIR) from nx-X11/lib/Imakefile. · 6c6b6b96
      Mike Gabriel authored
       The var is not defined anymore and the libXinerama code has been removed
       some time ago.
      6c6b6b96
  2. 27 Apr, 2016 5 commits
    • Mike Gabriel's avatar
    • Salvador Fandino's avatar
    • Mike Gabriel's avatar
      b326eda7
    • Mike Gabriel's avatar
    • Fernando Carvajal's avatar
      Clean up compiler warnings in nxcomp · a436cba0
      Fernando Carvajal authored
      This commit removes several warnings in nxcomp related to unused but
      set variables. It also replaces tempnam function with the more secure
      one mkstemp and there has been removed another warning related to
      setgid and setuid returning values not being checked.
      
      So these were the compiler warnings in nxcomp that have been fixed:
      
      Loop.cpp: In function ‘int ParseRemoteOptions(char*)’:
      Loop.cpp:9423:7: warning: variable ‘hasLimit’ set but not used [-Wunused-but-set-variable]
         int hasLimit  = 0;
             ^
      Loop.cpp:9424:7: warning: variable ‘hasRender’ set but not used [-Wunused-but-set-variable]
         int hasRender = 0;
             ^
      Loop.cpp:9425:7: warning: variable ‘hasTaint’ set but not used [-Wunused-but-set-variable]
         int hasTaint  = 0;
             ^
      Loop.cpp:9427:7: warning: variable ‘hasStrict’ set but not used [-Wunused-but-set-variable]
         int hasStrict = 0;
             ^
      Loop.cpp:9428:7: warning: variable ‘hasShseg’ set but not used [-Wunused-but-set-variable]
         int hasShseg  = 0;
             ^
      ServerChannel.cpp: In member function ‘virtual int ServerChannel::handleWrite(const unsigned char*, unsigned int)’:
      ServerChannel.cpp:2132:9: warning: variable ‘hit’ set but not used [-Wunused-but-set-variable]
           int hit;
               ^
      Proxy.o: In function `Proxy::handleSaveAllStores(char const*) const':
      Proxy.cpp:(.text+0x2cac): warning: the use of `tempnam' is dangerous, better use `mkstemp'
      
      Pipe.cpp: In function ‘FILE* Popen(char* const*, const char*)’:
      Pipe.cpp:240:23: warning: ignoring return value of ‘int setgid(__gid_t)’,
      declared with attribute warn_unused_result [-Wunused-result]
             setgid(getgid());
                             ^
      Pipe.cpp:241:23: warning: ignoring return value of ‘int setuid(__uid_t)’,
      declared with attribute warn_unused_result [-Wunused-result]
             setuid(getuid());
                             ^
      
      There was also a hidden problem in the way Proxy::handleSaveAllStores was
      checking for an error in the returning value from the call to the virtual
      method handleSaveAllStores of the specific proxy class really being used
      (ClientProxy or ServerProxy).
      
      Former code was considering the value 0 as the returning value in case of
      an error whereas both subclasses return the value -1 when there is an error
      in their handleSaveAllStores method.
      
      This bug has been fixed in this commit taking advantage of the modification
      that was already being made to this method in order to replace tempnam
      function with the more secure one mkstemp.
      
      Fixes: ArcticaProject/nx-libs#103
      a436cba0
  3. 26 Apr, 2016 1 commit
  4. 20 Apr, 2016 3 commits
  5. 19 Apr, 2016 1 commit
  6. 15 Apr, 2016 1 commit
    • Fernando Carvajal's avatar
      Remove TextCompressor class and files from nxcomp · 5c495241
      Fernando Carvajal authored
      This commit removes TextCompressor class references from ClientCache
      and ServerCache as it's no longer used after removing old protocol's
      compatibility code from nxcomp. It also removes the attribute textCache
      from both classes as it's no longer used either.
      
      Finally the header and source files associated with the TextCompressor
      class are also deleted and removed from the compilation process.
      
      Refs: ArcticaProject/nx-libs#108
      5c495241
  7. 14 Apr, 2016 1 commit
    • Fernando Carvajal's avatar
      Add testing doc for nxcomp drop-old-proto-compat · 00464aea
      Fernando Carvajal authored
      This commit provides documentation about some error tests that have been
      run to check how well behaves nxcomp after removing it's compatibility
      code with versions prior to 3.5.0 and it has to handle a situation in
      in which and older proxy tries to connect with a nxcomp 3.6.x based proxy.
      
      Refs: ArcticaProject/nx-libs#108
      00464aea
  8. 12 Apr, 2016 2 commits
    • Fernando Carvajal's avatar
      Remove obsolete compatibility files from nxcomp · 13464816
      Fernando Carvajal authored
      This commit removes obsolete compatibility files whose components were
      only used to handle compatibility with old protocol versions that are
      no longer supported.
      
      Refs: ArcticaProject/nx-libs#108
      13464816
    • Fernando Carvajal's avatar
      Remove compatibility code for nxcomp before 3.5.0 · a9be6f59
      Fernando Carvajal authored
      As a part of nxcomp's clean-up process, compatibility with old protocol
      versions has been set now at 3.5.0.
      
      This commit removes compatibility code from nxcomp so the minimum supported
      version changes from 1.5.0 (protocol step 6) to 3.5.0 (protocol step 10).
      
      At this moment the removal is not complete and it will be followed by some
      other commits, in order to get rid of several components and files that are
      no longer used as they were only needed to work with old protocol versions.
      
      Refs: ArcticaProject/nx-libs#108
      a9be6f59