Commit Graph

2864 Commits

Author SHA1 Message Date
Jeremy Huddleston
e5d4970d4d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-07-11 10:12:55 -07:00
Jeremy Huddleston
fe27bba853 XQuartz: Use CFEqual to compare keyboards
(cherry picked from commit 5538e43b9a)
2008-07-11 10:04:08 -07:00
Jeremy Huddleston
0c262e96b0 XQuartz: More fd handoff cleanup.
(cherry picked from commit 199d2dcb70)
2008-07-11 10:04:01 -07:00
Jeremy Huddleston
73f41f38c5 XQuartz: Some fd handoff cleanup.
(cherry picked from commit 9c20a4804d)
2008-07-11 10:03:53 -07:00
Jeremy Huddleston
7bfdc4bd34 XQuartz: Remove deprecated keyboard code.
(cherry picked from commit 69cfc1a21e)
2008-07-11 10:03:41 -07:00
Jeremy Huddleston
f7b8efa23d XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88)
2008-07-11 10:03:17 -07:00
Jeremy Huddleston
9025097f06 Xquartz: Removed include directive for removed header
(cherry picked from commit e65a36d57f)
2008-07-11 10:03:09 -07:00
Sascha Hlusiak
c30f36c8c1 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway.

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 21:42:10 +02:00
Dave Airlie
793ff6754e modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
(cherry picked from commit 1771edcb44)
2008-07-03 19:01:44 +10:00
Dave Airlie
e9f83740e3 cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
2008-07-03 18:46:38 +10:00
Adam Jackson
a18551cad1 Fix GLX in Xvfb and kdrive.
(cherry picked from commit 689292e58c)
2008-07-02 11:26:10 -04:00
Julien Cristau
81e6ab4851 autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
(cherry picked from commit fbad87f2ae)
2008-07-01 13:27:54 -04:00
Aaron Plattner
75b5e999f0 Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.

With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode.  The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes.  Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.

This change works around this problem by ignoring the DIX and querying the real
size from the driver.
(cherry picked from commit 2e8daee053)
2008-07-01 09:08:36 -07:00
Adam Jackson
9ab88bb9b1 Don't try to load DRI2 if built without it.
(cherry picked from commit e2bbf2d248)
2008-07-01 12:02:18 -04:00
Adam Jackson
bee463bd8a XInput ABI is 2.1, not 3.1.
(cherry picked from commit 76576c87b0)
2008-06-30 16:11:04 -04:00
Adam Jackson
6ec12077ef Distcheck fixes. 2008-06-30 11:17:53 -04:00
Adam Jackson
6e8ed1398d Bump ABI minor numbers for the devPrivate ABI functions.
(cherry picked from commit 211e2bdcc6)
2008-06-30 10:31:55 -04:00
George Sapountzis
90f2a82ba5 glx: fix forgotten swrast -> SWRast
(cherry picked from commit 21a8052fdc)
2008-06-26 16:14:52 -04:00
George Sapountzis
6e278e3944 glx: missing swrast is fatal
(cherry picked from commit 877e6c35ff)
2008-06-26 16:14:52 -04:00
George Sapountzis
6f18c5d703 kdrive: need not export symbols for glx anymore
(cherry picked from commit ae0504d34d)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
cb402b4112 Move the windows GL files to the xwin DDX.
(cherry picked from commit a8a9b40e55)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
0234d3d48f Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi.  There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.

The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.

The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
(cherry picked from commit e5aad4bc08)
2008-06-26 16:14:51 -04:00
Dan Nicholson
d3a2e060bf Fix up paths for GL/glx -> glx renaming
(cherry picked from commit c76fddeea2)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
d325a207c8 Use LD_EXPORT_SYMBOLS_FLAG when linking Xnest.
(cherry picked from commit f558c7d4d1)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
bd81faff8c Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
(cherry picked from commit 77ff8fd507)
2008-06-26 16:14:51 -04:00
Jeremy Huddleston
d88da6638e Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
(cherry picked from commit d09c520b32)
2008-06-26 16:14:51 -04:00
George Sapountzis
988b1b8df3 Add loader for the swrast dri driver.
(cherry picked from commit 6ff6465931)
2008-06-26 16:14:51 -04:00
George Sapountzis
1efc0329b1 glcore: drop GLcore (files)
(cherry picked from commit a88c6b6646)
2008-06-26 16:14:50 -04:00
George Sapountzis
9b4d5b6521 glcore: drop GLcore (build system)
(cherry picked from commit dd7a53f8f2)
2008-06-26 16:14:50 -04:00
George Sapountzis
1ea2e69cfc glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
(cherry picked from commit 567d389d47)
2008-06-26 16:14:50 -04:00
Donnie Berkholz
f2c30a57e3 glcore: prepare for dynamic loading
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
        DLOPEN_LIBS - to dlopen the glcore dso
        LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use

the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
(cherry picked from commit efb723e166)

Conflicts:

	configure.ac
2008-06-26 16:14:50 -04:00
Adam Jackson
429b2a97a0 Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
(cherry picked from commit 9e5b3deafb)
2008-06-24 14:10:12 -04:00
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07:00
Paul Bender
2334ff9bb2 Bug #15665: Fix building without Composite.
(cherry picked from commit 4c4e06af79)
2008-06-24 10:45:16 -04:00
Adam Jackson
85e598cc62 Remove some default modes that really shouldn't be in the default set.
(cherry picked from commit 59510a7643)
2008-06-24 10:41:27 -04:00
Alan Coopersmith
dfb326790e Restore return type on xf86SetScrnInfoModes
Seems to have been accidentally lost by commit 	76943fec86
(cherry picked from 925e895b86 commit)
2008-06-23 19:32:01 -07:00
Jesse Ruffin
4c8a84acf5 Bug #16302: Fix GLX drawable refcounting in DMX.
(cherry picked from commit 3b58782692)
2008-06-23 14:35:46 -04:00
Adam Jackson
89d73d7595 Implement bswap in x86emu.
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
(cherry picked from commit c8d066a151)
2008-06-23 14:01:15 -04:00
Matthieu Herrb
b0df9a6a42 preserve errno around the SIGIO handler
(cherry picked from commit 19c7e9da55)
2008-06-20 13:36:16 -04:00
Adam Jackson
7822a3d05f XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
a proper solution someday, but then, those bugs aren't closed yet either.
2008-06-17 16:10:51 -04:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
2008-06-17 10:48:41 -04:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
2008-06-13 16:45:08 -04:00
Dave Airlie
21248705bb modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
2008-06-12 14:54:56 +10:00
Julien Cristau
53a84d75c6 xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e)
2008-06-12 10:01:41 +10:00
Jeremy Huddleston
0ab483f74e XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00)
2008-06-10 10:51:49 -07:00
Jeremy Huddleston
be616f0f8f XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
(cherry picked from commit 4505bae5d7)
2008-06-10 10:51:40 -07:00
Jeremy Huddleston
8e3a85beb9 XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
(cherry picked from commit ee92aced10)
2008-06-10 01:45:57 -07:00
Jeremy Huddleston
a58487db23 XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
(cherry picked from commit d8cf5623fa)
2008-06-10 01:45:50 -07:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
2008-06-09 14:09:39 -04:00