summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-09-08Merge branch 'upstream' (one day I will rebase rather than merge)HEADmasterJoel Bosveld434-14951/+15110
Conflicts: test/Makefile.am
2009-09-07Fix "warning: left-hand operand of comma expression has no effect"Eamon Walsh3-18/+30
Signed-off-by: Eamon Walsh <efw@eamonwalsh.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-07dix: remove dixLookupResource - we don't have any users left.Peter Hutterer2-26/+0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Acked-by: Aaron Plattner <aplattner@nvidia.com>
2009-09-06XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket nameJeremy Huddleston1-2/+5
(cherry picked from commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a)
2009-09-06XQuartz: Fix "warning: function declaration isn’t a prototype" noiseJeremy Huddleston1-1/+1
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
2009-09-06XQuartz: pbproxy: 64bit fixes: Properly process an array of AtomsJeremy Huddleston2-7/+8
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
2009-09-05XQuartz: Fix a strcpy/strcmp typoJeremy Huddleston1-5/+6
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
2009-09-04EXA: Stop hiding solid or gradient pictures from the driver.Michel Dänzer1-183/+200
Add support for solid pictures in exaTryDriverSolidFill(), but otherwise just pass solid and gradient pictures to the driver Composite hook. While we're at it, clean up the logic to detect Composite operations which are effectively solid fills or copies. This should also fix some false negatives and positives.
2009-09-04XQuartz: Check the DISPLAY environment variable to see if the socket at ↵Jeremy Huddleston2-10/+42
startup is ours. If not, ignore it and fork/exec startx. (cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
2009-09-04XQuartz: Use --with-launchd-id-prefix for consistency with xinitJeremy Huddleston7-17/+23
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME (cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
2009-09-04xserver 1.6.99.900Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04shave: hack around the configure ld check for make distcheck.Peter Hutterer1-0/+10
configure calls $(CC) -print-prog-name=ld to get the binary for the linker. The shave script prints " CC \nld" which can't be parsed by configure, resulting in a fatal error. This patch special-cases -print-prog-name and passes it though directly without any additional output. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04xfree86: fix make distcheck after removal of Domain.note and RAC.Notes.Peter Hutterer1-2/+0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04xkb: xkbGetKbdByName on the lastSlave needs to change the master (#21859)Peter Hutterer1-0/+10
If the layout is changed on a master's lastSlave, the master needs to change layout immediately. Otherwise, the master stays on the same layout until the lastSlave changes - which may not happen if only a single keyboard is available. X.Org Bug 21859 <http://bugs.freedesktop.org/show_bug.cgi?id=21859> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04dix: hide the sequenceNumber key repeat hack behind two functions.Peter Hutterer2-7/+37
Just in case we figure out a better way to do it in the future. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04input: allow for detectable autorepeat.Daniel Stone8-181/+155
For core and XI1 events, store the key_repeat flag in the sequence number until TryClientEvents. The sequenceNumber is unset until TryClientEvents. [Also thrown in, some random indentation changes. Thanks] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04dix: improve code flow in TryClientEvents, better debugging messages.Daniel Stone1-52/+66
Instead of a massive if (blah && blah), return early where possible. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04require xf86vidmodeproto 2.2.99.1 or newer.Peter Hutterer3-6/+4
2009-09-04os: silence bigreqsproto compiler warningPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04xfree86: silence some xf86dgaproto compiler warningsPeter Hutterer3-5/+3
We already require xf86dgaproto > 2.0.99 since 6fffcd582 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04xfree86: silence 'unused variable' compiler warningPeter Hutterer1-1/+3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04os: don't redefine GNU_SOURCEPeter Hutterer1-0/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-04Formatted recent Geode PCI ID changes to fit a 80-column coding style.Martin-Éric Racine1-2/+3
2009-09-04Further explained what the Geode PCI ID is all about as comments.Martin-Éric Racine1-2/+2
2009-09-04Removed unnecessary curly braces for Geode LX PCI ID.Martin-Éric Racine1-2/+1
2009-09-04Updated the PCI Vendor and Device IDs for all Geode variants.Martin-Éric Racine1-5/+17
In practice, some of the native drivers for older Geode products have become deprecated due to lack of e.g. libpciaccess upgrade, but that's OK, since most distributions don't ship them anymore. In that case, we'll let X server fall back to good old VESA.
2009-09-03EXA: Preserve pPixmap->devPrivate.ptr in exaPixmapIsOffscreen_mixed.Michel Dänzer1-1/+3
Otherwise we may incorrectly clobber it to NULL on repeated PrepareAccess calls.
2009-09-03glx: Add screen DestroyWindow wrapper to destroy the GLX drawable.Michel Dänzer2-0/+29
Fixes crashes exitting MacSlow's rgba-glx demo.
2009-09-03dix: don't return BadMatch from GetProperty (#23562)Peter Hutterer1-1/+1
dixLookupWindow may return BadMatch if the window in question isn't actually a window. In this case, GetProperty needs to return BadWindow - not BadMatch. X.Org Bug 23562 <http://bugs.freedesktop.org/show_bug.cgi?id=23562> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03test: add protocol testing for XIWarpPointer.Peter Hutterer2-0/+220
TODO: some way to check src_x/y coordinates would be good. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03test: expose the default screen to tests, some cleanup work.Peter Hutterer4-12/+26
Provide common #define for invalid window IDs. Init the sprite's hotPhys, provide a common #define for the initial sprite position. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: return BadDevice for master kbds and attached slaves in XIWarpPointerPeter Hutterer1-0/+7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: return error values to client from XIWarpPointer.Peter Hutterer1-0/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: standardise XI2 headers.Peter Hutterer7-8/+33
Adding missing dix-config.h include, adding one missing header guard. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: if XISetEventMask fails, return this to the client.Peter Hutterer5-6/+12
The only failure point can be a BadAlloc. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03dix: when unsetting a cursor, update the sprite immediately (#23608)Peter Hutterer1-1/+2
Removing the device cursor while the cursor was within the window did not update the visible sprite until the next enter/leave event. X.Org Bug 23608 <http://bugs.freedesktop.org/show_bug.cgi?id=23608> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: fix broken swap code in XISelectEvents request processing.Peter Hutterer2-2/+2
The pointer advanced 12 bytes too short. Rather unfortunate if both the code and the test have the same bug. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: Unify checking for invalid bits in grab masks.Peter Hutterer4-19/+34
Bits above XI2LASTEVENT are invalid and cause in BadValues. These checks must be performed anywhere where a mask_len parameter is given. This patch also adds the missing checks to grab masks. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: don't overrun memory for grab masks.Peter Hutterer2-2/+6
A grab mask provided in the request may be larger than the one used in the server. Cut down to size before memcopying. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: don't try to set oversized or non-existing masks.Peter Hutterer1-3/+6
Fixes crash if the first XISelectEvents has a zero sized event mask. Fixes crash if the mask provided is larger than others->xi2mask[]. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03test: fix request length calculation, add length tests for XISelectEventsPeter Hutterer1-2/+17
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03test: fix build after changing libxf86config.laPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Xi: extra length checking for requests providing masks.Peter Hutterer1-0/+11
masks can be of arbitrary length. If the client did not initialize mask_len, some sort of boundary check is needed to avoid running over memory. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-03Un-export ApplyPointerMapping. This is an in-server function.Peter Hutterer2-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-02Correct outdated e-mail address in "Author" statements.Eamon Walsh6-6/+6
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-09-02randr: Fix crtcs using set_mode_major()Adam Jackson1-4/+5
We'd never mark the crtc as active, meaning (among other things) gamma upload wouldn't work.
2009-09-02vgaarb: protect fini as well just in caseDave Airlie1-0/+2
2009-09-02vgaarb: if arb init fails, make sure locking doesn't occur.Dave Airlie1-0/+4
pointed out by Martin Jansa on irc. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-09-01Xext: fix a typo for bigreqsproto.h header fileJerome Glisse1-1/+1
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
2009-08-31Xext: Require newer versions of xcmiscproto, bigreqsproto, and ↵Jeremy Huddleston4-6/+5
xf86bigfontproto for new *proto.h header file names bigreqsproto >= 1.1.0 xcmiscproto >= 1.2.0 xf86bigfontproto >= 1.2.0