Peter Hutterer
e5e531ce96
Merge branch 'master' into mpx
...
Conflicts:
dix/events.c
2008-01-31 16:36:17 +10:30
Benjamin Tissoires
6c38682084
kdrive: AddInputClient takes a ClientPtr.
2008-01-31 15:51:32 +10:30
Coleman Kane
df325be394
Bug 13101: xorg-server has a typo in hw/xfree86/os-support/bsd/i386_video.c
...
X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101 >
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360 >
2008-01-29 09:48:00 -08:00
Julien Goodwin
94f412cb7e
Loader: Fix verbosity confusion
...
'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
2008-01-29 14:46:15 +11:00
Julien Goodwin
442838fcb3
xorg.conf.man: Fix monitor/output confusion in monitor positioning
...
On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names. Fix nomenclature in xorg.conf.man.
2008-01-29 14:46:15 +11:00
Peter Hutterer
5b8641a5fd
xfree86: fix AlwaysCore handling. (Bug #14256 )
...
Assume AlwaysCore being set by default, just like the other options.
X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256 >
2008-01-29 10:01:42 +10:30
Peter Hutterer
0ac1755977
Merge branch 'master' into mpx
...
Conflicts:
Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
Eamon Walsh
e915a26397
xselinux: Move the extension to extmod instead of being built-in.
2008-01-25 19:22:19 -05:00
Eamon Walsh
f6a78ee143
XACE: Remove the extension code entirely, XACE is completely static now.
2008-01-25 18:04:10 -05:00
Hong Liu
734e115871
Bug #12439 : add a quirk to use +hsync +vsync for the probed detailed mode.
...
Samsung 205BW quirk is somehow reworked.
2008-01-23 21:24:09 +08:00
Adam Jackson
cc22b05ea0
There is no such thing as /dev/cpu/mtrr.
2008-01-22 18:57:11 -05:00
Peter Hutterer
ba315ae5dd
Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)
...
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
2008-01-21 23:44:07 +10:30
Peter Hutterer
883811c2be
dix: remove inputInfo.pointer reference in TryClientEvents.
...
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
2008-01-18 18:48:46 +10:30
Jeremy Huddleston
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1
)
2008-01-17 09:49:25 -08:00
Matthieu Herrb
bbde5b62a1
Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index
2008-01-17 15:26:41 +01:00
Daniel Stone
e85130c85f
Xephyr: One-time keyboard leak fix
...
Don't leak the originally-allocated keysym map.
2008-01-17 18:43:06 +11:00
Tiago Vignatti
7a0d16ef0a
Removed some warnings.
2008-01-15 03:27:16 -02:00
Tiago Vignatti
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
Dave Airlie
1f83f40525
xf86Cursors: fix memset for non-square cursors
2008-01-15 10:21:17 +10:00
Jeremy Huddleston
180a5aba4d
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6
)
2008-01-12 21:34:09 -08:00
Jeremy Huddleston
6fd4a5e2e4
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f216314448
)
2008-01-12 12:02:01 -08:00
Jeremy Huddleston
f72255639c
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce
)
2008-01-12 12:01:57 -08:00
Jeremy Huddleston
ec24a6b5aa
XQuartz: Fixed switching into XQuartz via expose.
...
(cherry picked from commit 627ed60ce5
)
2008-01-12 12:01:52 -08:00
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