summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-06-09hw/xf86/modes: Set crtc mode/rotation/transform before calling set_mode_majorBenjamin Defnet1-3/+5
This moves code out of each implementation of set_mode_major and back into the X server. The real feature here is that the transform is now available in the crtc for use by either xf86CrtcRotate or whatever the driver wants to do. Without this change, the transform was lost for drivers providing the set_mode_major interface. Note that users of this API will want to stop smashing the transformPresent field, and could also stop setting mode/x/y/rotation for new enough X servers, but there's no reason to make that change as it will break things when running against older X servers. Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org>
2009-06-09dix/randr: Add missing fields to SRR*NotifyEvent()Federico Mena Quintero1-2/+9
Also, remove redundant field swaps and make others match the order in which they are declared in the xRR*NotifyEvent structs. Signed-off-by: Federico Mena Quintero <federico@novell.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-09cvt: Allow multiple-of-60Hz refresh rates for reduced blanking.Adam Jackson1-5/+8
Doing so generates the same timings as given in the DMT spec for 120Hz RB, so we should be set there. Other rates might be legal too but why push our luck.
2009-06-09require inputproto 1.9.99.11Peter Hutterer1-1/+1
2009-06-09Xi: hierarchy events have a num_info now instead of num_devices.Peter Hutterer2-5/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-09Xi: change from XICreateMaster to XIAddMaster for consistency.Peter Hutterer1-2/+2
add/remove is used for slave devices and hierarchy flags. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-09Xi: return BadValue for XI_HierarchyChangd mask on devices.Peter Hutterer1-0/+7
This mask may only be selected for XIAllDevices. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-08Make RANDR 'set' timestamps follow client specified time. Bug 21987.Keith Packard2-2/+7
The lastSetTime value which indicates when the configuration within the server was last changed was not getting set in the appropriate RandR requests. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-09exa: driver pixmaps enabled if either CreatePixmap or CreatePixmap2 presentBen Skeggs1-1/+1
2009-06-07dix: protect against missing ButtonClasses in GetPointerMapping.Peter Hutterer1-2/+3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-07config: fix build after XI2 API changes to RemoveDevice.Simon Thum1-1/+1
This patch fixes the build with --enable-config-dbus is enabled (default disabled). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-06GLX: Make sure the types match for ALIAS in indirect_reqsize.cJeremy Huddleston1-2/+2
(cherry picked from commit 31a20a573b867fb7f02da15425e3b92eccb82dec)
2009-06-06XQuartz: AIGLX dispatch table cleanupJeremy Huddleston1-746/+946
This should fix some issues when building on different versions of OSX. We only use extensions that OpenGL.framework's glext.h header tells us are supported. (cherry picked from commit e10c53421f1e780573c8adcd8ea89d6ffa28a819)
2009-06-06Rootless: Use serverClient instead of NullClientJeremy Huddleston1-1/+1
This seems to stop the crash when moving windows. (cherry picked from commit fcd857c8e295ac7a2b0e58d49dc71251ed9d1266)
2009-06-06XQuartz: Default to forcing the dialog box before quitting.Jeremy Huddleston1-1/+1
This will show the quit dialog for users of other WMs. (cherry picked from commit 639ee0c913f892776fee40bcfb856e0d7c2c7db5) (cherry picked from commit 09432fa5b1cc8e9a30fb8aa4f8dfcd08c4a91e30)
2009-06-06Rootless: Despite its name, we still want to allow rootless to mess with the ↵Jeremy Huddleston1-53/+0
root window This fixes the bug whereby we weren't drawing the contents of the root window since RootlessPaintWindowBackground got nuked. (cherry picked from commit bb0e208787739fbed2a0c8d1af6b6504319fdf88)
2009-06-07dix: set the generic event type for implicit XI2 grabs.Peter Hutterer1-0/+3
event->type is always GenericEvent for XI2 events. Instead, XI_ButtonPress (the generic event's evtype must be stored. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-07dix: suppress pointer acceleration on xtest devicesSimon Thum1-3/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-07dix: prefer lroundf() over roundf() in axis scalingSimon Thum1-1/+1
it's unclear whether there actually is a problem, but in a very similar case there is (bug#21456). Also, integer addition is generally faster. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05Cygwin/X: Remove obsolete ChangeLog filesJon TURNEY3-748/+0
Remove obsolete ChangeLog files, this information is preserved in the automatically generated top-level ChangeLog
2009-06-05Cygwin/X: Tidy up a bodge to avoid collision between X header and native ↵Jon TURNEY2-16/+2
Win32 API definitions of ATOM Remove a bodge to avoid collision between X header and the native Win32 API definitions of ATOM, use X11/Xwindows.h which exists to address these issues Consequently, include misc.h in winclipboardthread.c, to provide the max() macro, as previously we were using the the one from windows.h Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-06-05Revert "test: check from INT_MIN to INT_MAX for core type conversion"Peter Hutterer2-31/+26
This patch requires extra special casing to check if the linker supports the -wrap option. Patches to do so will follow, in the meantime, revert this commit. It shouldn't have been pushed in the first place anyway. This reverts commit d979f443946011158b6a183582728a6899c33b85. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05Xi: fix XIQueryVersion major/minor swapping.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05Xi: add XIQueryVersion reply swapping hook.Peter Hutterer1-0/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05Xi: return BadImplementation for deviceids 256 and abovePeter Hutterer12-0/+132
The protocol allows for 16 bit device ids, but the implementation doesn't yet. We need to break the input ABI once more to shift the DeviceIntRec's CARD8 to a CARD16, along with some changes in the privates. Once that is done, revert this patch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05Xi: fix flawed logic in XIQueryVersion return value.Peter Hutterer1-2/+13
The server returned the minimum of major/minor each instead of the lower of the combined major.minor version. As a result, a client reporting 3.0 and a server supporting 2.7, the return value would be 2.0 (the minimum of both). Reported-by: Rémi Cardona Reported-by: Simon Thum Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-05crtc/gamma: check xf86_config is valid before using it.Dave Airlie1-0/+3
If you have multiple cards, some that support randr 1.2 and some that don't you can get a null dereference in here. Signed-off-by: Dave Airlie <airlied@redhat.com>
2009-06-04xace: fix a bad send access hook call.Eamon Walsh1-1/+1
2009-06-04Merge branch 'master' into xi2Peter Hutterer6-40/+24
2009-06-04Xi: memset the device name padding to 0.Peter Hutterer1-1/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-04Xi: XIQueryVersion requires major_version of 2 or higher.Peter Hutterer1-0/+7
Otherwise, a BadValue error is sent. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-04Xi: reply with the XI2 version that is supported by both client and server.Peter Hutterer1-4/+9
XIQueryVersion must return the client's version if the client's version is lower than or equal to the server's version, or the server's version otherwise. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-04test: check from INT_MIN to INT_MAX for core type conversionPeter Hutterer2-26/+31
ErrorF is link-wrapped to reduce the run-time of the test. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-04test: adjust event_to_core_conversion test for new ProximityIn/Out behaviourPeter Hutterer1-2/+8
Both types now return BadMatch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03s/MIN/min/, s/MAX/max/ (#2968)Adam Jackson6-40/+24
2009-06-03Merge branch 'master' into xi2Peter Hutterer23-141/+62
2009-06-03kdrive: add protocol mouse optionOlivier Blin3-1/+9
kdrive probes a lot of PS/2 protocols for the mouse device, which makes the mouse unusable for some seconds after X startup. This new "protocol" option allows forcing the mouse protocol. It can be used this way: Xfbdev -mouse mouse,,protocol=ps/2 -keybd keyboard Signed-off-by: Olivier Blin <blino@mandriva.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03mi: only process master if the SD is still attached.Peter Hutterer1-1/+3
SDs may be detached during event processing (e.g. if a passive grab activates). In this case, the event must not be processed through the master device. Reported-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03dix: set the device state for XI valuator events.Peter Hutterer1-0/+12
Valuator events need to include the device's state, while other device events need to include the state of the core devices. Reported-by: Thomas Jaeger Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03dix: use GetMaster in PickPointer and PickKeyboard.Peter Hutterer1-3/+2
GetMaster is more reliable than GetPairedDevice, it always returns the keyboard/pointer if desired, even if the wrong device was passed in. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03Xi: fix wrong grabtype from ProcXGrabDevice.Peter Hutterer1-1/+1
86077f0058ce88ee9b3df5d1ab854eeca43 switched from a boolean to a grabtype enum. ProcXGrabDevice didn't switch with it. PickPointer during an XI grab on a slave device would thus return a wrong (or NULL) device and crash the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03dix: EventToCore must return BadMatch for proximity events.Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-03dix: rework event conversion before delivery.Peter Hutterer2-165/+145
Let EventToXI, EventToCore and EventToXI2 return BadMatch if there's no matching event for this protocol spec. Adjust the delivery paths to cope with BadMatch errors (and clean them up on the way). As a side-effect, this fixes server crashes on proximity events for a grabbed device. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-02Typo fixAdam Jackson1-1/+1
2009-06-02Remove some libXfont leftoversAdam Jackson5-5/+0
2009-06-02Revert "randr: Setting gamma: inverse logic looks more sane"Matthias Hopf1-1/+1
This reverts commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28.
2009-06-02dix: ensure EventIsDeliverable has inputMasks set at all times.Peter Hutterer1-2/+2
For proximity events, the XI2 type is 0 and inputMasks never got set in the preceding condition. As a result, proximity events got never delivered. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-02dix: protect against floating slaves in DeviceFocusEvent.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-02xkb: allow pointer events to pass through for floating SDs without a key class.Peter Hutterer1-5/+15
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-02test: add grab matching tests.Peter Hutterer1-0/+363