aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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.
* Use internal temp variable for swap macros. Make swaps/swapl type safe ↵Mike Gabriel2016-07-0483-3376/+2593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (introducing wrong_size check at build time). While working on this changeset, various spots got discovered where swapl or swaps was used on a wrong type, where byte swapping calls had been forgotten or done on the wrong variable. This backport at least includes changes from the following X.org commits, listed in non-chronological order: commit 2c7c520cfe0df30f4bc3adba59d9c62582823bf8 Author: Matt Turner <mattst88@gmail.com> Date: Thu Aug 4 15:35:41 2011 -0400 Use internal temp variable for swap macros Also, fix whitespace, mainly around swaps(&rep.sequenceNumber) Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com> commit 9edcae78c46286baff42e74bfe26f6ae4d00fe01 Author: Matt Turner <mattst88@gmail.com> Date: Wed Sep 21 17:14:16 2011 -0400 Use correct swap{l,s} (or none at all for CARD8) Swapping the wrong size was never caught because swap{l,s} are macros. It's clear in the case of Xext/xres.c, that the author believed client_major/minor to be CARD16 from looking at the code in the first hunk. v2: dmx.c fixes from Keith. Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com> commit dab064fa5e0b1f5c67222562ad5367005832cba1 Author: Andrea Canciani <ranma42@gmail.com> Date: Tue Nov 2 20:10:32 2010 +0100 render: Fix byteswapping of gradient stops The function swapStops repeatedly swaps the color components as CARD16, but incorrectly steps over them as if they were CARD32. This causes half of the stops not to be swapped at all and some unrelated data be swapped instead. Signed-off-by: Andrea Canciani <ranma42@gmail.com> Reviewed-by: Soren Sandmann <sandmann@daimi.au.dk> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com> commit 54770c980cd2b91a8377f975a58ed69def5cfa42 Author: Matt Turner <mattst88@gmail.com> Date: Tue Aug 16 16:59:07 2011 -0400 Cast char* buffers to swap functions Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com> commit 6844bd2e63490870bab3c469eec6030354ef2865 Author: Alan Coopersmith <alan.coopersmith@sun.com> Date: Wed Jan 9 19:52:00 2008 -0800 More Xv extension byte swapping fixes commit e46f6ddeccd082b2d507a1e8b57ea30e6b0a2c83 Author: Michel Dänzer <michel@tungstengraphics.com> Date: Wed Jan 16 14:24:22 2008 +0100 Yet another Xv extension byte swapping fix.
* os: Remove deprecated malloc/free wrappers, clean ↵Mike Gabriel2016-07-022-145/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage Backported from X.org: commit cad9b053d52f62432dfd70e42e0240de77027cae Author: Adam Jackson <ajax@redhat.com> Date: Tue Jul 8 13:24:25 2014 -0400 os: Remove deprecated malloc/free wrappers Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com> commit e983848ab44b0769f97f6207f1aa8b4f127be6a9 Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Thu May 6 00:16:24 2010 +0700 Clean {X,XNF}{alloc,calloc,realloc,free,strdup} from pre-C89 baggage C89 guarantees alignment of pointers returned from malloc/calloc/realloc, so stop fiddling with alignment manually and just pass the arguments to library functions. Also convert silent error when negative size is passed into function into warning in log file. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
* nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead.Mike Gabriel2016-07-0215-34/+26
|
* nx-X11/programs/Xserver: Drop {X,x}realloc() macros, use realloc() instead.Mike Gabriel2016-07-0242-95/+95
|
* nx-X11/programs/Xserver: Drop {X,x}alloc() macros, use malloc() instead.Mike Gabriel2016-07-02134-1301/+464
|
* nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.Mike Gabriel2016-07-02139-890/+889
| | | | Fixes ArcticaProject/nx-libs#105
* Xserver/include/protocol-versions.h: Switch to having an Xserver-specific ↵Mike Gabriel2016-07-0221-75/+257
| | | | header file containing all use protocol versions.
* Xserver Imakefiles: Make sure NXAGENT_SERVER is defined for all extensions.Mike Gabriel2016-07-029-12/+62
|
* finally drop libNX_XextUlrich Sibiller2016-07-012-5/+5
|
* remove shm code from libNX_XextUlrich Sibiller2016-07-015-6/+6
|
* remove XShape code from libNX_XextUlrich Sibiller2016-07-014-9/+7
| | | | use system libXext instead
* nxagent Xserver: Drop Kerberos code. Not used in nxagent.Mike Gabriel2016-07-0111-918/+6
|
* library-cleanup: Don't build libNX_Xau anymore. Use system's libXau shared ↵Mike Gabriel2016-07-011-1/+1
| | | | library.
* OPTFLAGS: Properly propagate build option flags to nxcomp{,ext,shad} and the ↵Mike Gabriel2016-07-011-21/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nx-X11 build scripts. Note: - The "normal" way to inject CFLAGS (and CPPFLAGS) into nx-X11 builds is copying those options over into the variable CDEBUGFLAGS. - LDFLAGS have to be handed to nx-X11 via LOCAL_LDFLAGS. This change also includes a slight change in the nx-X11 build order. Old build order: Main Makefile: - [...] - libNX_X11 + implicitly building nxcomp + implicitly building nxcompext - [...] - nxagent + implicitly building nxcompshad - [...] New build ordner: Main Makefile: - [...] - nxcomp - setup nx-X11 build env + cd nx-X11 && make BuildEnv - nx-X11/lib/* - nxcompext - nxcompshad - [...] - nxagent - [...] Fixes ArcticaProject/nx-libs#141 Fixes X2GoBTS#84
* 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.
* 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.