aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/rpm-packaging-updates' into 3.6.xMike Gabriel2016-07-051-6/+51
|\ | | | | | | | | Attributes GH PR #181: https://github.com/ArcticaProject/nx-libs/pull/181 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Tue, 05 Jul 2016 10:08:48 +0200
| * nx-libs.spec: Add Conflicts: fields for removed shared library bin:packages.Mike Gabriel2016-07-051-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libNX_Xcomposite1 < 3.5.99.1 libNX_Xcomposite1%{?_isa} < 3.5.99.1 libNX_Xdamage1 < 3.5.99.1 libNX_Xdamage1%{?_isa} < 3.5.99.1 libNX_Xdmcp6 < 3.5.99.1 libNX_Xdmcp6%{?_isa} < 3.5.99.1 libNX_Xext6 < 3.5.99.1 libNX_Xext6%{?_isa} < 3.5.99.1 libNX_Xfixes3 < 3.5.99.1 libNX_Xfixes3%{?_isa} < 3.5.99.1 libNX_Xinerama1 < 3.5.99.1 libNX_Xinerama1%{?_isa} < 3.5.99.1 libNX_Xpm4 < 3.5.99.1 libNX_Xpm4%{?_isa} < 3.5.99.1 libNX_Xrandr2 < 3.5.99.1 libNX_Xrandr2%{?_isa} < 3.5.99.1 libNX_Xrender1 < 3.5.99.1 libNX_Xrender1%{?_isa} < 3.5.99.1 libNX_Xtst6 < 3.5.99.1 libNX_Xtst6%{?_isa} < 3.5.99.1 Fixes ArcticaProject/nx-libs#70.
| * nx-libs.spec: Let libNX_X11-6 and libNX_X11-devel conflict with deprecated ↵Mike Gabriel2016-07-051-0/+4
| | | | | | | | libXau6 and libXau-devel.
| * nx-libs.spec: Let nxagent conflict with nxauth, which is not provided anymore.Mike Gabriel2016-07-051-0/+2
| |
| * nx-libs.spec: Add correct Obsoletes:/Provides: fields for lib* bin:packages.Mike Gabriel2016-07-051-4/+16
| |
| * nx-libs.spec: Fix various issues since last testing the RPM builds of nx-libs:Mike Gabriel2016-07-051-2/+9
|/ | | | | | | - Inject LIBDIR rather than USRLIBDIR into nx-libs's main Makefile - Install include files Xauth.h into libNX_X11-devel. - Install hi-jacking libX11 library symlinks. - Install VERSION.nx* files into nxagent / nxproxy packages.
* debian/control: Add some hard and exact-versioned dependencies for our ↵Mike Gabriel2016-07-051-0/+8
| | | | bin:packages. Assure that no old share lib packages with the same set of symbols remain on the system when upgrading.
* Merge branch 'sunweaver-pr/writeeventstoclients-no-sequencenumber' into 3.6.xMike Gabriel2016-07-0516-68/+24
|\ | | | | | | | | Attributes GH PR #177: https://github.com/ArcticaProject/nx-libs/pull/177 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Tue, 05 Jul 2016 00:02:17 -0700
| * Set event sequence number in WriteEventsToClient instead of at callers.Jamey Sharp2016-07-0514-41/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | TryClientEvents already did this; this commit just moves the assignment one level down so that no event source has to worry about sequence numbers. ...No event source, that is, except XKB, which inexplicably calls WriteToClient directly for several events. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Make WriteEventsToClient/WriteToClient no-op on fake or dead clients.Jamey Sharp2016-07-059-30/+20
|/ | | | | | | | | | | | | | | | | | This matches the test in TryClientEvents, and is a superset of tests done by the callers of these functions. The consequence of forgetting these tests is a server crash, so they're always desirable. In my opinion, it's better to not require the callers to remember to do these checks. For callers that don't do very much work before calling WriteToClient or WriteEventsToClient, I've removed the redundant checks. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=27497 Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Adam Jackson <ajax@redhat.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.xMike Gabriel2016-07-0551-2553/+148
|\ | | | | | | | | Attributes GH PR #168: https://github.com/ArcticaProject/nx-libs/pull/168 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Mon, 04 Jul 2016 11:15:20 -0700
| * Replace INITARGS with voidTomas Carnecky2016-07-0517-67/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | INITARGS was a hardcoded define to void. Since knowing the function signature for your extensions is kinda useful, just replace it with a hardcoded void, but leave the define there for API compatibility. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * nx-X11/lib/X11/XKBMisc.c: Avoid warning about maybe non-assigned variables ↵Mike Gabriel2016-07-051-5/+5
| | | | | | | | (mask, newMask).
| * Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype ↵Daniel Stone2016-07-052-2/+4
| | | | | | | | to xkb.h. Explicitly initialise nTypes in xkb.c.
| * Xserver/Xext/xres.c: Drop unused REQUEST macro call (for xXResQueryVersionReq).Keith Packard2016-07-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit a1cb69dc28fdbfbdfaf954e0bec221f759462399 Author: Keith Packard <keithp@keithp.com> Date: Fri Nov 15 22:05:44 2013 +0900 Xext: Clean up warnings GC funcs and ops are const. Remove unused variables. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver: Post-REGION-macros-to-inline-funcs clean-up.Mike Gabriel2016-07-056-23/+0
| |
| * Xserver/mi/mizerarc.c: Initialize oddPtrs as NULL before using it (in ↵Mike Gabriel2016-07-051-1/+1
| | | | | | | | miZeroPolyArc).
| * Xserver/mi/miarc.c: Initialize dashRemaining with 0 before using it.Mike Gabriel2016-07-051-1/+1
| |
| * Xserver/os/xdmauth.c: Avoid compiler warnings due to -Wswitch being enabled. ↵Mike Gabriel2016-07-051-6/+2
| | | | | | | | | | | | | | | | | | | | Use if statement rather than switch. Backported from X.org. Found in commit... commit 7deaaa797cf8e7ca71e9b34fa6f413d1ed2b3dab Author: Adam Jackson <ajax@nwnk.net> Date: Tue Mar 28 01:21:00 2006 +0000
| * Xserver/os/log.c: Make sure strlcpy is defined in log.c. Immitate what is ↵Mike Gabriel2016-07-052-0/+8
| | | | | | | | done in X.org.
| * Restore compression of duplicate log file entries.Adam Jackson2016-07-051-10/+0
| | | | | | | | This undoes the workaround for X.org bug #964, which was an Xprintism.
| * os: Make sure that writing our pid to the lock file actually workedKeith Packard2016-07-051-1/+3
| | | | | | | | | | | | | | | | | | There's no sense verifying that we can create the lock file and then ignoring the return value from write. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/os/connection.c: Drop unused variable 'restore_trans_conn' from ↵Mike Gabriel2016-07-051-1/+0
| | | | | | | | ClientAuthorized().
| * Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and TRANS_REOPEN ↵Mike Gabriel2016-07-051-3/+9
| | | | | | | | if not yet defined.
| * nx-X11/lib/X11/imTrX.c: Fix warning ‘len’ may be used uninitialized in ↵Mike Gabriel2016-07-051-1/+1
| | | | | | | | this function (_XimRead).
| * nx-X11/lib/X11/imInsClbk.c: Fix warning 'right-hand operand of comma ↵Mike Gabriel2016-07-051-1/+1
| | | | | | | | expression has no effect' in _XimFilterPropertyNotify.
| * nx-X11/lib/X11/lcFile.c: Drop conditional always evaluating as True.Mike Gabriel2016-07-051-2/+1
| | | | | | | | | | | | | | | | Backported from X.org, patch found in janitor cleanup commit... commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> Date: Wed Jan 28 20:31:42 2009 -0200
| * nx-X11/lib/X11/XKBMisc.c: Drop conditional always evaluating as True.Mike Gabriel2016-07-051-1/+1
| | | | | | | | | | | | | | | | Backported from X.org, patch found in janitor cleanup commit... commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> Date: Wed Jan 28 20:31:42 2009 -0200
| * nx-X11/lib/X11/LiHosts.c: Drop unused variable (in XListHosts).Mike Gabriel2016-07-051-4/+0
| |
| * Avoid 'siAddr' maybe being used uninitialized in XAddHost and XRemoveHost.Mike Gabriel2016-07-051-47/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org (libX11). Host.c has mainly been copied over from libX11, contaning 7db7451 as the top commit (which also contains the greatest change and silences the resp. compiler warning. commit 7db74514e454d3fc4ff70aa08ddac66bfffda4dd Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Tue Jul 23 22:18:46 2013 -0700 Refactor common code from XAddHost & XRemoveHost into single function On the Xlib side, the only real difference is the mode flag we send to the server with the address, so just make that an argument to the function with the common code for packing the address into the request. (Aside from labels, gcc 4.7.2 generates identical code before & after this change due to inlining, verified via diff of gcc -S output.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| * hw/nxagent/Exrensions.c: Post-RandR 1.5 update fix. Properly set rrProvider ↵Mike Gabriel2016-07-051-3/+3
| | | | | | | | hook functions to NULL.
| * hw/nxagent/Args.c: Fix fprintf placeholder (%u -> %lu).Mike Gabriel2016-07-051-2/+2
| |
| * Remove fbpseudocolorAdam Jackson2016-07-053-2357/+0
| | | | | | | | | | | | | | | | | | | | "An experimental pseudocolor emulation layer. Not fully completed, currently only works for 16bpp." That was almost four years ago. It still doesn't work, only one driver even attempts to use it, it contains an ad-hoc implementation of damage, and should really be done up in Composite now anyway. Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * fb: Mark some variables as unused.Cyril Brulebois2016-07-056-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no use for the values set through the various macro calls (fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused. The following warnings go away accordingly: | CC libfb_la-fb24_32.lo | fb24_32.c: In function 'fb24_32ReformatTile': | fb24_32.c:544:19: warning: variable 'newYoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:544:10: warning: variable 'newXoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:543:19: warning: variable 'oldYoff' set but not used [-Wunused-but-set-variable] | fb24_32.c:543:10: warning: variable 'oldXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbfill.lo | fbfill.c: In function 'fbFill': | fbfill.c:72:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:72:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | fbfill.c:100:21: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:100:11: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | fbfill.c:142:20: warning: variable 'tileYoff' set but not used [-Wunused-but-set-variable] | fbfill.c:142:10: warning: variable 'tileXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbgc.lo | fbgc.c: In function 'fbPadPixmap': | fbgc.c:92:19: warning: variable 'yOff' set but not used [-Wunused-but-set-variable] | fbgc.c:92:13: warning: variable 'xOff' set but not used [-Wunused-but-set-variable] | fbgc.c: In function 'fbCanEvenStipple': | fbgc.c:166:23: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbgc.c:166:13: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] | CC libfb_la-fbpush.lo | fbpush.c: In function 'fbPushPixels': | fbpush.c:238:20: warning: variable 'stipYoff' set but not used [-Wunused-but-set-variable] | fbpush.c:238:10: warning: variable 'stipXoff' set but not used [-Wunused-but-set-variable] Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Cyril Brulebois <kibi@debian.org> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Add _X_UNUSED attribute to designate unused variables and silence warningsJeremy Huddleston2016-07-051-0/+7
| | | | | | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/composite/compint.h: Disable debugging in Copmosite extension.Mike Gabriel2016-07-051-3/+1
| |
| * Xserver/xfixes/region.c: Don't declare and set PictureScreenPtr ps (in ↵Mike Gabriel2016-07-051-2/+0
|/ | | | ProcXFixesSetPictureClipRegion). Variable is not used.
* Merge branch 'sunweaver-pr/proxy-to-proxy-over-unix-socket' into 3.6.xMike Gabriel2016-07-055-489/+922
|\ | | | | | | | | Attributes GH PR #142: https://github.com/ArcticaProject/nx-libs/pull/142 Reviewed by: Salvador Fandino <sfandino@yahoo.com> -- Mon, 04 Jul 2016 16:31:00 +0200
| * test scripts: Add test scripts for testing Unix file socket support (i.e. ↵Mike Gabriel2016-07-042-0/+296
| | | | | | | | proxy2proxy and proxy2agent sessions via Unix file sockets).
| * nxcomp/Loop.cpp: Add Unix file socket support for proxy <-> proxy connection.Mike Gabriel2016-07-043-222/+607
| |
| * merge code paths depending on acceptHost being ""Salvador Fandino2016-07-041-11/+5
| |
| * remove now unused function ParseListenOptionSalvador Fandino2016-07-041-20/+0
| |
| * rewrite WaitForRemote to build on top of ListenConnectionTCPSalvador Fandino2016-07-041-61/+2
| |
| * remove unused listenHost parameterSalvador Fandino2016-07-041-19/+3
| |
| * Remove work around for OS/X that was doing nothingSalvador Fandino2016-07-041-24/+0
| | | | | | | | | | | | Remove an old work around that's not needed anymore. Tested on OS/X 10.10 for x86.
| * Simplify ParseListenOptionSalvador Fandino2016-07-041-12/+4
| | | | | | | | | | | | Merge code paths. Use GetHostAddress to resolve the target host address instead of inet_aton.
| * rewrite SetupUnixSocket to use ListenConnectionUnixSalvador Fandino2016-07-041-70/+20
| |
| * Rework SetupTcpSocket to use ListenConnectionTCPSalvador Fandino2016-07-041-66/+1
|/
* Merge branch 'sunweaver-pr/xerrordb-from-xorg' into 3.6.xMike Gabriel2016-07-047-7/+154
|\ | | | | | | | | Attributes GH PR #164: https://github.com/ArcticaProject/nx-libs/pull/164 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 04 Jul 2016 13:43:08 -0700
| * libNX_X11 data files: Install libNX_X11 related data files.Mike Gabriel2016-07-047-7/+154
|/ | | | | | | | | | | - Update XErrorDB to latest X.org version. - Install XErrorDB, XKeysymDB and Xcms.txt to /usr/{local/}share/nx/. - Assure that libNX_X11 finds those files at the named location. - Update debian/ packaging files. - Update nx-libs.spec packaging file. Fixes ArcticaProject/nx-libs#153