Eric Anholt
4b14c9a9cd
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
...
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
2007-10-19 16:34:54 -07:00
Eric Anholt
a3a95d3475
Merge branch 'master' into glyph-pixmaps
...
Conflicts:
configure.ac
2007-10-19 15:44:17 -07:00
Eric Anholt
7e1cada6c6
Disable debian pci-id-list autoconfig code on non-linux.
...
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together. Also restores previous code for fallback to vesa if nothing is
detected.
2007-10-19 15:16:19 -07:00
Kristian Høgsberg
89c6108531
Fix software GL to provide a list of supported fbconfigs like the DRI case.
2007-10-19 16:22:33 -04:00
Matthias Hopf
74e84b8d89
Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).
2007-10-19 17:28:15 +02:00
Matthias Hopf
6fdf3ddfef
Fix ids of ACPI events according to ACPI spec.
2007-10-19 17:20:21 +02:00
Peter Hutterer
d9caa469b9
Xi: allow VCP/VCK to be OpenDevice'd as well.
...
All devices deserve to be equal. Except master devices, they are a bit more
equal than the others.
2007-10-19 15:26:09 +09:30
Peter Hutterer
155e2c559e
Xi: advertise as XInput v2 capable
2007-10-19 14:37:07 +09:30
Peter Hutterer
5ba738935f
Xi: remove ChangePointerKeyboardPairing in favour of ChangeDeviceHierarchy.
2007-10-19 14:36:37 +09:30
Peter Hutterer
6dcde0e9c1
Xi: set master device's id in ListDevices Reply.
2007-10-19 11:28:50 +09:30
Peter Hutterer
cfcc6e14b9
Xi: return all master devices as type IsXPointer/Keyboard when listing devs.
...
Slave devices are reported as IsXExtensionPointer/Keyboard.
2007-10-19 11:28:44 +09:30
Kristian Høgsberg
8e3c1dfc48
Introduce a new "GlxVisuals" option that controls which visuals are added.
...
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
9e3cfd950d
Add code to set up GLX visuals and add one for the first double buffered FBConfig.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
8fc635e6a8
Separate handling of GLX visuals and GLX FBConfigs.
...
XIDs for GLX visuals and FBConfigs used to be interchangable and the list of
GLX visuals was identical to the list for FBConfigs. This patch splits handling
of these two data types and allows the X server to pick and choose the FBConfigs
that are exposed as visuals.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
0af8180683
Drop VisualConfigPriv support from the DRI module.
...
No DDX driver uses this, and this patch stops the DRI module from
poking around GLX module data structures.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg
7d74690536
Simplify and clean up GLX visual initialization.
...
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eric Anholt
ab4bce02a9
Add a quirk for Philips 107P5 which lacks the preferred bit on detailed timing.
...
Also fix the prefer-large-75 quirk if the prefer-first-detailed bit was set,
though it's not the case for the existing prefer-large-75 consumer.
2007-10-18 15:22:42 -07:00
Michel Dänzer
ce50bfd336
EXA: Skip empty glyphs.
2007-10-18 17:44:48 +02:00
Michel Dänzer
5d74416740
EXA: Don't attempt to move in pixmaps that can't be accelerated.
...
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12815 .
2007-10-18 17:44:14 +02:00
Keith Packard
feac075952
Make config file preferred mode override monitor preferred mode.
...
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
2007-10-17 11:42:28 +08:00
Keith Packard
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
Peter Hutterer
9aadde3779
mi: don't call UndisplayCursor for non-sprite-owners.
...
Segfaults are bad.
2007-10-17 12:05:50 +09:30
Peter Hutterer
8b7c4249d8
mi: call processInputProc for master devices after slave event processing.
...
More work is needed to sort out grabs though.
2007-10-17 10:41:58 +09:30
Peter Hutterer
ae9fc10ade
Xi: don't send core events for slave devices.
2007-10-17 10:41:04 +09:30
Peter Hutterer
de70cfdbe6
mi: fix some macros to allow multiple cursors for master devices.
...
Macros defaulted to inputInfo.pointe rfor devices that weren't spriteOwners.
Changed to take the device's master device now.
This includes sticking in a number of checks and warnings that cursor
rendering won't be called for floating devices.
2007-10-17 09:52:30 +09:30
Alan Hourihane
9dde53ed17
Fix walking of GLX providers.
2007-10-16 19:55:56 +01:00
Michel Dänzer
70a5d33c9e
Always check the return value of __glXGetDrawable first.
...
Fixes spurious GLX protocol errors because __glXGetDrawable doesn't set the
error code in case of success. Maybe it should, though.
2007-10-16 12:46:07 +02:00
Peter Hutterer
1d9ebbac8c
dix: Make InitCoreDevices use AllocMasterDevice.
...
Also change naming a bit, append "pointer" and "keyboard" to master devices
instead of -ptr and -keybd.
2007-10-16 18:46:12 +09:30
Peter Hutterer
299573f461
dix: add AllocMasterDevice for creation of new master devices.
...
Devices are initiated pretty much the same as the core devices.
2007-10-16 18:40:15 +09:30
Peter Hutterer
5fe9bfd23f
xfree86: NIDR: don't call PairDevices explicitly.
...
set isMaster to FALSE explicitly.
Pairing isn't necessary, attachment should be done in EnableDevices.
2007-10-16 18:23:48 +09:30
Peter Hutterer
5eb033835e
mi: don't exclude inputInfo.pointer from rendering.
2007-10-16 18:03:52 +09:30
Peter Hutterer
b697c4ed14
dix: CheckPassiveGrabOnWindow: only get paired device for non-keyboards.
2007-10-16 17:47:06 +09:30
Peter Hutterer
caa69d8f7b
dix: fix detritus from adding lastSlave field.
2007-10-16 17:38:13 +09:30
Peter Hutterer
90d077e537
dix: GetPointerEvents: get state from master device before applying valuators.
...
We need to get lastx/y from the master device before we start applying
acceleration etc. Otherwise we get jumping cursors, which is reasonably bad.
2007-10-16 17:37:33 +09:30
Peter Hutterer
b6ccf721b0
include: add "lastSlave" field to DeviceIntRec.
...
Set to the last slave device that routed events through the master.
2007-10-16 17:35:06 +09:30
Peter Hutterer
e6bd8ae060
dix: set the device's sprite when using AttachDevice
...
Sprite is set to the master device's sprite.
2007-10-16 15:59:30 +09:30
Peter Hutterer
271d4c3d62
xfree86: remove XI86_SHARED_POINTER flag.
...
Not needed anymore. By default, all devices are slaves of first master device.
2007-10-16 15:50:07 +09:30
Peter Hutterer
c7b878b904
dix: don't treat VCK/VCP separately in DevHasCursor, IsPointer/KeyboardDevice.
2007-10-16 15:07:31 +09:30
Peter Hutterer
e9f149fb56
Fix up detritus from removing GetPairedPointer/Keyboard.
2007-10-16 14:24:20 +09:30
Peter Hutterer
840bde3d32
dix: GetPairedDevice: return dev paired with master for slave devices.
2007-10-16 13:09:35 +09:30
Peter Hutterer
6c259a08d9
include: remove unused GetPairedPointer/Keyboard declarations.
2007-10-16 13:09:19 +09:30
Peter Hutterer
9ecbbf198f
dix: adjust PickPointer and PickKeyboard to get the first master device.
...
Simplifies it a lot, since we always have at least one master device
available at all times, so less mucking around.
2007-10-16 12:05:09 +09:30
Peter Hutterer
0c5f65ecd3
dix: don't allow slave devices as ClientPointer
2007-10-16 12:04:56 +09:30
Peter Hutterer
9ccc9ab6f2
dix: don't call CloseDevice on VCP/VCK separately.
2007-10-16 12:04:48 +09:30
Peter Hutterer
e4fd981b48
dix: check for isMaster before calling DeviceCursorCleanup.
2007-10-16 12:04:40 +09:30
Peter Hutterer
7503d13407
dix: don't check VCK and VCP separately when looking for device ids.
...
Both are part of the device list again, so we cover them there.
2007-10-16 12:04:30 +09:30
Peter Hutterer
032e906711
dix: Remove GetPairedPointer, GetPairedKeyboard in favour of GetPairedDevice.
2007-10-16 11:57:42 +09:30
Peter Hutterer
3e07e73fef
dix: remove pairing/attachment from InitAndStartDevices.
...
If we enabled in the correct order, this has all been done already.
2007-10-16 11:34:29 +09:30
Peter Hutterer
38baac71bd
dix: Set bidirectional pairing, don't allow pairing with already paired devs.
2007-10-16 11:30:59 +09:30
Peter Hutterer
70efd3d06a
dix: fix up Activate/Enable/Disable device.
...
Set isMaster for VCP/VCK.
Init sprites for master pointer devices.
Pair master kbds with master pointers (1:1 pairing!).
Attach other devices to VCP/VCK.
2007-10-16 11:30:32 +09:30