Commit Graph

5001 Commits

Author SHA1 Message Date
Adam Jackson
f250352d2e Bug #11508: Fix build without XV.
(cherry picked from commit 87bfd3bd96)
2008-03-24 13:34:30 -04:00
Adam Jackson
fdf927c2cd Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
(cherry picked from commit 536f2ff538)
2008-03-24 12:24:38 -04:00
Julien Cristau
80968c4a91 xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't return the option's value, just whether it's present
in the configuration.
(cherry picked from commit 4217ba0cf0)
2008-03-24 10:22:41 -04:00
Julien Cristau
f40bd686e5 exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration.  So using Option "EXANoComposite" "false"
disabled composite acceleration.
(cherry picked from commit 6b9d2bb1f7)
2008-03-24 10:22:37 -04:00
Michel Dänzer
84a27f7a92 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
(cherry picked from commit da973e962d)
2008-03-24 10:20:14 -04:00
Alan Coopersmith
a65e9722c4 Make Xevie private symbol names less generic
Makes it easier to figure out what you're seeing in the stack trace
instead of wondering where in the server "ProcSend" is.
(cherry picked from commit 060a99444e)
2008-03-24 10:20:03 -04:00
Alan Coopersmith
0aa3b971b4 Xevie cleanups, byteswapping fixes & request length check fixes
(cherry picked from commit f37046984d)
2008-03-24 10:19:39 -04:00
Dodji Seketeli
21dc186245 [Xephyr/DRI] correctly route motion events targeted at GL drawable
(cherry picked from commit cdadd2ff9b)
2008-03-24 10:18:52 -04:00
Jesse Barnes
4f0755d6d4 Fail CRTC configuration if !vtSema
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash.  So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.

Fixes #14444.
(cherry picked from commit bee2ddf35f)
2008-03-24 10:09:23 -04:00
Matthieu Herrb
727e22c830 test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
(cherry picked from commit db248ffb84)
2008-03-24 10:09:09 -04:00
Donnie Berkholz
a399b77e8f Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
(cherry picked from commit aa231f28d5)
2008-03-24 10:08:47 -04:00
Donnie Berkholz
c81a8c3eac Xephyr: Distribute ephyrdriext.h in tarballs.
(cherry picked from commit a955c3b587)
2008-03-24 10:08:40 -04:00
Daniel Stone
6b75b44d9e XkbCopyKeymap: Fix broken indentation
An astute observer will note that the entirety of XkbCopyKeymap is indented
with spaces, and no tabs whatsoever, and not commit changes which break the
otherwise consistent indentation.
A non-astute observer will note the breakage when the commit mail comes
through with clearly broken indentation.
A polite, non-astute, observer will then fix it.

C'est la vie.
(cherry picked from commit 090b26db76)
2008-03-24 10:08:30 -04:00
Jeremy Huddleston
76bb92a960 XQuartz: Disable 256 color option and fullscreen option
(cherry picked from commit 7c1964338a)
2008-03-21 19:35:25 -07:00
Jeremy Huddleston
3e656752a5 Xquartz: Added separate preference tab for quartz-wm settings
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7)
2008-03-21 19:35:21 -07:00
Jeremy Huddleston
b0e84dd16c XQuartz: Initial framework for dealing with spaces on OS-X
(cherry picked from commit 9831324998)
2008-03-21 19:35:17 -07:00
Eamon Walsh
98249dfa98 XSELinux: Do a check for whether background "None" is allowed.
(cherry picked from commit 3bbd77ff98)
2008-03-20 21:34:42 -04:00
Eamon Walsh
d08bb7040c XSELinux: Correctly handle some permission bits that are used more than once.
(cherry picked from commit e323bb426c)
2008-03-20 21:34:31 -04:00
Eamon Walsh
c6ac4d4f4d Apply __glXDisp_GetVisualConfigs message patch
From http://bugs.freedesktop.org/show_bug.cgi?id=13863

