Commit Graph

1221 Commits

Author SHA1 Message Date
Jeremy Huddleston
c51545729f Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-08-05 12:44:56 -07:00
Alex Deucher
ff49f5944d 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-07-29 18:40:44 -07:00
Peter Hutterer
b50932d998 Revert "xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled."
This reverts commit 153c6d48c6.

How did this one end up on the branch? Sure as hell wasn't supposed to be
pushed.
2008-07-29 13:14:49 +09:30
Peter Hutterer
153c6d48c6 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 (written by Sasha Hlusiak).

Resurrect checkInput() and check for devices there if AEI is false (this also
creates the default devices if required).

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
(cherry picked from commit bea743f3d629bafdc301f40e9c0bc11382dfe8bc)

Conflicts:

	hw/xfree86/common/xf86Config.c
	hw/xfree86/doc/man/xorg.conf.man.pre
2008-07-03 15:05:14 +09:30
Jeremy Huddleston
632ea62166 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-05-17 14:55:57 -07:00
Mart Raudsepp
4e5cf76eca xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
(cherry picked from commit ab9b0b36ac)
(cherry picked from commit 4fa89fbe18)
... and backported to 1.4 (back to no new devprivates and "amd" driver name)
2008-05-16 20:16:57 +03:00
Adam Jackson
a08f848d4c Bump DEFAULT_DPI to 96.
75 is just nonsense.
(cherry picked from commit db9ae86353)
2008-05-16 17:26:53 +03:00
Michel Dänzer
2621380cf6 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-05-16 17:20:08 +03:00
Jeremy Huddleston
97b5174182 Merge commit 'origin/server-1.4-branch' into xorg-server-1.4-apple 2008-04-30 16:25:25 -07:00
Peter Hutterer
ff4006bd5a 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>
(cherry picked from commit 5b8641a5fd)
2008-04-30 12:53:38 +02:00
Jeremy Huddleston
06e49b9aa7 Fixed mode, so we could make dist 2008-04-18 01:23:34 -07:00
Jeremy C. Reed
76b950cd6e Add some more support for DragonFly. From Joerg Sonnenberger
and pkgsrc.
(cherry picked from commit 1d4bea6106)
2008-04-07 14:10:01 +03:00
Maarten Maathuis
dc30ade649 Fix rotation for multi-monitor situation.
- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
(cherry picked from commit a48cc88ea2)
2008-02-19 21:58:26 +02:00
Matthieu Herrb
59a3b83922 Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index 2008-01-17 17:00:06 +01:00
Hong Liu
41f735fbe0 bgPixel (unsigned long) is 64-bit on x86_64, so -1 != 0xffffffff
This patch should fix bug 8080.
(cherry picked from commit 9adea80703)
2007-12-13 00:00:27 +02:00
Hong Liu
f4bcb53e86 Bug 13308: Verify and reject obviously broken modes.
(cherry picked from commit c6cfcd408d)
2007-12-12 23:59:54 +02:00
Daniel Stone
d37351308b XKB: Actions: Don't run certain actions on the core keyboard
Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state.  If we get an action such as VT
switch, just swallow the event.
(cherry picked from commit 320abd7d1d)
2007-12-06 00:30:02 +00:00
Daniel Stone
b3de1b9d37 XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
(cherry picked from commit 6d59bb5709)
2007-11-17 22:06:49 +01:00
Matthias Hopf
f350c81a91 Prefer configured DisplaySize to probed DDC data, if available.
Based on patch by Hong Liu <hong.liu@intel.com>.
(cherry picked from commit 48ca5961ca)
2007-11-06 14:53:42 +00:00
Keith Packard
c550186570 Screen size changing should leave FB alone when X is inactive.
xf86RandR12ScreenSetSize must protect calls to EnableDisableFBAccess with
suitable vtSema checks to avoid invoking driver code while the X server is
inactive.
(cherry picked from commit 265a633cf1)
2007-11-06 14:53:03 +00:00
Mark Vytlacil
ab80b27250 XFree86: Input: Save/restore errno around SIGIO (bug #10683)
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
(cherry picked from commit 41c3069f7c)
2007-11-04 16:46:34 +00:00
Peter Hutterer
84040b655e xfree86: wrap keyboard devices for XKB.
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.

Note that the VCK is still not wrapped, so core events will bypass XKB.

(cherry picked from commit d627061b48)
(cherry picked from commit 8ead41388e)
2007-10-30 00:59:17 +02:00
Daniel Stone
b76b1d51fe XFree86: Remove ridiculous SIGIO debugging
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN

... not so much.
(cherry picked from commit 493b83bd09)
2007-10-30 00:58:19 +02:00
Daniel Stone
bd779f8cde configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.

(cherry picked from commit df57ae1639)
2007-10-30 00:57:49 +02:00
Daniel Stone
f73fd98a86 Fix key repeats during VT switch.
Add keyc->postdown, which represents the key state as of the last mieqEnqueue
call, and use it when we need to know the posted state, instead of the
processed state (keyc->down).  Add small functions to getevents.c to query and
modify key state in postdown and use them all through, eliminating previously
broken uses.
(cherry picked from commit 81c28ffd2b)
2007-09-05 17:47:50 -07:00
Keith Packard
3c5fe1ec37 Deliver correct event when releasing keys on VT switch.
In commit 41bb9fce47, the event delivery loop
for Xinput enabled keyboards was changed and accidentally used the wrong
index variable, causing random events to be delivered when returning from VT
switch.

In addition, in commit aeba855b07,
SIGIO was blocked during delivery of these events, but not for the entire
period the xf86Events array was being used. Block SIGIO for the whole loop
to avoid other event delivery from trashing the key release events.
(cherry picked from commit aa7ed1f5f3)
(cherry picked from commit accd71bda6)
2007-09-05 14:59:16 -07:00
Eric Anholt
70ed110538 Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.

(cherry picked from commit 47300ed2be)
2007-09-05 13:31:50 -07:00
Alan Hourihane
b328d55372 Allow yres_virtual to be greater for some kernel fbdev drivers.
(temporary fix for older fbdev drivers)
(cherry picked from commit 87495fc706)
2007-09-04 17:44:17 -07:00
Egbert Eich
bcd6708895 Fixing a misleading comment which could suggest a GPL violation.
The author of the int10 code looked at the VBIOS POSTing code
in DOSEMU to get some initial idea on how to POST a VBIOS.
To give credit to the DOSEMU Team for this inspiration a comment
was added to the code which could suggest that code from the
GPLed DOSEMU was directly incorporated into this code.
This patch should clearify the situation.
(cherry picked from commit 1d11e4bc4c)
2007-08-30 11:20:40 -07:00
Alex Deucher
5182fbf302 Add _X_EXPORT to exported functions in hw/xfree86/modes/*
Also add missing exports to hw/xfree86/loader/xf86sym.c
(cherry picked from commit 81f8b652d9)
2007-08-29 16:48:52 -07:00
Dave Airlie
d34b66402c randr: fixup crtc and output destroy
if you are moving pointers, you want to move the pointers not just a byte
(cherry picked from commit 76bf3cd7b8)
2007-08-23 12:22:56 -07:00
Keith Packard
efac9c9c2e Ref count cursors used in hw/xfree86/modes code.
The multi-crtc cursor code in hw/xfree86/modes holds a reference to the
current cursor. This reference must be correctly ref counted so the cursor
is not freed out from underneath this code.
(cherry picked from commit 7dc8531548)
2007-08-23 12:22:35 -07:00
Alex Deucher
248b220b3e add xf86_crtc_clip_video_helper to xf86sym.c
(cherry picked from commit 1f6ddae003)
2007-08-23 12:22:17 -07:00
Alex Deucher
242c05e326 move intel crtc xv clipping helper to the xserver
The code is generic and can be used by any overlay-based card when
adding randr 1.2 support.  Tested on radeon.
(cherry picked from commit 53c04351c4)
2007-08-23 12:22:14 -07:00
Julien Cristau
fd4dc5a98e xfree86: Fix build on Linux/alpha.
A bunch of CFLAGS had gone missing, so the build failed with errors like:
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
(cherry picked from commit a1fe36b772)
2007-08-21 00:27:21 +02:00
Alan Coopersmith
026534f945 Update pci.ids to 2007-08-15 snapshot
Remove nvidia ids in extrapci.ids that are now in pci.ids
2007-08-15 16:47:53 -07:00
Samuel Thibault
03f9da6724 xfree86: Improve default mouse handling on the Hurd
Make /dev/mouse the default device.  This makes Xorg works with empty
or missing InputDevice sections.
2007-08-12 03:08:49 +02:00
Eric Anholt
ff4bd3addb Fix the swapped decode of the EDID DTD h/v sync polarity fields.
As a result, we can remove the quirks that existed to flip the bits back around
for us.  This is not confirmed in all cases due to lack of bugs containing EDID
blocks associated with the quirks, but is likely true.
2007-08-08 14:39:27 -07:00
Gustavo Pichorim Boiko
2926cf1da7 [PATCH] Allocate the right number of entries for saving crtcs 2007-08-08 12:31:11 -07:00
Roland "Test-tools" Bär
f6aa2200f2 Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c
X.Org Bug #11858 <http://bugs.freedesktop.org/show_bug.cgi?id=11858>
Patch #11005 <http://bugs.freedesktop.org/attachment.cgi?id=11005>
2007-08-06 12:37:52 -07:00
Dave Airlie
e717eb82dc xserver: stop bcopy from going really slow
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.

Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.

This gives me ~20% speed up on startup on 945 hardware.
2007-08-05 09:51:36 +10:00
Arkadiusz Miskiewicz
f3955c0a02 XFree86: xf1bpp: distclean generated files as well
Make sure we clean up after ourselves: not sure why distcheck didn't flag
this one.
2007-08-01 21:05:04 +03:00
Daniel Stone
43e71a5450 XFree86: xf1bpp: Fix previous build system commit
Amateur error.
2007-08-01 08:16:35 +03:00
Daniel Stone
505ec436af XFree86: Properly clean up after ourselves
CLEAN is not a useful variable.  CLEANFILES/DISTCLEANFILES, on the other hand,
are useful variables.
2007-08-01 08:11:08 +03:00
Daniel Drake
cacbdf18ee Remove duplicated licenses
Some files had two copies of the same license.
2007-08-01 08:08:37 +03:00
Arkadiusz Miskiewicz
7fa5838572 XFree86: xf1bpp: Fix parallel build
One of the constructs wasn't parallel-build safe: fix that.
2007-08-01 08:01:28 +03:00
Daniel Stone
0e0174d45e XFree86: Allow disabling of HAL
If NoAutoAddDevices is given as a server flag, then no devices will be added
from HAL events at all.  If NoAutoEnableDevices is given, then the devices will
be added (and the DevicePresenceNotify sent), but not enabled, thus leaving
policy up to the client.
2007-08-01 03:33:06 +03:00
Daniel Stone
cd8e99e56e Input: Don't enable devices when we open them
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them.  Hurrah.
2007-08-01 03:33:06 +03:00
Daniel Stone
89f628394f XFree86: Input: Fix whitespace 2007-08-01 03:33:05 +03:00
Daniel Stone
a93033b0bc XFree86: Module: Bump input version
config_info changes the size (and ordering) of DeviceIntRec, so bump the
input major.
2007-08-01 01:53:31 +03:00