summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2013-10-05xfree86/hurd: include <hurd.h>Pino Toscano3-0/+3
Needed for using get_privileged_port. Signed-off-by: Pino Toscano <toscano.pino@tiscali.it> Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Julien Cristau <jcristau@debian.org>
2013-10-04kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit declsKeith Packard1-16/+0
These were duplicated when GLX support was re-added on two different branches. Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04xfree86: add a comment as to why the logdir is createdGaetan Nadon1-0/+1
Without the logdir, the xserver will write the content of the log file on the terminal stating that it cannot be written and will stop. Refer to https://bugs.freedesktop.org/show_bug.cgi?id=3889 Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04xfree86: Use $(MKDIR_P) for better code portabilityGaetan Nadon1-2/+1
Still true that we should not use the lower case $(mkdir_p) version. However, remove the 2005 comment as the MKDIR_P is widely used now. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Uninstall X link and CYGWIN libXorg.exe.a in local install targetsGaetan Nadon1-0/+8
It is our duty to uninstall any files and/or directories that we installed through install-data-local and install-exec-hook. Currently the X symbolic link to Xorg remains on disk after running make uninstall. Note the exception for logdir which is usually shared by other modules. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Xorg binary: use install-exec-hook rather than install-exec-localGaetan Nadon1-5/+4
The former was explicitly designed to execute additional code after the binary has been installed. The latter can be executed in any order, hence it's current dependency on install-binPROGRAMS as a workaround. The CYGWIN libXorg.exe.a target is an installation target rather than a post-installation one, so it should not be done as a hook. It does not depend on the Xorg executable being installed. Automake: "These hooks are run after all other install rules of the appropriate type, exec or data, have completed. So, for instance, it is possible to perform post-installation modifications using an install hook". "With the -local targets, there is no particular guarantee of execution order; typically, they are run early, but with parallel make, there is no way to be sure of that". Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Use $(LN_S) provided by AC_PROG_LN_S macro to create linksGaetan Nadon1-1/+1
For better code portability. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04The Xorg binary is missing the extension $(EXEEXT) in the makefileGaetan Nadon1-1/+1
This is not a problem on UNIX platforms, but on CYGWIN it creates a broken link to Xorg rather than a link to Xorg.exe. From the CYGWIN log on tinderbox, we can see that the executable Xorg.exe is installed correctly. We can see the command used to create the link: (cd /jhbuild/install/[...]/install/bin && rm -f X && ln -s Xorg X) Note that the "relink" makefile target correctly appends $(EXEEXT) to Xorg. Reviewed-By: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-10-04Merge remote-tracking branch 'anholt/ephyr-fixes'Keith Packard20-4159/+1682
2013-10-04Merge remote-tracking branch 'whot/for-keith'Keith Packard1-2/+2
2013-10-04Merge remote-tracking branch 'ajax/xserver-next'Keith Packard33-414/+157
2013-09-25dmx: provide enough space for axis mappingsPeter Hutterer1-2/+2
relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit set in the ABS_* range is axis 2, and so on. This requires us to actually have enough space to have all the ABS_*/REL_* range. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-09-16XQuartz: pbproxy: Fix build with -DDEBUGJeremy Huddleston Sequoia1-2/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-09-16XQuartz: Fix build with moved pseudoramiXJeremy Huddleston Sequoia2-0/+2
Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2013-09-11glx: Remove pixmapMode from __GLXconfigAdam Jackson3-5/+0
This has never been filled in with anything meaningful afaict, and you can't get to it from the client in any event. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11glxproxy: Don't track GLCLientm{aj,in}orVersionAdam Jackson3-10/+0
Basically just a port of 62f06b0d to glxproxy. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-11dmx/glx: Remove unused __glXNopAdam Jackson3-40/+0
Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Simplify DamageUnregisterAdam Jackson1-5/+1
You can only register one drawable on a given damage, so there's no reason to require the caller to specify the drawable, the damage is enough. The implementation would do something fairly horrible if you _did_ pass mismatched drawable and damage, so let's avoid the problem entirely. v2: Simplify xf86RotateDestroy even more [anholt] Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10damage: Implicitly unregister on destroyAdam Jackson1-3/+0
There's no reason not to, and it simplifies quite a few callers. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Remove deprecated miPointerCurrentScreenAdam Jackson1-5/+1
The only remaining use was in some debugging code in DMX. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10xfree86: Remove deprecated unimplemented xf86MapReadSideEffectsAdam Jackson3-17/+0
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10vbe: Don't try to load the ddc submoduleAdam Jackson1-15/+2
DDC is built into the server now. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10dmx: Remove ShadowFB supportAdam Jackson9-305/+101
This has been listed as deprecated ever since DMX was merged. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Remove EnqueueEvent from miPointerScreenFuncRecAdam Jackson4-5/+0
No DDX overrode this, and we never actually called through that slot anyway. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Flatten calls to mieqSwitchScreenAdam Jackson4-4/+0
No DDX was overriding this. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10xnest: Ignore GetImage() error in xnestGetImage()Radek Doulik1-0/+14
When an Xnest instance is not viewable it will crash when a client in that instance calls GetImage. This is because the Xnest server will itself receives a BadMatch error. This patch ignores the error. The application which has requested the image will receive garbage - this however is fully legal according to the specs as obscured areas will always contain garbage if there isn't some sort of backing store as discussed in https://bugs.freedesktop.org/show_bug.cgi?id=9488 The applied patch is a version from Dadek Doulik. v2: Call XSync() before changing error handlers as suggested by Daniel Stone <daniel@fooishbar.org>. Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Egbert Eich <eich@freedesktop.org>
2013-09-10Xnest: Implement xnestModifyPixmapHeaderMichal Srb3-0/+18
Xnest variant of ModifyPixmapHeader that creates new Pixmap in parent X server if it's size is modified from 0x0 to anything bigger. xnestCreatePixmap doesn't create pixmap in parent X server if it has dimensions 0x0. If it is later resized and accessed, Xnest will be aborted with BadDrawable error from parent X server because it will use XID 0. This happens with ScratchPixmap, for example as used from XaceCensorImage. Applications using XACE crash Xnest. Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-09-10ephyr: restore GLX supportLaurent Carlier1-0/+20
It was removed since version 1.13 Signed-off-by: Sebastien Bacher <seb128@ubuntu.com> Acked-by: Daniel Stone <daniel@fooishbar.org>
2013-09-09Merge remote-tracking branch 'jturney/master'Keith Packard19-631/+87
2013-09-06kdrive: fix build error on gcc 4.8 for out-of-bounds array accessChris Clayton1-1/+1
I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot of gcc-4.8: input.c:225:43: error: array subscript is above array bounds [-Werror=array-bounds] This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can be beyond the end of the array. Signed-off-by: Chris Clayton <chris2553@googlemail.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-09-03kdrive: initialize GLX for xephyrSebastien Bacher1-0/+20
Like commit ac1a60e7b6f06fd075cc5bf55d6bc67206a01d29, re-add initialization of GLX after it was accidentally dropped from non-Xorg servers in 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86. Signed-off-by: Sebastien Bacher <seb128@ubuntu.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62346 Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Eric Anholt <eric@anholt.net>
2013-09-03ephyr: Do grab/ungrab for ctrl+shift, not just shift+ctrl.Eric Anholt1-3/+6
Given that the window title says "ctrl+shift", having pressing those keys in that order not ungrab you is fairly mean. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Flush the X connection when updating the window title.Eric Anholt1-0/+1
Otherwise when you're doing the ctrl-shift mouse grab thing, you don't know what state you're in until the next rendering occurs. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Use host (HW) cursors by default.Eric Anholt3-7/+11
Unless you're working on the sw cursor rendering code, you surely want to have real hardware cursors. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Garbage collect some DOA host window clipping code.Eric Anholt2-43/+0
Introduced in 79782726617d4b5a4f9b376f21936d035fc870e1 but never used. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Garbage collect some dead XV clipping code.Eric Anholt1-113/+4
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the helper libs for each of the optional components.Eric Anholt1-49/+38
Note that EXTRA_DIST was always unnecessary, because automake notices conditional compile of source files and includes them. Copyright header is added because git noted that this was a 61% rewrite. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the remaining bits of host/server XV split.Eric Anholt4-202/+33
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the host/server split of the actual XV video operations.Eric Anholt3-270/+137
I suspect there's more cleanup possible in ephyrHostXVPutImage() by sticking a bunch of the args in the port priv earlier. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove another host/server split for XV image formats.Eric Anholt3-99/+56
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the host/server split for video encodings.Eric Anholt3-99/+39
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the host/server split for XV formats.Eric Anholt3-43/+15
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the host/server split for XV attributes.Eric Anholt3-177/+86
v2: Fix leaks of xcb replies (caught by Julien) Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove the host/server split for XV adaptors.Eric Anholt3-96/+28
Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Refactor XV adaptor feature detection.Eric Anholt3-110/+17
This obviously wanted a helper function beforehand, but even more so now that we have XCB. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Remove some pointless indirection in the XV code.Eric Anholt3-83/+7
Now that we have XCB on the server side, we don't need to split these functions out. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Move event processing into ephyr.c.Eric Anholt3-376/+299
No more extra event structure to translate between hostx.c and ephyr.c! Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Move the host screen info into the kdrive screen private.Eric Anholt5-234/+192
We can include xcb bits from the same place as server headers, so there's no need to hide them any more. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Rename and use the proper type for what was host_screen->info.Eric Anholt2-33/+34
Now that we can include server headers in talking to host X, we don't need to hide any more. Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2013-09-03ephyr: Expose a single function for detecting extensions.Eric Anholt5-34/+22
v2: Fix trying to include xcb-dri in the non-dri-build case (Noted by Julien) Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org>