Problem was that the glxcmds.c __glXDisp_GetVisualConfigs
function left garbage in the tail end of the message used for extensions.
(cherry picked from commit edad0a9dfe)
2008-03-18 18:06:37 -04:00
Jeremy Huddleston
8bc58eb960 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
(cherry picked from commit f03202ad15)
2008-03-18 00:11:06 -07:00
Jeremy Huddleston
851b16fd82 Apple: Xserver half of the Exposé bug-fix (requires updated libXplugin from Apple... coming with 2.2)
(cherry picked from commit 37be23e8c1)
2008-03-18 00:10:16 -07:00
Adam Jackson
4a61cf3b08 Fix a stray use of ALLOCATE_LOCAL.
(cherry picked from commit 57d48d94b8)
2008-03-14 14:46:34 -04:00
Adam Jackson
43739b9a32 RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor.  But let's not
split hairs.
(cherry picked from commit 8248537722)
2008-03-14 14:25:27 -04:00
Bart Trojanowski
92cffb8cc2 Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to.  However, we would ignore that and always send the
cycle to the device whose BIOS we were running.  This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
2008-03-14 14:10:22 -04:00
Doug Chapman
db26f32d0d Bug #14091: Fix build (and runtime) on ia64. 2008-03-14 14:10:11 -04:00
Adam Jackson
95f6d8822d RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
2008-03-14 14:10:06 -04:00
Adam Jackson
e4dee1626d RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it.  So do the drivers, for that
matter.
2008-03-14 14:09:57 -04:00
Mark Kettenis
ce70eb1fe3 OpenBSD support for libpciaccess.
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once.  I implemented pci_system_init_dev_mem() like Ian
suggested.  This requires some minor changes to the BSD-specific
os-support code.  Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
2008-03-14 14:09:45 -04:00
Kristian Høgsberg
b02d11e629 DRI2: Add DRI2AuthConnection().
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
2008-03-14 14:08:12 -04:00
Keith Packard
54c31572d5 XkbCopyKeymap was mangling doodads and overlays 2008-03-14 14:03:47 -04:00
Kristian Høgsberg
02feb14a67 GLX: Track changes to DRI_TEX_BUFFER extension.
We now just pass in the __DRIdrawable.
(cherry picked from commit 01c2e01f2a)
2008-03-10 18:18:17 -04:00
Kristian Høgsberg
12829f1e91 DRI2: Return event buffer head index in DRI2CreateDrawable.
And pass it to the DRI driver in AIGLX.
(cherry picked from commit acedc03367)
2008-03-10 18:18:14 -04:00
Kristian Høgsberg
4aaf048b5a Fix DRI2 texture target for GLX_EXT_texture_from_pixmap.
Thanks to Dennis Kasprzyk for pointing it out and for reminding me to
commit it.
(cherry picked from commit 9abaad115c)
2008-03-10 18:18:11 -04:00
Adam Jackson
921cbc5803 Add the "amd" driver to magic driver selection. 2008-03-10 13:40:23 -04:00
Adam Jackson
e5bd75e11f Bug #14927: Fix the math for xf86NumDefaultModes.
(cherry picked from commit 0f6aaf636b)
2008-03-10 09:14:38 -04:00
Adam Jackson
ef702d5866 Size xf86DefaultModes explicitly.
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now.  Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
2008-03-07 09:25:34 -05:00
Adam Jackson
b260febcec Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
(cherry picked from commit 3fcb6445dc)
2008-03-07 08:31:40 -05:00
Adam Jackson
375908557f xserver 1.4.99.901 2008-03-06 00:19:09 -05:00
Adam Jackson
2a47accff8 Fix distcheck. 2008-03-05 23:56:49 -05:00
Eamon Walsh
9de621afee xselinux: Implement polyinstantiation support and related protocol.
(cherry picked from commit d4101140f4)
2008-03-04 22:42:53 -05:00
Adam Jackson
e4d92a13e8 Make xf86InitialConfiguration slightly smarter.
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree.  This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.

New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
  - with the same aspect ratio as all outputs (may be NULL)
  - with 4:3 aspect ratio
- Then the old heuristic to try to get something lit

Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together.  It's far too easy to
end up with displays that simply don't have modes in common.  We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
(cherry picked from commit 27e7dacbf7)
2008-03-04 13:01:15 -05:00
Adam Jackson
5afdba241e Remove all mention of the vga driver from the config logic.
(cherry picked from commit 95df04b744)
2008-03-04 13:01:03 -05:00
Eamon Walsh
926f32df3c XACE: Check the return value of the selection create hook call.
(cherry picked from commit 056a2ce02c)
2008-03-04 02:46:20 -05:00
Eamon Walsh
7f74ba1b77 dix: Convert selection list to a linked list.
Fixes a bug where pointers were being invalidated after a realloc.
(cherry picked from commit 72f2197545)
2008-03-04 02:17:13 -05:00
Daniel Stone
1bda57a41e XKB: Fix initial map setting on startup
Due to an unwitting sense inversion when eliminating XkbFileInfo, we were
setting the complete wrong keymap on startup (non-XKB map if we had an XKB
map available, or the XKB map if we didn't have any available).  Invert the
sense properly, and add two small bits that also went missing in that commit.
(cherry picked from commit 0bd0f90d7c)
2008-03-03 23:23:22 -05:00
Adam Jackson
5d2946655b RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
2008-03-03 15:52:50 -05:00
Adam Jackson
28c156e2ba Fix Motif menu drawing in Xnest.
See also Red Hat bug #229350, OpenSolaris bug #6366490.
2008-03-03 15:52:42 -05:00
Adam Jackson
71037ebfb4 xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
2008-03-03 15:52:32 -05:00
Adam Jackson
a9028a492f Branch for 1.5. 2008-03-03 15:04:49 -05:00
David Nusinow
f7ab2d3821 Add missing file from previous commit. 2008-03-02 18:36:25 -05:00