Ian Romanick
8b6b40b727
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
Julien Cristau
13949f9972
Get rid of the type1 font module.
...
It is completely replaced by freetype these days.
2007-08-23 11:27:33 +02:00
Dave Airlie
76bf3cd7b8
randr: fixup crtc and output destroy
...
if you are moving pointers, you want to move the pointers not just a byte
2007-08-23 16:22:03 +10:00
Alex Deucher
81f8b652d9
Add _X_EXPORT to exported functions in hw/xfree86/modes/*
...
Also add missing exports to hw/xfree86/loader/xf86sym.c
2007-08-22 19:26:34 -04:00
Adam Jackson
1834cfb447
Fix an error message to not point to @xfree86.org.
2007-08-21 10:44:37 -04:00
Keith Packard
265a633cf1
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.
2007-08-20 23:24:22 -07:00
Keith Packard
7dc8531548
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.
2007-08-20 23:24:12 -07:00
Alex Deucher
1f6ddae003
add xf86_crtc_clip_video_helper to xf86sym.c
2007-08-21 00:37:33 -04:00
David Nusinow
c839859d1b
Move module defaults from the header to the source file.
...
This is where they should have been in the first place. All the rest of
the code in the server defines such things in the source files, not the
headers.
2007-08-20 21:09:27 -04:00
Alex Deucher
53c04351c4
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.
2007-08-20 19:47:55 -04:00
Julien Cristau
a1fe36b772
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
2007-08-21 00:26:33 +02:00
Blair Sadewitz
65a49f0ca1
Autoconfiguration of wsmouse for NetBSD.
2007-08-19 20:29:22 +02:00
Jeremy C. Reed
be536b79f2
Update for support on NetBSD and DragonFly. From
...
Joerg Sonnenberger and pkgsrc.
2007-08-16 11:23:28 -05:00
Jeremy C. Reed
1d4bea6106
Add some more support for DragonFly. From Joerg Sonnenberger
...
and pkgsrc.
2007-08-16 11:20:12 -05:00
Dave Jones
14c13b8d62
Kdrive: fix nasty thinko in TslibEnable()
2007-08-16 09:46:27 +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
Alan Coopersmith
c5741438a3
Only use evdev drivers in Xephyr #ifdef linux
2007-08-10 16:13:55 -07: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
Tiago Vignatti
ab3f601149
Updates some piece of the dead mouse evdev code under the new hotplug scheme.
...
I exported the evdev driver to Xephyr server. I'm running it using something
like:
$ ./hw/kdrive/ephyr/Xephyr :1 -mouse evdev,,device=/dev/input/event4 -keybd \
evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br
It also closes /#5668.
2007-08-07 23:17:32 -03:00
Tiago Vignatti
7d1a749b21
Export device path key options to be called by the command line of server.
2007-08-07 22:59:12 -03:00
Tiago Vignatti
aee3588a4a
Update KdUseMsg() for completeness.
2007-08-07 22:49:07 -03:00
Tiago Vignatti
1339e57485
Fix typo.
2007-08-07 04:24:34 -03:00
Tiago Vignatti
d9ee5f3e3a
Clean a little bit the code.
2007-08-07 04:22:26 -03:00
Tiago Vignatti
7a5eb3e96b
Let xkb options be passed through command line in kdrive servers. I start my
...
Xephyr using something like:
./hw/kdrive/ephyr/Xephyr :1 -fp /usr/share/fonts/X11/misc/ -mouse ephyr -keybd ephyr,,xkblayout=br,xkbmodel=abnt2
2007-08-07 02:16:44 -03:00
Tiago Vignatti
955d5f6c0d
When we call Xephyr with '-pointer' a new pointer is added inside the server
...
and the Xephyr virtual mouse keeps alive. With this patch the semantic changes
turning '-pointer' && 'Xephyr virtual mouse' always false.
Now we can open a device pointer and pass its options in Xephyr's command line
without having other pointer unused.
2007-08-07 01:39:29 -03: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
Tiago Vignatti
600ef07113
Fix kdrive command line parser.
2007-08-03 15:33:41 -03: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
18ab4d5594
Darwin: Remove missing file
...
Xserver.m is missing and still hasn't been added, so just remove it for now.
2007-08-01 07:27:53 +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
Daniel Stone
1150969b82
Convert all my license statements to the standard form
...
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
http://lists.freedesktop.org/archives/xorg/2007-July/026451.html
keithp's license on configure.ac changed with his verbal permission.
2007-08-01 01:53:31 +03:00
Daniel Stone
7c9e8fd56e
Input: Allow enabling and disabling of devices
...
Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable
devices on the fly.
2007-08-01 01:53:31 +03:00
Daniel Stone
4d3379d418
Fonts: Fix builtin fonts
...
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
2007-08-01 01:53:31 +03:00
Dave Airlie
722d73a0ef
Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms."
...
This reverts commit 0f057ebb27
.
This screws my cursor up just starting a bare X server on Intel,
I get the X more like <> than ><..
2007-07-31 10:34:56 +10:00
Adam Jackson
f62beb6f36
Remove all trace of Option "BiosLocation".
...
This code was deeply dangerous. If anyone actually had a use for this code,
we should find a better way of doing it.
2007-07-27 13:24:38 -04:00
Kristian Høgsberg
50cb6c7e44
Don't map the front buffer in libdri if the ddx driver doesn't set the size.
...
This lets drivers map the front buffer themselves
by setting dontMapFramebuffer.
2007-07-27 09:55:27 -07:00
Aaron Plattner
cec793ef7a
Include picturestr.h in xf86Crtc.h to pick up definition of PictTransform.
2007-07-26 11:49:46 -07:00
Brice Goglin
eba2be448b
Minor fixes in cvt and gtf manpages
...
Reported by "A. Costa" <agcosta@gis.net> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432065
2007-07-25 20:53:45 +02:00
Michel Dänzer
0f057ebb27
Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms.
...
Doesn't seem necessary to do anything here...
2007-07-25 17:04:04 +02:00
Gustavo Pichorim Boiko
5b424b562e
Set the crtc before the output change is notified
...
Set the new randr crtc of the output before the output change notification is
delivered to the clients.
Remove RROutputSetCrtc as it is not really necessary. All we have to do is set
the output's crtc on RRCrtcNotify
2007-07-23 14:47:45 -07:00