aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
Commit message (Collapse)AuthorAgeFilesLines
* include: add version_compare helper functionMike Gabriel2016-06-211-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit 0df871cf34ee5f1a85586206027de9b02fb364ec Author: Robert Ancell <robert.ancell@canonical.com> Date: Thu May 22 10:43:52 2014 +1200 Fix overflow checking extension versions The easiest way to check for the version of an extension is to send the maximum possible version numbers in the QueryVersion request. The X server overflows on these as it assumes you will send a reasonable version number. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com> commit ffd4874798ba54f86acac75779a15b4babeaa5f3 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed May 11 12:20:50 2011 +1000 include: add version_compare helper function Compare two version numbers in the major.minor form. Switch the few users of manual version switching over to the new function. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* [render] Split out filter finding from filter setting.Mike Gabriel2016-06-213-17/+54
| | | | | | | | | | | | | | | | | Backported from X.org: commit acda790e430b2a18c7c35379f6e538f3d01ff221 Author: Keith Packard <keithp@keithp.com> Date: Fri Mar 14 13:46:30 2008 -0700 [render] Split out filter finding from filter setting. To prepare for RandR using filters in transforms, split out code paths so that the RandR code can validate the filter name and parameters during the transform set operation so that use of the filter later will not have unreportable errors. Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* hw/nxagent/NXresource.c: remove caching of drawables and graphics contexts. ↵Mike Gabriel2016-06-211-20/+0
| | | | The security checks simply bypass the cached values so they are unused. Required code de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on).
* dix: remove caching of drawables and graphics contexts. The security checks ↵Mike Gabriel2016-06-211-20/+0
| | | | | | | | | | | | | | | simply bypass the cached values so they are unused. Backported from X.org: commit 9a183d7ba50e31afa133cc03aee7991517a283ea Author: Eamon Walsh <ewalsh@tycho.nsa.gov> Date: Tue Aug 14 11:39:26 2007 -0400 dix: remove caching of drawables and graphics contexts. The security checks simply bypass the cached values so they are unused. Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Xserver/dix/events.c: Don't declare and assign unused pScreen.Mike Gabriel2016-06-211-3/+0
|
* Move each screen's root-window pointer into ScreenRec.Mike Gabriel2016-06-2142-224/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from X.org: commit e7fae9ecc42ab5e73b89117722dbf4117d928f9a Author: Jamey Sharp <jamey@minilop.net> Date: Sat May 22 00:26:28 2010 -0700 Move each screen's root-window pointer into ScreenRec. Many references to the WindowTable array already had the corresponding screen pointer handy, which meant they usually looked like "WindowTable[pScreen->myNum]". Adding a field to ScreenRec instead of keeping this information in a parallel array simplifies those expressions, and eliminates a MAXSCREENS-sized array. Since dix uses this data, a screen private entry isn't appropriate. xf86-video-dummy currently uses WindowTable, so it needs to be updated to reflect this change. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com> Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com> (i686 GNU/Linux) Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Centralize declaration of ConnectionInfo.Mike Gabriel2016-06-213-1/+3
| | | | | | | | | | | | | Backported from X.org: commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794 Author: Adam Jackson <ajax@redhat.com> Date: Wed Aug 20 13:14:03 2008 -0400 Centralize declaration of ConnectionInfo. Author: Adam Jackson <ajax@redhat.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* nxagent/hw/NXextension.c: Allow CloseDownProc to be NULL. Required code ↵Mike Gabriel2016-06-211-2/+3
| | | | de-duplication in nxagent. (Will be fixed by ArcticaProject/nx-libs#120 later on).
* Allow CloseDownProc to be NULL.Mike Gabriel2016-06-211-2/+3
| | | | | | | | | | | | | | | | | | | | Backported from X.org: commit ae67508392261ae47858692668a0c192ef4a9d7b Author: Mathieu Bérard <mathieu.berard@crans.org> Date: Fri Jul 25 10:05:30 2008 -0400 Fix AddExtension now that CloseDownProc can be NULL. commit 6bcde69585fcc8f8dbfe81c115649f19274922fa Author: Adam Jackson <ajax@redhat.com> Date: Thu Jul 24 09:13:26 2008 -0400 Allow extension closedown hook to be null. Authors: Adam Jackson <ajax@redhat.com> Mathieu Bérard <mathieu.berard@crans.org> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* randr extension: Convert to Xorg coding style.Mike Gabriel2016-06-2116-3699/+3511
| | | | | The reformatting has been achieved by applying x-indent.sh to all .c and .h files in Xserver/randr/.
* Drop trailing whitespaces (randr extension)Mike Gabriel2016-06-2114-220/+220
| | | | | | | sed -i "s/[ ]\+$//g" randr/*.{c,h} happy reviewing... git diff -w is an empty diff.
* randr: Remove mirandrAdam Jackson2016-06-212-158/+2
| | | | | | | | | This isn't used anywhere, not least because it's completely nonfunctional. Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Adam Jackson <ajax@redhat.com> Backported-to-NX: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* Xserver/randr/Imakefile: Serialize parameters and make Imakefile changes ↵Mike Gabriel2016-06-211-2/+28
| | | | more trackable.
* hw/nxagent/Handlers.c: Regression fix since 6051dec. Close unclosed '#ifdef ↵Mike Gabriel2016-06-211-0/+1
| | | | TEST'.
* hw/nxagent/Options.h: Grammar fix in comment.Mike Gabriel2016-06-211-1/+1
|
* Properly enable/disable Xinerama support in nxagent via cmdline options ↵Mike Gabriel2016-06-214-33/+48
| | | | | | | | | | | | | | | | | | | provider in Xserver/os/utils.c. * Xinerama defaults to enabled, using RRXineramaExtension (i.e. cmdline option: +rrxinerama). * Cmdline option -rrxinerama disables Xinerama support entirely. * Cmdline option +xinerama switches from RRXineramaExtension to PanoramiXExtension. * Cmdline option -xinerama is actually non-functional (i.e. the default). * If the nx/nx option "xinerama" is handed over to nxagent, then Xinerama is only switched on if that given option enables it (value: 1) _and_ if either of the Xinerama extensions (PanoramiX or RRXinerama) has been initialized (via cmdline options above). Fixes ArcticaProject/nx-libs#117. Fixes ArcticaProject/nx-libs#134 (makes flawed PR#134 obsolete).
* noRRXineramaExtension: Make Boolean configurable via new cmdline switch ↵Mike Gabriel2016-06-213-2/+18
| | | | (+|-rrxinerama).
* {nx-X11/programs/Xserver/hw/nxagent/{{Args,Handlers,Image,Options}.c,Options ↵Mihai Moldovan2016-06-215-24/+83
| | | | .h},nxcomp/{Loop,Misc}.cpp}: add configurable sleep delay if session is suspended.
* nxagentReversePointerMap: Don't assume Xevent.xbutton.button is always ↵Mike Gabriel2016-06-212-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
* nx-X11/programs/Xserver/hw/nxagent/Handlers.h: fix stack smashing related to ↵Mihai Moldovan2016-06-211-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.
* nx-X11/programs/Xserver: Include nxcomp{,ext,shad} headers like one would do ↵Mike Gabriel2016-06-1331-52/+73
| | | | with system-wide shared libraries.
* 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.
* 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-0120-607/+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-0136-14707/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* 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-308-390/+1814
| | | | 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.
* 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; ^ ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 13:16:50 +0000