aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options ↵Mihai Moldovan2016-06-177-26/+87
| | | | .h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended.
* Merge branch 'sunweaver-pr/nxagentReversePointerMapping-negative-index' into ↵Mike Gabriel2016-06-152-3/+3
|\ | | | | | | | | | | | | 3.6.x Attributes GH PR #138: https://github.com/ArcticaProject/nx-libs/pull/138 Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Tue, 14 Jun 2016 06:12:49 -0700
| * nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always ↵Mike Gabriel2016-06-152-3/+3
|/ | | | | | | greater than zero. We have seen Xevent.xbutton.button being set to AnyButton (equaling 0). Fixes ArcticaProject/nx-libs#92 Fixes X2GoBTS#791
* Merge branch 'Ionic-bugfix/Xserver-Xlib-type-mismatch' into 3.6.xMike Gabriel2016-06-131-1/+21
|\ | | | | | | Attributes GH PR #126: https://github.com/ArcticaProject/nx-libs/pull/126
| * nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to ↵Mihai Moldovan2016-06-131-1/+21
|/ | | | | | | | | | | | | | | | | different data type sizes between Xserver and Xlib. While on the X server side we were expecting a 32bit value, the Xlib side in nxcompext wrote a 64bit integer to the 32bit location, hence overwriting "random" data on the stack (most notably the return adress.) We can work around this by using the Xlib-based Window data type on the server-side as well, but this problem is likely a more general one. Calling functions from libcompext in nxagent sounds like a bad idea. Other code locations might well be affected by issues alike to that as well. In order to silence compiler warnings, use a "macro hack" for overriding the "Window" type in NXlib.h.
* Merge branch 'sunweaver-pr/nxcomp+ext+shad-system-wide-headers' into 3.6.xMike Gabriel2016-06-1342-88/+87
|\ | | | | | | Reviewed by Ulrich Sibiller <uli42@gmx.de>, approval given on Mon, 13 Jun 2016 02:49:19 -0700.
| * nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one would do ↵Mike Gabriel2016-06-1337-60/+81
| | | | | | | | with system-wide shared libraries.
| * nxcomp/Makefile.in: Only install MD5.h, NX.h, NXalert.h, NXpack.h, NXproto.h ↵Mike Gabriel2016-06-133-7/+5
| | | | | | | | | | | | | | and NXvars.h as publicly available header files. * Also adapt debian/libxcomp-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly.
| * nxcomshad/Makefile.in: Only install Shadow.h as publicly available header file.Mike Gabriel2016-06-133-21/+1
|/ | | | | * Also adapt debian/libxcompshad-dev.install.in accordingly. * Also adapt nx-libs.spec accordingly.
* hw/nxagent/Args.c: Fix syntax errors for builds using -UPANORAMIX.Mike Gabriel2016-06-091-1/+1
|
* nx-X11/programs/Xserver/Imakefile: Don't overlink nxagent. Linking against ↵Mike Gabriel2016-06-031-3/+3
| | | | | | libXrandr and libXtst is not necessary for nxagent. Fixes ArcticaProject/nx-libs#110.
* nx-X11/config/cf/lnxLib.tmpl requires post-library removal cleanup: Drop ↵Mike Gabriel2016-06-031-8/+0
| | | | | | references to dropped X11 extension client libraries. Fixes ArcticaProject/nx-libs#115.
* Merge branch 'sunweaver-pr/xserver-drop-outdated-xext-extensions' into ↵Mihai Moldovan2016-06-01122-26435/+120
|\ | | | | | | | | | | arctica-3.6.x Attributes GH PR #106: https://github.com/ArcticaProject/nx-libs/pull/106
| * XTRAP: Drop all Xserver code blocks that relate to removed XTRAP extension.Mike Gabriel2016-06-011-6/+0
| |
| * XFreeXDGA: Drop all Xserver code blocks that relate to removed XFreeXDGA ↵Mike Gabriel2016-06-014-25/+2
| | | | | | | | extension.
| * XF86MISC: Drop all Xserver code blocks that relate to removed XF86MISC ↵Mike Gabriel2016-06-015-28/+2
| | | | | | | | extension.
| * MITMISC: Drop all Xserver code blocks that relate to removed MITMISC extension.Mike Gabriel2016-06-014-25/+0
| |
| * XF86VIDMODE: Drop all Xserver code blocks that relate to removed XF86VIDMODE ↵Mike Gabriel2016-06-015-27/+2
| | | | | | | | extension.
| * MULTIBUFFER: Drop all Xserver code blocks that relate to removed MULTIBUFFER ↵Mike Gabriel2016-06-014-25/+0
| | | | | | | | extension.
| * LBX: Drop all Xserver code blocks that relate to removed LBX extension.Mike Gabriel2016-06-0121-611/+0
| |
| * EVI: Drop all Xserver code blocks that relate to removed EVI extension.Mike Gabriel2016-06-013-19/+0
| |
| * FONTCACHE: Drop all Xserver code blocks that relate to removed FONTCACHE ↵Mike Gabriel2016-06-014-26/+0
| | | | | | | | extension.
| * XEVIE: Drop all Xserver code blocks that relate to removed XEVIE extension.Mike Gabriel2016-06-016-207/+0
| |
| * XFree86DGA: Drop all Xserver code blocks that relate to removed XFree86DGA ↵Mike Gabriel2016-06-011-3/+0
| | | | | | | | extension.
| * TOGCUP: Drop all Xserver code blocks that relate to removed TOGCUP extension.Mike Gabriel2016-06-013-19/+0
| |
| * XAPPGROUP: Drop all Xserver code blocks that relate to removed XAPPGROUP ↵Mike Gabriel2016-06-018-117/+0
| | | | | | | | extension.
| * Drop X11 extensions not shipped with recent X.Org server versions anymore:Mike Gabriel2016-06-0197-25301/+118
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/extensions: Xag.h, Xagsrv.h, Xagstr.h Xserver/Xext: appgroup.c, appgroup.h lib/Xext: XAppgroup.c include/extensions: Xcup.h, Xcupstr.h, Xserver/Xext: cup.c lib/Xext: cup.c include/extensions: Xdbe.h Xserver/Xext: Xdbe.c Xserver/Xext: dgaproc.h, xf86dga.c, xf86dga2.c, xf86dgaext.h include/extensions: Xevie.h, Xeviestr.h include/extensions: XEVI.h, XEVIstr.h Xserver/Xext: EVI.c, EVIstruct.h, sampleEVI.c lib/Xext: XEVI.c include/extensions: fontcache.h, fontcacheP.h, fontcachstr.h Xserver/Xext: fontcache.c include/extensions: lbxbuf.h, lbxbufstr.h, lbxdeltastr.h, lbximage.h, lbxopts.h, lbxstr.h, lbxzlib.h lib/Xext: XLbx.c include/extensions: multibuf.h, multibufst.h lib/Xext: XMultibuf.c Xserver/Xext: mbuf.c, mbufbf.c, mbufpx.c include/extensions: xf86vmode.h, xf86vmstr.h Xserver/Xext: vidmodeproc.h, xf86vmode.c lib/Xext: MITMisc.c Xserver/Xext: mitmisc.c Xserver/Xext: xf86misc.c, xf86miscproc.h Xserver/XTrap: xf86XTrapModule.c, xtrapddmi.c, xtrapdi.c, xtrapdiswp.c, xtrapditbl.c include/extensions: xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h xtraplibp.h xtrapproto.h Fixes: ArcticaProject/nx-libs#116 X.org: https://cgit.freedesktop.org/xorg/xserver/commit/?id=cbc20d92de92aad5ca240310a9156ccf97c24a01 Plus: Drop various Imake'ish defines where not needed anymore.
* Fix debugging function for Loop.cpp. getDebugSpec was replaced by << operand ↵Nito Martinez2016-05-311-6/+6
| | | | in ChannelEndPoint.{h|cpp}, fixes #130
* Merge branch 'nitomartinez-3.6.x' into 3.6.x3713346fMike Gabriel2016-05-312-3/+2
|\
| * nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new ↵Mihai Moldovan2016-05-312-0/+196
| | | | | | | | | | | | | | | | function ReduceCompositeOp(). More or less just an optimization for more "trivial" composite operations requiring less work, but syncs up the newer X.Org Server and nx-libs a bit more.
| * nx-X11/programs/Xserver/composite/Imakefile: add new file to SRCS and OBJS ↵Mihai Moldovan2016-05-311-2/+4
| | | | | | | | and define -DNXAGENT_SERVER while building the Composite extension to disable some code that depends upon a newer X.Org architecture.
| * misc nx-X11/{programs/Xserver/composite,include/extensions}: update to ↵Mihai Moldovan2016-05-3110-392/+1857
| | | | | | | | Composite 0.4 - with changes where neccessary and rough edges.
| * nx-X11/programs/Xserver/{dix/{colormap.c,window.c},hw/nxagent/NXwindow.c,inc ↵Mihai Moldovan2016-05-316-1/+133
| | | | | | | | lude/{colormap,window{,str}}.h}: backport features needed for Composite 0.4.
| * display version number in nxcomp log, fixes #127Nito Martinez2016-05-312-3/+2
| |
* | Merge branch 'Ionic-feature/composite-update' into 3.6.xMike Gabriel2016-05-3119-395/+2190
|\ \ | |/ |/|
| * nx-X11/programs/Xserver/{hw/nxagent/NX,render/}picture.c: add and use new ↵Mihai Moldovan2016-05-302-0/+196
| | | | | | | | | | | | | | | | function ReduceCompositeOp(). More or less just an optimization for more "trivial" composite operations requiring less work, but syncs up the newer X.Org Server and nx-libs a bit more.
| * nx-X11/programs/Xserver/composite/Imakefile: add new file to SRCS and OBJS ↵Mihai Moldovan2016-05-301-2/+4
| | | | | | | | and define -DNXAGENT_SERVER while building the Composite extension to disable some code that depends upon a newer X.Org architecture.
| * misc nx-X11/{programs/Xserver/composite,include/extensions}: update to ↵Mihai Moldovan2016-05-3010-392/+1857
| | | | | | | | Composite 0.4 - with changes where neccessary and rough edges.
| * nx-X11/programs/Xserver/{dix/{colormap.c,window.c},hw/nxagent/NXwindow.c,inc ↵Mihai Moldovan2016-05-256-1/+133
|/ | | | lude/{colormap,window{,str}}.h}: backport features needed for Composite 0.4.
* Merge branch 'sunweaver-pr/nxagent-no-compiler-warnings' into arctica-3.6.xMihai Moldovan2016-05-13134-3293/+2474
|\ | | | | | | Attributes GH PR #102: https://github.com/ArcticaProject/nx-libs/pull/102
| * hw/nxagent/Display.c: Avoid incompatible pointer type.Mike Gabriel2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends the following compiler warning Display.c: In function ‘nxagentMakeIcon’: Display.c:1949:18: warning: assignment from incompatible pointer type agentIconData=x2goagentIconData; ^ Display.c:1954:18: warning: assignment from incompatible pointer type agentIconData=nxagentIconData; ^ Display.c:2001:41: warning: passing argument 3 of ‘XpmCreatePixmapFromData’ from incompatible pointer type agentIconData, ^ In file included from Icons.h:22:0, from Display.c:67: X11/include/xpm_nxagent.h:242:6: note: expected ‘char **’ but argument is of type ‘char *’ FUNC(XpmCreatePixmapFromData, int, (Display *display, ^ X11/include/xpm_nxagent.h:230:32: note: in definition of macro ‘FUNC’ #define FUNC(f, t, p) extern t f p
| * hw/nxagent/Display.c: Define Pixmap from XlibPixmap before including Icons.h ↵Mike Gabriel2016-05-131-0/+4
| | | | | | | | (which includes hw/nxagent/X11/include/xpm_nxagent.h).
| * hw/nxagent/Holder.c: Define Pixmap from XlibPixmap before including ↵Mike Gabriel2016-05-131-0/+1
| | | | | | | | hw/nxagent/X11/include/xpm_nxagent.h.
| * hw/nxagent/Events.c: Avoid '#endif <empty line> #ifdef DEBUG' blocks.Mihai Moldovan2016-05-131-12/+0
| |
| * hw/nxagent/NXmiexpose.c: Initialize all items of the newValues[] array.Mike Gabriel2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Amends the following compiler warnings: ``` NXmiexpose.c:904:18: warning: ‘newValues[2].ptr’ may be used uninitialized in this function [-Wmaybe-uninitialized] gcval[i++].ptr = newValues[TILE].ptr; ^ NXmiexpose.c:914:24: warning: ‘newValues[1].val’ may be used uninitialized in this function [-Wmaybe-uninitialized] if ( pGC->fgPixel != newValues[FOREGROUND].val) { ^ ```
| * hw/nxagent/Keystroke.c: Fix warning: pointer type mismatch in conditional ↵Mike Gabriel2016-05-021-1/+1
| | | | | | | | expression.
| * hw/nxagent/Window.c: Initialize tmp_mask and attributes.event_mask with ↵Mike Gabriel2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | NoEventMask. Amends the following compiler warning: ``` Window.c: In function ‘nxagentSetTopLevelEventMask’: Window.c:3392:31: warning: ‘attributes.event_mask’ may be used uninitialized in this function [-Wmaybe-uninitialized] Mask tmp_mask = attributes.event_mask; ^ ```
| * hw/nxagent/Colormap.c: Don't declare and assign flexibility variable if not ↵Mike Gabriel2016-05-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | used later on. Amends the following compiler warning: ``` Colormap.c: In function ‘nxagentReconnectAllColormap’: Colormap.c:575:7: warning: variable ‘flexibility’ set but not used [-Wunused-but-set-variable] int flexibility; ^ ```
| * hw/nxagent/GCOps.c: Don't declare and assign oldDstxyValue if not used later on.Mike Gabriel2016-05-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | Amends the following compiler warning: ``` GCOps.c: In function ‘nxagentCopyArea’: GCOps.c:597:7: warning: variable ‘oldDstxyValue’ set but not used [-Wunused-but-set-variable] int oldDstxyValue; ^ ```
| * hw/nxagent/GC.c: Don't declare and assign flexibility variable if not used ↵Mike Gabriel2016-05-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | later on. Amends the following compiler warning: ``` GC.c: In function ‘nxagentReconnectAllGCs’: GC.c:1154:7: warning: variable ‘flexibility’ set but not used [-Wunused-but-set-variable] int flexibility; ^ ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 01:38:03 +0000