aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.xMike Gabriel2016-06-2921-245/+46
|\ | | | | | | | | Attributes GH PR #145: https://github.com/ArcticaProject/nx-libs/pull/145 Self-reviewed: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -- Wed, 29 Jun 2016 11:22:30 +0200
| * Makefile,debian/*,nx-libs.spec,<misc>: Drop references to X2Go Project, esp. ↵Mike Gabriel2016-06-2921-245/+46
|/ | | | | | | | | | | | drop x2goagent. The x2goagent package is being replaced by an x2goserver bin:package named x2goserver-x2goagent. This x2goserver-x2goagent bin:package will be maintained in the X2Go Project's namespace and basically wraps around nxagent. Furthermore, declare Arctica Project as upstream source for nx-libs.
* Merge branch 'sunweaver-pr/libnx-xext-drop-unused-extensions' into 3.6.xMike Gabriel2016-06-2913-2965/+141
|\ | | | | | | | | Attributes GH PR #121: https://github.com/ArcticaProject/nx-libs/pull/121 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Wed, 29 Jun 2016 00:45:43 -0700
| * libNX_Xext: Drop unused extensions: DPMS, XTestExt1, XSync, XSecurity.Mike Gabriel2016-06-2810-2949/+99
| |
| * nx-X11/lib/Xext/Imakefile: Serialize parameters and make Imakefile changes ↵Mike Gabriel2016-06-281-10/+22
| | | | | | | | more trackable.
| * fix wrong bin:package for Xext proto headers: Move dpmsstr.h and securstr.h ↵Mike Gabriel2016-06-284-4/+5
| | | | | | | | from Xext devel package into proto header package.
| * Fix linking order hack in nxagent.Mike Gabriel2016-06-281-10/+23
|/ | | | | We have to make sure that all X.org libraries we link against use symbols provided by libNX_X11.
* test scripts: Add run-nxagent test script.Mike Gabriel2016-06-271-0/+140
|
* Merge branch ↵Mihai Moldovan2016-06-2562-26144/+1064
|\ | | | | | | | | | | 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
| * hw/nxagent: Drop code referring to the following removed Xserver extensions: ↵Mike Gabriel2016-06-254-93/+0
| | | | | | | | XAPPGROUP, LBX, XEVIE.
| * hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the ↵Mike Gabriel2016-06-252-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corresponding code section in files included from "somewhere" in nx-X11/programs/Xserver/. (1) In file included from NXrender.c:44:0: ../../mi/../render/render.c: In function ‘swapStops’: ../../mi/../render/render.c:2541:13: warning: variable ‘colors’ set but not used [-Wunused-but-set-variable] CARD16 *colors; ^ (2) In file included from NXevents.c:133:0: ../../dix/events.c: In function ‘ReinitializeRootWindow’: ../../dix/events.c:2046:15: warning: unused variable ‘pScreen’ [-Wunused-variable] ScreenPtr pScreen = win->drawable.pScreen; ^ ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’: ../../dix/events.c:2177:15: warning: variable ‘pScreen’ set but not used [-Wunused-but-set-variable] ScreenPtr pScreen = pWin->drawable.pScreen; ^ In file included from NXevents.c:133:0: ../../dix/events.c: In function ‘XineramaPointInWindowIsVisible’: ../../dix/events.c:2191:2: error: ‘pScreen’ undeclared (first use in this function) pScreen = pWin->drawable.pScreen; ^ (3) In file included from NXdixfonts.c:77:0: ../../dix/dixfonts.c: In function ‘GetFontPath’: ../../dix/dixfonts.c:1890:2: warning: return makes pointer from integer without a cast return BadAlloc; ^
| * hw/nxagent/NXdixfonts.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-1463/+29
| | | | | | | | identically be found in dix/dixfonts.c. Also remove NX'ish code from dix/dixfonts.c.
| * hw/nxagent/NXdispatch.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-3342/+38
| | | | | | | | identically be found in dix/dispatch.c.
| * hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-326/+8
| | | | | | | | identically be found in dix/property.c.
| * hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be ↵Mike Gabriel2016-06-253-964/+16
| | | | | | | | found in Xext/shm.c.
| * hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-2079/+10
| | | | | | | | be found in Xext/xvdisp.c.
| * hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-4549/+143
| | | | | | | | be found in dix/events.c.
| * hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-394/+10
| | | | | | | | be found in render/glyph.c.
| * hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-71/+5
| | | | | | | | identically be found in dix/glyphcurs.c.
| * hw/nxagent/NXrender.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-2191/+65
| | | | | | | | | | | | be found in render/render.c. Fixes ArcticaProject/nx-libs#37
| * hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files ↵Mike Gabriel2016-06-2513-837/+147
| | | | | | | | in nxagent's code base. Rather replace structures we need modified only.
| * NXrenderint.h: Move into subfolder X11/include/ and rename to ↵Mike Gabriel2016-06-252-2/+2
| | | | | | | | Xrender_nxagent.h. (Like we have done with all other non-public Xlib related header files that are required for building nxagent.
| * hw/nxagent/NXresource.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-644/+10
| | | | | | | | identically be found in dix/resource.c.
| * Xserver/dix/window.c: Don't reintroduce build warnings with previous commit ↵Mike Gabriel2016-06-251-14/+0
| | | | | | | | due to now-unnecessary assignements of pScreen pointers.
| * hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-3028/+60
| | | | | | | | be found in dix/window.c.
| * hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-253-382/+17
| | | | | | | | be found in GL/glx/glxext.c.
| * Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile changes ↵Mike Gabriel2016-06-251-23/+82
| | | | | | | | more trackable.
| * hw/nxagent/NXpicture.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-1692/+54
| | | | | | | | identically be found in render/picture.c.
| * hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can ↵Mike Gabriel2016-06-253-249/+19
| | | | | | | | identically be found in mi/miexpose.c.
| * hw/nxagent/Pixmaps.h: Make RESTYPE well-defined by adding resource.h to ↵Mike Gabriel2016-06-251-0/+1
| | | | | | | | includes.
| * Xserver/mi/Imakefile: Serialize parameters and make Imakefile changes more ↵Mike Gabriel2016-06-251-31/+98
| | | | | | | | trackable.
| * hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be identically found ↵Mike Gabriel2016-06-253-87/+5
| | | | | | | | in render/miglyph.c.
| * hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-122/+22
| | | | | | | | be found in render/mitrap.c.
| * hw/nxagent/NXmiwindow.c: Drop complete file.Mike Gabriel2016-06-254-1215/+19
| | | | | | | | | | | | | | | | | | | | Reasoning: (1) The diff between this file and mi/miwindow.c is so minimal, we simply apply the change to mi/miwindow.c. (2) In recent X.org, the fixed code has gone, so this patch won't exist after having rebased nx-libs against X.org.
| * hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically ↵Mike Gabriel2016-06-254-1894/+47
| | | | | | | | be found in miext/damage/damage.c.
| * NXcomposite.h: Move fake header file NXcomposite.h to ↵Mike Gabriel2016-06-253-74/+107
| | | | | | | | hw/nxagent/X11/include/ and drop all symbols that are not explicitly used by nxagent.
| * Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of ↵Mike Gabriel2016-06-252-64/+0
| | | | | | | | nx-X11/include/extensions/composite.h.
| * hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is ↵Mike Gabriel2016-06-253-327/+15
| | | | | | | | indentically found in dix/extension.c.
| * Xserver/dix/Imakefile: Serialize parameters and make Imakefile changes more ↵Mike Gabriel2016-06-251-16/+66
|/ | | | trackable.
* Merge branch 'uli42-pr/run_xinerama_without_debug_output' into 3.6.xMike Gabriel2016-06-251-5/+5
|\ | | | | | | Attributes GH PR #156: https://github.com/ArcticaProject/nx-libs/pull/156
| * libX11: Extend Event functions to handle IOErrorsUlrich Sibiller2016-06-256-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow for suspend/resume NX has changed _XReadEvents() and _XIOError(). _XIOError() does not simply exit but returns. And _XReadEvents() returns after _XIOError(). But as the original _XReadEvents() is supposed to block until at least one event is there calling functions are not prepared for situations where no event is available. These calling functions have to check that condition., Some of the calling functions already had that check but the UnlockDisplay() call was missing. Fixes https://github.com/ArcticaProject/nx-libs/issues/118
| * Screen.c: fix RRGetInfo callUlrich Sibiller2016-06-251-1/+1
| |
| * Xinerama: undef debug/test flagsUlrich Sibiller2016-06-251-4/+4
| |
* | Merge branch 'uli42-pr/fix-crash-in-XPeekEvent' into 3.6.xMike Gabriel2016-06-256-0/+21
|\ \ | |/ |/| | | | | | | Attributes GH PR #154: https://github.com/ArcticaProject/nx-libs/pull/154 arting with '#' will be ignored, and an empty message aborts
| * libX11: Extend Event functions to handle IOErrorsUlrich Sibiller2016-06-246-0/+21
|/ | | | | | | | | | | | | | To allow for suspend/resume NX has changed _XReadEvents() and _XIOError(). _XIOError() does not simply exit but returns. And _XReadEvents() returns after _XIOError(). But as the original _XReadEvents() is supposed to block until at least one event is there calling functions are not prepared for situations where no event is available. These calling functions have to check that condition., Some of the calling functions already had that check but the UnlockDisplay() call was missing. Fixes https://github.com/ArcticaProject/nx-libs/issues/118
* Merge branch 'sunweaver-pr/xrandr-extension-upgrade-1.5' into 3.6.xMike Gabriel2016-06-2184-4884/+10220
|\ | | | | | | | | Attributes GH PR #137: https://github.com/ArcticaProject/nx-libs/pull/137 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 20 Jun 2016 12:40:52 -0700
| * debian/patches: Update 102_xserver-xext_set-securitypolicy-path.debian.patch.Mike Gabriel2016-06-211-1/+1
| |
| * Backport RANDR proto version 1.5 to nx-X11's Xserver.Mike Gabriel2016-06-2123-951/+6548
| | | | | | | | | | Backported to X.org's /xorg/xserver Git hash level: a6b6e8ba026acedef6336b17adf06aebddd5f22f.
| * Move matrix operations from X server to pixman 0.13.2. Required code ↵Mike Gabriel2016-06-211-6/+3
| | | | | | | | de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on).
| * [render] Split out filter finding from filter setting. Required code ↵Mike Gabriel2016-06-211-2/+4
| | | | | | | | de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on).
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:53:47 +0000