aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* nx-X11/config/cf: Clean-up left-overs from having our own libNX_Xext shared ↵Mike Gabriel2017-04-132-3/+0
| | | | library.
* Makefile: Make sure that 'make all' only calls 'make build' and _not_ the ↵Mike Gabriel2017-04-131-1/+2
| | | | global '%:' ruleset afterwards.
* Makefile: Remove nx-X11/config/cf/date.def on clean.Mike Gabriel2017-04-131-0/+1
|
* Makefile: Fix comment above special clean rules.Mike Gabriel2017-04-131-1/+1
|
* Merge branch 'sunweaver-pr/fix-ftbfs-on-linux-sparc64' into 3.6.xMihai Moldovan2017-04-131-1/+2
|\ | | | | | | Attributes GH PR #426: https://github.com/ArcticaProject/nx-libs/pull/426
| * nx-X11/config/cf/linux.cf: Fix FTBFS on Linux SPARC64 due to missing ↵Mike Gabriel2017-04-131-1/+2
|/ | | | -D_XSERVER64 definition.
* Merge branch 'sunweaver-pr/fix-ftbfs-on-aarch64' into 3.6.xMihai Moldovan2017-04-131-1/+1
|\ | | | | | | Attributes GH PR #425: https://github.com/ArcticaProject/nx-libs/pull/425
| * nx-X11/config/cf/linux.cf: Fix FTBFS on arm64 (aarch64) due to missing ↵Mike Gabriel2017-04-121-1/+1
|/ | | | -D_XSERVER64 definition.
* release 3.5.99.53.5.99.5Mike Gabriel2017-04-117-2051/+3235
|
* debian/patches: Update 016_nx-X11_install-location.debian.patch (due to ↵Mike Gabriel2017-04-101-2/+2
| | | | fuzziness).
* Regression fix for added libXfont2 API support:Mike Gabriel2017-04-109-24/+14
| | | | | | | | | | - Move FONT_DEFINES and XLIBFONT definition to from Server.tmpl to Imake.tmpl. - Add FONT_DEFINES to ALLDEFINES. - Drop SpecialCObjectRules with FONT_DEFINES from various Imakefiles again, FONT_DEFINES is now set "globally". - Hand over FONT_DEFINES from main Makefile to nx-X11's make BuildEnv to make gccmakedep happy.
* Merge branch 'sunweaver-pr/createpixmap-alloc-hints-abi-change' into 3.6.xMihai Moldovan2017-04-1034-61/+109
|\ | | | | | | Attributes GH PR #410: https://github.com/ArcticaProject/nx-libs/pull/410
| * hw/nxagent/Pixmap.c et al.: Propagate usage_hint through ↵Mike Gabriel2017-04-105-17/+24
| | | | | | | | nxagentCreatePixmap, as well.
| * Mesa.patches: Adapt Mesa to CreatePixmap allocation hint ABI bump.Mike Gabriel2017-04-102-0/+14
| |
| * Save pixmap allocation hints into the PixmapRec.Aaron Plattner2017-04-104-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit f797c96845a3fab37cda6839ebecf9ac5401fd6e Author: Aaron Plattner <aplattner@nvidia.com> Date: Thu Nov 15 12:12:02 2007 -0800 Save pixmap allocation hints into the PixmapRec. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Add CreatePixmap allocation hints.Aaron Plattner2017-04-1026-42/+65
|/ | | | | | | | | | | | | | | | Backported from X.org: commit f2e310132fbe1520c1b5f3da4faa2d2d47835e72 Author: Aaron Plattner <aplattner@nvidia.com> Date: Wed Oct 31 14:15:35 2007 -0700 Add CreatePixmap allocation hints. These hints allow an acceleration architecture to optimize allocation of certain types of pixmaps, such as pixmaps that will serve as backing pixmaps for redirected windows. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.xMihai Moldovan2017-04-1029-56/+821
|\ | | | | | | Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
| * nx-libs.spec: Prefer libXfont2-devel on RPM distro versions that have it.~Mike Gabriel2017-04-101-0/+8
| |
| * debian/control: Use B-D libxfont-dev only. Follow libXfont2 transition on ↵Mike Gabriel2017-04-101-1/+1
| | | | | | | | Debian (and alike).
| * Makefile: Tell Xserver build which Xfont API to use (v2 or v1) depending on ↵Mike Gabriel2017-04-101-1/+6
| | | | | | | | what's available in the build env.
| * Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API ↵Mike Gabriel2017-04-1023-20/+621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alike. 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: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
| * SetFontPath: set client->errorValue on failure.Jamey Sharp2017-04-104-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 21ceae9002c6364deb3d074cf2da7d3864cf6879 Author: Jamey Sharp <jamey@minilop.net> Date: Tue May 11 10:24:00 2010 -0700 SetFontPath: set client->errorValue on failure. Previously the callers were only setting errorValue on Success, when it's ignored, and leaving it alone on failure, when it's sent to the client. Since SetFontPath takes the ClientPtr, let it set client->errorValue instead of letting the callers continue to get it wrong. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * dix: pass a valid ClientPtr to SetFontPath in all cases.Eamon Walsh2017-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 7e9e01a4a34fa45521067d43c5bbff942dd5d51a Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Wed Oct 10 17:40:22 2007 -0400 dix: pass a valid ClientPtr to SetFontPath in all cases. Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * hw/nxagent/BitmapUtils.c: Derive from utilbitmap.c in deprecated libXfont1 ↵Mike Gabriel2017-04-104-10/+130
| | | | | | | | and ship as copy-of-code with nxagent.
| * dix: Move InitFonts up above screen initializationMike Gabriel2017-04-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport from X.org: commit 91ea0965dd4dfeba0a914c47ad4a64768e983b1b Author: Keith Packard <keithp@keithp.com> Date: Wed Nov 11 22:02:04 2015 -0800 dix: Move InitFonts up above screen initialization Font initialization was split into two stages, the first was to set up font privates with a call to ResetFontPrivateIndex, then much later the call to InitFonts to set up all of the FPEs. Doing the full font initialization before initializing the video drivers means that we can move the call to ResetFontPrivateIndex inside InitFonts. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
| * Xserver/Imakefile: Improve readability by introducing the NULL variable and ↵Mike Gabriel2017-04-101-14/+49
|/ | | | adding more line-breaks.
* Revert "regression fix for 52872a0: Keep index parameter in AddScreen() for ↵Mike Gabriel2017-04-101-3/+2
| | | | | | | | | | now. Requires proper ABI backport. (was: copy+paste error)." This reverts commit 342758254b1b8507c9ec774f40d8ec62baf394a8. Other than stated in the original commit msg, both regressions are related to inproper rebasing of two pull requests touch the same code portion.
* Merge branch 'sunweaver-pr/remove-index-from-CloseScreen-ABI-backport' into ↵Mihai Moldovan2017-04-1028-66/+54
|\ | | | | | | | | | | 3.6.x Attributes GH PR #411: https://github.com/ArcticaProject/nx-libs/pull/411
| * xserver: remove index from CloseScreen (API/ABI breakage)Dave Airlie2017-04-1028-66/+54
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted from X.org bulk commit: commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5 Author: Dave Airlie <airlied@redhat.com> Date: Tue Jun 5 13:22:18 2012 +0100 api: rework the X server driver API to avoid global arrays. This is a squash merge containing all the API changes, as well as the video ABI bump. Its been squashed to make bisection easier. Full patch log below: [...] commit 06729dbbc804a20242e6499f446acb5d94023c3c Author: Dave Airlie <airlied@gmail.com> Date: Tue Apr 10 14:04:59 2012 +0100 xserver: remove index from CloseScreen (API/ABI breakage) This drops the index from the CloseScreen callback, its always been useless really, since the pScreen contains it. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge remote-tracking branch 'sunweaver-pr/pr/nxproxy-read-from-stdin' into ↵Vadim Troshchinskiy2017-04-072-14/+65
|\ | | | | | | 3.6.x
| * nxproxy: Support communication over stdin. Allow nxcl to use standard ssh ↵Bernard Cafarelli2017-04-071-13/+64
| | | | | | | | | | | | instead of nxssh. Fixes ArcticaProject/nx-libs#98.
| * nxcomp/Loop.cpp: Fix server/client mode info cerr printing in ↵Mike Gabriel2017-04-071-1/+1
|/ | | | PrintProcessInfo().
* Merge branch 'sunweaver-pr/drop-render-fullcolor-workaround' into 3.6.xMike Gabriel2017-04-074-82/+5
|\ | | | | | | | | | | Attributes GH PR #401: https://github.com/ArcticaProject/nx-libs/pull/401 Reviewed by: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> -- Fri, 07 Apr 2017 10:24:05 +0200
| * NXpicturestr_PictSolidFill.h: Drop file and revert db8705. Not an issue ↵Mike Gabriel2017-04-064-82/+5
|/ | | | anymore nowadays.
* record: avoid crash when calling RecordFlushReplyBuffer recursivelyErkki Seppälä2017-04-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.Org: commit 0801afbd7c2c644c672b37f8463f1a0cbadebd2e Author: Erkki Seppälä <erkki.seppala@vincit.fi> Date: Thu Feb 10 15:35:14 2011 +0200 record: avoid crash when calling RecordFlushReplyBuffer recursively RecordFlushReplyBuffer can call itself recursively through WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts when the recording client's buffer cannot be completely emptied in one WriteClient. When a such a recursion occurs, it will not be broken out of which results in segmentation fault when the stack is exhausted. This patch adds a counter (a flag, really) that guards against this situation, to break out of the recursion. One alternative to this change would be to change _CallCallbacks to check the corresponding counter before the callback loop, but that might affect existing behavior, which may be relied upon. Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> Signed-off-by: Keith Packard <keithp@keithp.com> Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de> Fixes: ArcticaProject/nx-libs#417.
* Merge branch 'sunweaver-pr/mesa-patching-with-quilt' into 3.6.xMihai Moldovan2017-04-062-0/+37
|\ | | | | | | Attributes GH PR #409: https://github.com/ArcticaProject/nx-libs/pull/409
| * Mesa subtree: Add quilt based patch system for bundled Mesa.Mike Gabriel2017-04-052-0/+37
|/
* roll-tarball.sh: Fix ChangeLog creation, always create ChangeLog for the ↵Mike Gabriel2017-04-051-1/+1
| | | | CHECKOUT, not the currently checked out branch.
* Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.xMike Gabriel2017-04-0310-203/+317
|\ | | | | | | Attributes GH PR #404: https://github.com/ArcticaProject/nx-libs/pull/404
| * Keystrokes: rename left/up/right/down keystrokes to descriptive namesUlrich Sibiller2017-04-035-64/+64
| | | | | | | | | | | | The are now called reflecting their purpose: viewport_scroll_left/up/right/down. This also regroups all the keystrokes referring to viewport stuff.
| * doc: rework keystroke documentationUlrich Sibiller2017-04-031-43/+50
| |
| * doc: document debugging keystrokesUlrich Sibiller2017-04-032-6/+27
| |
| * keystrokes.cfg: remove debug keystrokesUlrich Sibiller2017-04-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Normal builds will not contain support for some keystrokes but warn about unknown keystroke actions: Info: ignoring unknown keystroke action 'debug_tree'. Info: ignoring unknown keystroke action 'regions_on_screen'. Info: ignoring unknown keystroke action 'test_input'. Info: ignoring unknown keystroke action 'deactivate_input_devices_grab'. So we remove those from the default keystrokes config.
| * Keystroke.c: move some vars to inner scopeUlrich Sibiller2017-04-031-5/+2
| |
| * Init keystrokes at startup and reconnectUlrich Sibiller2017-04-034-9/+12
| | | | | | | | no more late initialization
| * Keystroke.c: avoid use of comparisons on "False"Ulrich Sibiller2017-04-031-21/+13
| |
| * Keystroke.c: use Booleans where appropriateUlrich Sibiller2017-04-031-13/+13
| | | | | | | | | | Some of the keystroke checks have used them before. This commit unifies those checks.
| * Keystroke.h: improve parse_keystroke_file()Ulrich Sibiller2017-04-031-35/+44
| | | | | | | | Print out more/better messages.
| * Keystroke.c: introduce nxagentDumpKeystrokes()Ulrich Sibiller2017-04-032-0/+35
| |
| * keystrokes.cfg: add missing keystrokesUlrich Sibiller2017-04-031-0/+12
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:41:26 +0000