Peter Hutterer
d939f2482e
dix: fix false comment.
...
VCP and VCK are always present, this comment is a leftover from earlier MPX
days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-24 10:07:22 +10:00
Matthieu Herrb
387563b777
Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver
2008-11-23 13:15:46 +01:00
Matthieu Herrb
85f650c9b7
missing action in if statement.
2008-11-23 13:15:17 +01:00
Stefan Dirsch
f6e01fa1b8
Added '-showopts' option to print available driver options ( #5564 ).
2008-11-23 11:16:03 +01:00
Jeremy Huddleston
8964b8d0ec
XQuartz: More 1.6 server API updates
2008-11-22 14:23:23 -08:00
Jeremy Huddleston
ad0f232165
XQuartz: Fixed --disable-glx
2008-11-22 14:04:28 -08:00
Jeremy Huddleston
8e2287c220
XQuartz: Updated some code to use newer server API
2008-11-22 13:57:45 -08:00
George Staplin
6eb33bc0cb
XQuartz: GL: Remove the inclusion of glcontextmodes.h.
...
Add some commentary about future directions needed for the GLX drawable
creation and destruction code.
Match xalloc with xfree.
I made some minor formatting improvements.
(cherry picked from commit b772d64fce
)
2008-11-22 11:13:51 -08:00
George Staplin
429b4b20d5
XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
...
In attach() check for pDraw being NULL, and also print an ErrorF message,
because we eventually want to track down why this is occuring.
It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
KERN_PROTECTION_FAILURE at 0x0000000000000004
This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.
I fixed a warning: caused by initializing the screen->base.visuals with the
configs. It is a ** not a *. It seems that some other part of GLX will
initialize this for us.
(cherry picked from commit 17f6a261fc
)
2008-11-22 11:13:46 -08:00
Matthieu Herrb
bc0c7075e2
Remove the old libusbhid copy from os-support/bsd.
...
This has been replaced by in-kernel support for USB mices several
years ago and hasn't been enabled in build since X.Org 6.8.
2008-11-22 19:12:23 +01:00
Jeremy Huddleston
76fcfc4801
XQuartz: GLX: sync up indirect.c to match George's updates in the xorg-server-1.5-apple branch
2008-11-21 20:25:55 -08:00
George Staplin
1a717779b6
XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
...
The new replacement is __GLXconfig.
(cherry picked from commit 3bed9b65c8
)
2008-11-21 20:10:57 -08:00
Alan Coopersmith
dacad9ae0b
Xephyr man page typo fixes.
...
Also trailing white space removal to clear git warnings.
2008-11-21 17:16:22 -08:00
Jeremy Huddleston
ca64b5949d
XQuartz: Don't use LS to find X11.app on Tiger.
...
(cherry picked from commit e62107e552
)
2008-11-21 11:55:49 -08:00
Jeremy Huddleston
701f8e3a94
XQuartz: Update applewm deps
...
(cherry picked from commit 0ad91c59be
)
2008-11-21 11:55:43 -08:00
Jeremy Huddleston
393325f908
XQuartz: spewCallStack is noop on Tiger now...
...
(cherry picked from commit 56c469a68b
)
2008-11-21 10:59:41 -08:00
Jeremy Huddleston
5d47a5d652
XQuartz: pbproxy: Added some typedefs for types not available on Tiger
...
(cherry picked from commit 0947aa7911
)
2008-11-21 10:59:34 -08:00
Jeremy Huddleston
b262788401
XQuartz: More Tiger ifdefs
...
(cherry picked from commit 803509072f
)
2008-11-21 10:59:26 -08:00
Jeremy Huddleston
5107444443
XQuartz: Resurrect the old audio path for Tiger
...
(cherry picked from commit a61a8d9047
)
2008-11-21 10:59:17 -08:00
Jeremy Huddleston
d7ee76f9dd
XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
...
and just have the AppKit thread wake it up.
(cherry picked from commit 799715b8f3
)
2008-11-21 10:59:10 -08:00
Egbert Eich
a9e20306fb
int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
...
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
code in memory that is not marked EXEC. Such code gets called whenever
we return from a VBIOS call to signal the calling program that the call
is actually finished and that we are not trapping for other reasons (like
IO accesses).
Use mprotect(2) to set these memory ranges PROT_EXEC.
2008-11-21 18:57:07 +01:00
Rémi Cardona
a54153e669
xfree86: don't reset Auto(Add|Enable)Devices, use defaults from xf86Globals
...
Without this, commit ace38fafb0
is useless
when HAL support is disabled.
Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-11-21 18:55:07 +01:00
Matthieu Herrb
6a1b2fed7e
Add a man page for Xephyr, with information from the README file.
2008-11-21 18:21:18 +01:00
Matthieu Herrb
10d472bf9d
Support for BSD apm
...
XXX check amd64 pci init
2008-11-21 18:07:03 +01:00
Peter Hutterer
f4e725f248
dix: memset DeviceVelocityPtr to zero.
...
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-11-21 09:04:51 +10:00
Simon Thum
7f818776b7
dix: fix typos in comments, one formatting fix.
...
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-21 09:04:17 +10:00
Peter Hutterer
037ec5a3c4
gitignore: ignore .patch files
2008-11-21 09:04:17 +10:00
Peter Hutterer
ace38fafb0
xfree86: without CONFIG_HAL, Auto{Add|Enable}Devices and AEI is false.
...
There's little chance that we'll get the input devices at runtime without HAL,
we might as well force the server to add mouse/kbd devices automatically -
just like in the olden days.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-21 08:48:38 +10:00
Alan Coopersmith
1cd894173e
Always use server-<display>.xkm to avoid races when multiple servers start
...
Previously each server starting ran xkbcomp with the output set to
<keymapname>.xkm, read it, then deleted it - which led to races if
two servers were starting at the same time with the same keymap.
Sun bug #6773816 Xorg uses the same xkm output file for compiled keymap file
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6773816 >
2008-11-20 14:02:11 -08:00
Rémi Cardona
1e4412abc4
drop unused HAVE_LIBDRM_2_2
...
Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-11-20 15:25:43 +01:00
Jeremy Huddleston
c4ec71b405
XQuartz: pbproxy: nuke RCS Id, update header license/copyright
...
(cherry picked from commit 477c6968a8
)
2008-11-19 10:58:15 -08:00
Jeremy Huddleston
42f330cf9e
XQuartz: pbproxy: Remove thread-main.m
...
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a
)
2008-11-19 10:58:06 -08:00
Jeremy Huddleston
19aac4274b
mi: Push screen-saver/DPMS handling to after the EQ pop operation.
...
This way we on't need to hold the mutex during the dixSaveScreens() call.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-19 10:55:29 -08:00
Jeremy Huddleston
56d1793c43
mi: Only increment tail (push) when the event data is actually in the queue
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-19 10:54:57 -08:00
Alan Coopersmith
570835b9a8
Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
...
Depends on commit 70e18a3b6b
to get
definition of xf86InitVidMem on Solaris.
2008-11-19 10:19:20 -08:00
Keith Packard
3932a84857
Xinput: use floats for ConstantDeceleration and AdaptiveDeceleration
...
These values need not be constrained to integer values.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-11-18 14:21:01 -05:00
Dave Airlie
08cd361234
exa: avoid doing prepare/done without intervening copies in exaFillRegionTiled
...
This does a precursor check to make sure the copies are required before
entering the prepare/done code.
2008-11-17 19:15:20 +10:00
Dave Airlie
8f8a9c19ad
EXA: avoid copy operations if no boxes in use
...
Simple fix for now, I'm sure damage shouldn't be calling us with nbox = 0.
2008-11-17 10:24:39 +10:00
Jeremy Huddleston
03f7a66a1a
XQuartz: Don't use TIS on Tiger...
...
(cherry picked from commit be8ac84c15
)
2008-11-15 19:52:52 -08:00
Jeremy Huddleston
e8112784e8
XQuartz: Integrated xpbproxy into the server.
...
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 4294493632
)
2008-11-15 19:52:34 -08:00
Michel Dänzer
24928b85dc
DRI2: Don't crash in DRI2ClipNotify when DRI2DrawablePtr is NULL.
2008-11-15 13:28:53 +01:00
Michel Dänzer
e5271c3747
Set libdrm flags correctly even when only DRI2 is enabled.
2008-11-15 13:27:42 +01:00
Jeremy Huddleston
bc4f804cd8
XQuartz: Actually add glcontextmodes.[hc]
...
(cherry picked from commit 763195d338
)
2008-11-14 15:13:59 -08:00
Ben Byer
aedafbea0e
fix compilation on systems that don't have
...
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2
)
2008-11-14 15:11:42 -08:00
Jeremy Huddleston
b078936571
XQuartz: Initial work on readding GLX to the 1.5 server
...
(cherry picked from commit a186cab6ae
)
2008-11-14 15:10:32 -08:00
Jeremy Huddleston
1d7049f8fd
Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
...
(cherry picked from commit 7dff93ec1a
)
2008-11-14 11:10:24 -08:00
Jeremy Huddleston
3c12483264
XQuartz: Made X11Application.m a little more tidy.
...
(cherry picked from commit 3520386261
)
2008-11-14 11:10:15 -08:00
Jeremy Huddleston
e917806fc5
os/connection: TRANS_NOXAUTH bit comparison brainfart fix.
...
https://bugs.freedesktop.org/show_bug.cgi?id=18524
2008-11-14 10:57:22 -08:00
Fernando Carrijo
17bccff4ce
[dix] Remove a duplicate statement.
...
Signed-off-by: James Cloos <cloos@jhcloos.com>
2008-11-14 12:36:20 -05:00
Alex Deucher
ba4e08244e
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/./xserver
2008-11-13 15:04:18 -05:00