Peter Hutterer
38bf01bd1c
Merge branch 'master' into mpx
2008-01-10 13:38:46 +10:30
Peter Harris
0883e838e2
xf86misc.c: Avoid use of swapped values
2008-01-09 18:43:55 -08:00
Alan Coopersmith
59a63d72a1
Fix reference to old versions of XFree86 to not say "Xorg 4.2 or earlier"
2008-01-09 18:42:58 -08:00
Richard Purdie
c31aead0fe
[Kdrive] make XCalibrate 'orientation aware'
2008-01-08 12:31:47 +01:00
David Nusinow
30375cd6d1
Don't log DPMS enabling as being from xorg.conf if it's not
2008-01-07 20:57:30 -05:00
David Nusinow
260505e3c5
Log enabling of DPMS even when it's not set in xorg.conf
2008-01-06 16:37:13 -05:00
Julien Cristau
7e76221659
Fix the name of the XFree86-Misc extension in the xorg.conf manpage.
2008-01-06 18:23:09 +01:00
Julien Cristau
59df687835
Document the AllowEmptyInput, AutoAddDevices and AutoEnableDevices flags
...
Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
2008-01-06 17:02:03 +01:00
Jeremy Huddleston
7d226d6a25
XQuartz: Cleanup for strict-prototyping
...
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4be
)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston
11967dce11
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 23:10:10 -08:00
Jeremy Huddleston
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42
)
2008-01-04 23:10:10 -08:00
Alex Deucher
20eb26f9d1
Fix potential crasher in xf86CrtcRotate()
...
xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
2008-01-03 22:53:36 -05:00
Jeremy Huddleston
e46d559739
XQuartz: Cleaned up color map configuration.
...
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27
)
2008-01-03 13:25:56 -08:00
Peter Hutterer
8da83836b6
Merge branch 'master' into mpx
...
Conflicts:
XTrap/xtrapddmi.c
Xext/security.c
Xext/xprint.c
Xext/xtest.c
Xext/xvdisp.c
Xi/exevents.c
Xi/grabdevb.c
Xi/grabdevk.c
Xi/opendev.c
Xi/ungrdev.c
Xi/ungrdevb.c
Xi/ungrdevk.c
dix/cursor.c
dix/devices.c
dix/dixutils.c
dix/events.c
dix/getevents.c
dix/main.c
dix/window.c
hw/xfree86/ramdac/xf86Cursor.c
include/dix.h
include/input.h
include/inputstr.h
mi/midispcur.c
mi/miinitext.c
mi/misprite.c
render/animcur.c
xfixes/cursor.c
xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
Alan Coopersmith
ccf6636d2c
Kill xf86getpagesize even harder (dummylib & ioport)
2008-01-02 19:28:33 -08:00
Alan Coopersmith
f6666dcc3b
Add dixAllocatePrivate stub to dummylib for utils
...
Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
2008-01-02 19:19:55 -08:00
Alan Coopersmith
73f4229960
Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros
2008-01-02 19:17:54 -08:00
Adam Jackson
85365ddf16
EDID 1.4: If given a native pixel format, use it when inferring virtual.
2007-12-28 17:38:52 -05:00
Adam Jackson
312b30cb03
EDID 1.4: First detailed mode is always preferred.
...
... so act like it in the modelist generator, not just the parser.
2007-12-28 17:38:51 -05:00
Jurij Smakov
36ff05771b
GL: Add GLX compile flags lost in modular X server changes
...
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64. This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.
Also, Alpha needs to pass -mieee to the compiler as well.
This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever. To the best of my
knowledge the patch was written by Jurij Smakov. See Debian bug
number #388125 .
I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392 .
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-29 00:00:04 +02:00
Adam Jackson
bae459cfc4
Don't carp on EDID 1.4 blocks anymore.
...
Also whine more loudly when we get something other than 1.x.
2007-12-28 16:53:17 -05:00
Adam Jackson
70b2d6cfeb
Check the gamma value, not its address.
2007-12-28 16:53:17 -05:00
Adam Jackson
592d814ee0
EDID 1.4: Additional semantics for display feature bits.
...
First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format. The
old "is GTF" bit now means "is continuous-frequency" instead.
Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
2007-12-28 16:53:17 -05:00
Adam Jackson
322d0103ae
EDID 1.4: Alternate color encodings for digital inputs.
...
Section 3.6.4, Table 3.14: Feature support.
2007-12-28 16:53:17 -05:00
Adam Jackson
f1f43caf7e
EDID 1.4: Allow for gamma definition in extension blocks.
...
Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
2007-12-28 16:53:16 -05:00
Adam Jackson
861ee38817
EDID 1.4: Additional aspect ratio semantics for screen size fields.
...
Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
2007-12-28 16:53:16 -05:00
Adam Jackson
14b5c8a447
EDID 1.4: Extended support for digital interfaces.
...
Section 3.6.1, Table 3.11: Video Input Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
a948216dcc
EDID 1.4: Decode CVT 3-byte codes and add them to the mode pool.
...
Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
2007-12-28 16:53:16 -05:00
Adam Jackson
f6df66cc89
EDID 1.4: Trivial support for new detailed sections.
...
Nothing actually decoded yet, but at least we print what they are.
New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
2007-12-28 16:53:16 -05:00
Adam Jackson
bac3ecde39
EDID 1.4: Allow for sync range offsets.
...
Table 3.26: Display Range Limits & Timing Descriptor Block Definition
2007-12-28 16:53:16 -05:00
Eamon Walsh
643c52be32
xselinux: Remove "X" prefix on remaining functions and strings.
...
Should be evident from the context.
2007-12-28 13:27:28 -05:00
Adam Jackson
938da5ee38
Add HDMI and DisplayPort connector types.
2007-12-28 12:23:44 -05:00
Daniel Stone
941058f8da
KDrive: Xephyr: Don't leak screen damage structure
2007-12-28 15:51:36 +02:00
David S. Miller
ae869fc766
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
...
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-27 07:34:09 +01:00
Jeremy Huddleston
beb29c605b
XQuartz: *REALLY* use CFStringCreateWithCString
...
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc64
)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14
)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91
)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fed
)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb
)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston
603a8b73d4
XQuartz: Cleaned up command line arguments.
2007-12-20 18:29:57 -08:00
Jeremy Huddleston
4cf3002b60
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299
)
2007-12-20 18:09:24 -08:00
Jeremy Huddleston
1f74bef1ad
XQuartz: Don't fork to exec app_to_run.
...
Plus other housecleaning...
(cherry picked from commit ae302db472
)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543
)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
42802a8e6b
Xquartz: General Cleanup
...
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4
)
2007-12-20 13:18:17 -08:00
Dave Airlie
7ef7727b80
entity sharing: make !shareable entity non-fatal.
...
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
2007-12-20 10:11:26 +10:00
Adam Jackson
7721d3e921
Reference cvt and gtf in the xorg.conf man page.
2007-12-18 19:14:26 -05:00
Jeremy Huddleston
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9d
)
2007-12-16 01:14:55 -08:00
Samuel Thibault
58c2898b62
xfree86: permit access to io port 0xffff on the hurd
2007-12-16 01:21:45 +01:00
Ben Byer
a3f7f7b60e
clarified debug message to indicate that we're sleeping
...
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf
)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7
)
2007-12-14 15:22:49 -08:00