aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* hw/nxagent/Keyboard.c: Don't declare and set XkbDescPtr xkb if not used ↵Mike Gabriel2016-05-021-2/+0
| | | | | | | | | | | | | later on. 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; ^ ```
* hw/nxagent/*.c: Drop various declarations of unused ScreenPtr pScreen.Mike Gabriel2016-05-024-28/+0
| | | | | These can be dropped after we have turned REGION_* macros into static inline function calls in some of the previous commits.
* hw/nxagent/Screen.c: Cast proper types before handing values over to fprintf().Mike Gabriel2016-05-021-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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=] ```
* hw/nxagent/Screen.c: Drop various unused variables.Mike Gabriel2016-05-021-10/+1
| | | | | | | | | | | | | | | | | | | | | | | 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; ^ ```
* hw/nxagent/Screen.h: Provide prototype for nxagentAdjustRandRXinerama(). ↵Mike Gabriel2016-05-022-0/+3
| | | | | | | | | | | | 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); ^ ```
* hw/nxagent/Screen.c: Correctly use already defined MIN/MAX macros.Mike Gabriel2016-05-022-4/+4
| | | | | | | | | | | | | | | | | | 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) ) ^ ```
* hw/nxagent/Window.c: Don't declare "XWindowChanges changes;" and later not ↵Mike Gabriel2016-05-021-4/+0
| | | | | | | | | | | | use it. Amends the following compiler warning: ``` Window.c:2179:24: warning: variable ‘changes’ set but not used [-Wunused-but-set-variable] XWindowChanges changes; ^ ```
* hw/nxagent/Pixmap.c: pBool pointer is only required when compiled in -DTEST ↵Mike Gabriel2016-05-021-1/+1
| | | | | | | | | | | | | mode. 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; ^ ```
* hw/nxagent/Extension.c: Don't declare pRandRScrPriv without using it later on.Mike Gabriel2016-05-021-3/+0
| | | | | | | | | | | | | | | | | | | 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; ^ ```
* hw/nxagent/Rootless.c: Type cast type Atom to type long unsigned int before ↵Mike Gabriel2016-05-021-1/+1
| | | | | | | | | | | | | 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); ^ ```
* hw/nxagent/Splash.c: Drop unused variable declaration "XPoint m[12];".Mike Gabriel2016-05-021-1/+0
| | | | | | | | | | | Amends the following compiler warning: ``` Splash.c: In function ‘nxagentPaintLogo’: Splash.c:168:13: warning: unused variable ‘m’ [-Wunused-variable] XPoint m[12]; ^ ```
* hw/nxagent/Clipboard.c: The result variable is only needed when combiled ↵Mike Gabriel2016-05-021-4/+12
| | | | | | | | | | | | | with -DDEBUG. 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; ^ ```
* hw/nxagent/Drawable.c: RegionNumRects returns int, not long int anymore.Mike Gabriel2016-05-021-1/+1
|
* Add REGION_ macros for source compatibility with existing drivers.Mike Gabriel2016-05-021-0/+39
| | | | | | | | | | | | 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)
* Change region implementation names to eliminate the 'mi' prefixMike Gabriel2016-05-0211-973/+178
| | | | | | | | | | 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)
* Move mi/miregion.c to dix/region.cKeith Packard2016-05-023-5/+7
| | | | | v1: Keith Packard <keithp@keithp.com> v2: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> (backported to nx-libs)
* pixman-devel: Build against shared library pkg-config(pixman-1).Mike Gabriel2016-05-0225-28/+56
|
* Change region implementation from macros to inline functions.Mike Gabriel2016-05-023-224/+183
| | | | | | | | | 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>
* Rename region macros to eliminate screen argumentMike Gabriel2016-05-0276-1977/+2017
| | | | | | | | | | | | | | | | | | | | | 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)
* gcc: Build using -std=c99 instead of -ansi.Mike Gabriel2016-05-021-2/+2
|
* fix-patch-whitepspace: Copy script from X.Org's xserver Git repo.Mike Gabriel2016-05-021-0/+4
|
* NXwindow.c: Don't set w and h, not used later on.Mike Gabriel2016-05-021-4/+0
| | | | | | | | | | | | | | 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; ^ ```
* lib/Imakefile: Drop $(XINERAMADIR) from nx-X11/lib/Imakefile.Mike Gabriel2016-05-021-1/+0
| | | | | The var is not defined anymore and the libXinerama code has been removed some time ago.
* Merge branch 'sunweaver-pr/nxcomp-unix-sockets-for-channels' into 3.6.xMike Gabriel2016-04-2710-315/+634
|\
| * Provide support for channel endpoints being UNIX file sockets in addition to ↵Salvador Fandino2016-04-2710-315/+634
|/ | | | being TCP/IP sockets.
* nxcomp: Rephrase comment in previous commit.Mike Gabriel2016-04-271-3/+3
|
* Merge branch 'fcarvajaldev-3.6.x-nxcomp-amend-compiler-warnings' into 3.6.xMike Gabriel2016-04-275-61/+129
|\
| * Clean up compiler warnings in nxcompFernando Carvajal2016-04-275-61/+129
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'sunweaver-pr/libxrender-cleanup' into arctica-3.6.xMihai Moldovan2016-04-2628-4002/+39
|\
| * library-cleanup: Don't build libNX_Xrender anymore. Use system's libXrender ↵Mike Gabriel2016-04-2028-4002/+39
|/ | | | shared library.
* Merge branch 'theqvd-fix-for-112' into 3.6.xMike Gabriel2016-04-201-19/+10
|\
| * Fix copyright notice in nxcomp/Version.cSalvador Fandino2016-04-201-19/+10
|/ | | | | | It was GPL3 instead of GPL2! Fixes ArcticaProject/nx-libs#112
* Merge branch 'fcarvajaldev-3.6.x-remove-old-proto-compat' into 3.6.xMike Gabriel2016-04-1986-6620/+650
|\
| * Remove TextCompressor class and files from nxcompFernando Carvajal2016-04-158-145/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add testing doc for nxcomp drop-old-proto-compatFernando Carvajal2016-04-141-0/+0
| | | | | | | | | | | | | | | | | | 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
| * Remove obsolete compatibility files from nxcompFernando Carvajal2016-04-1226-3983/+1
| | | | | | | | | | | | | | | | 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
| * Remove compatibility code for nxcomp before 3.5.0Fernando Carvajal2016-04-1258-2492/+649
|/ | | | | | | | | | | | | | 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
* nxcomp: Properly define NX*Version(void) prototypes in NX.h.Mike Gabriel2016-03-221-5/+5
| | | | Fixes ArcticaProject/nx-libs#104
* debian/patches/401_nxcomp_bigrequests-and-genericevent-extensions.full+lite. ↵Mike Gabriel2016-03-171-0/+1870
| | | | patch: Move into debian/patches-pending-evaluation/.
* doc: Collect data on what libX11 symbols are used by nx-X11, nx-Xserver and ↵Mike Gabriel2016-03-154-0/+6577
| | | | nxagent.
* Rename file for windows environments, Fixes #96Nito Martinez2016-03-022-1/+1
|
* rename original NX patches, so that we can see the patched file's name in ↵Mike Gabriel2016-02-2688-0/+0
| | | | the patch file name.
* README.md: Update open / completed tasks regarding 3.6.x and 3.7.x releases.Mike Gabriel2016-01-191-7/+18
|
* README.md: Update release dates for 3.6.x and 3.7.x (as earlier discussed ↵Mike Gabriel2016-01-191-3/+3
| | | | with Salve from TheQVD).
* Merge branch 'mikedep333-README.md' into 3.6.xMike Gabriel2016-01-191-2/+22
|\ | | | | | | Attributes GH PR #71: https://github.com/ArcticaProject/nx-libs/pull/71
| * README.md: Add debuild instructionsMike DePaulo2016-01-181-0/+19
| |
| * README.md: Update signatureMike DePaulo2016-01-181-2/+3
|/
* Merge pull request #68 from mikedep333/mock-build-instructionsMike Gabriel2016-01-091-0/+26
|\ | | | | Add instructions for building using Mock under Fedora/EPEL.
| * Add instructions for building using Mock under Fedora/EPELMike DePaulo2016-01-011-0/+26
| |
* | debian/nx-x11proto-xinerama-dev.install.in: Install PANORAMIX extension ↵Mike Gabriel2016-01-021-0/+2
| | | | | | | | header files into its own nx-x11proto bin:package. (more Xinerama clean-up, fix FTBFS during dh_install).