summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
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-04Merge branch 'master' into xi2Peter Hutterer2-20/+13
2009-06-03s/MIN/min/, s/MAX/max/ (#2968)Adam Jackson2-20/+13
2009-06-03Merge branch 'master' into xi2Peter Hutterer15-118/+19
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-02Remove some libXfont leftoversAdam Jackson3-3/+0
2009-06-02Revert "randr: Setting gamma: inverse logic looks more sane"Matthias Hopf1-1/+1
This reverts commit 79138eec1b49cbaca6a16f2bdd8579b5828aeb28.
2009-05-29vfb: Fix depth setup.Adam Jackson1-27/+3
Initialize the depth corresponding to the root window before the pixmap-only depths. Otherwise you end up with the root window depth in the depth list twice, which is mildly confusing for clients and catastrophically confusing for PanoramiXConsolidate().
2009-05-29XQuartz: English localization update for HIG complianceJeremy Huddleston2-6/+6
(cherry picked from commit 86b319d7cbef39d75b54c9d321e5dbf097b552be)
2009-05-28xfree86: Remove loader symbol list ABI stubsAdam Jackson4-51/+0
These have been nops since 2006 and functionally void since 7.0.
2009-05-28Merge branch 'master' into xi2Peter Hutterer88-3042/+2442
Conflicts: Xext/geext.c Xi/chdevcur.c Xi/extgrbdev.c Xi/xiproperty.c configure.ac dix/ptrveloc.c hw/xfree86/common/xf86Config.c mi/mipointer.h test/input.c xkb/xkb.c
2009-05-27xfree86: Remove unused (and useless) xf86{Add,Delete}ModuleInfoAdam Jackson3-29/+0
2009-05-27randr: bug #21554 - re-probe outputs when coming back from laptop unsuspendFederico Mena Quintero1-0/+26
Make xf86 RANDR wrap the EnterVT call chain, so it can re-probe the outputs when a laptop comes back from suspend/unsuspend (actually, any time that we enter our VT again). The X server should then send RR* events to clients, so they can cope with a monitor that was unplugged while the laptop was suspended. Signed-off-by: Federico Mena Quintero <federico@novell.com>
2009-05-27XQuartz: More localization updatesJeremy Huddleston39-2555/+1719
(cherry picked from commit b107390c9f30571902556b4d053e62d345a06254)
2009-05-27Cygwin/X: Update icons directly, rather than modifying the window's classJoe Krahn3-53/+44
Update icons directly to windows rather than modifying the window's class. Respect custom icons overriden via the configuration file. fd.o bugzilla #4491 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Cygwin/X: Remove unused TimeSinceLastInputEvent()Jon TURNEY3-12/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Fix some log spamColin Harrison1-0/+2
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Various tidy ups in winClipboardFlushXEvents()Colin Harrison1-0/+17
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Avoid log spam if a windows application won't provide CF_UNICODETEXT ↵Colin Harrison1-2/+7
clipboard format Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Cache atom lookups in clipboard integration codeColin Harrison2-25/+28
Cache the CLIPBOARD atom lookups in winClipboardWindowProc() Cache atom lookups in winClipboardFlushXEvents() Recache on server regeneration Copyright (C) Colin Harrison 2005-2008 http://www.straightrunning.com/XmingNotes/ http://sourceforge.net/projects/xming/ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Prevent the mouse wheel from stalling when another window is minimized.Colin Harrison1-0/+4
Fix internal WM to prevent the mouse wheel from stalling when another window is minimized. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Cygwin/X: Correctly allow for the native window frame width in ValidateSizing()Jon TURNEY1-9/+12
Fix internal WM to correctly calculate the native window border when validating window sizing Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Cygwin/X: Consolidate dialog initialization in winInitDialog()Joe Krahn1-66/+50
Changed windialogs.c to set icons via window properties rather than class properties, and use LoadImage() for small icons, because LoadIcon() can only open large icons. Since this code is redundant across the dialogs, I put it in the winCenterDialog function, along with a few other redundant instructions, and renamed in winInitDialog(). Also, don't bogusly put our dialogs at the center of the virtual desktop if we are on a multimonitor system (this causes the dialog to end up split across two monitors in a dual-monitor side-by-side setup) Corrections to use HWND_TOPMOST instead of HWND_TOP and not to use SWP_NOZORDER from Colin Harrison fd.o bugzilla #4491 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-27Xming: Slightly adjust the formatting of the logged command lineColin Harrison1-3/+3
Copyright (C) Colin Harrison 2005-2008 http://www.straightrunning.com/XmingNotes/ http://sourceforge.net/projects/xming/ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-24fix typo in cabff9007 which led to an unintialized memory read and a crash.Matthieu Herrb1-1/+1
2009-05-22EDID: Add modes from Established Timings III descriptor to mode poolAdam Jackson3-4/+86
EDID 1.4, section 3.10.3.9
2009-05-22ABI_XINPUT_VERSION 6Peter Hutterer1-1/+1
2009-05-22Input: rename DeviceIntRec->isMaster to ->type.Peter Hutterer2-4/+4
isMaster is not enough as long as we differ between master pointers and keyboard. With flexible device classes, the usual checks for whether a master device is a pointer (currently check for ->button, ->valuators or ->key) do not work as an SD may post an event through a master and mess this check up. Example, a device with valuators but no buttons would remove the button class from the VCP and thus result in the IsPointerDevice(inputInfo.pointer) == FALSE. This will become worse in the future when new device classes are introduced that aren't provided in the current system (e.g. a switch class). This patch replaces isMaster with "type", one of SLAVE, MASTER_POINTER and MASTER_KEYBOARD. All checks for dev->isMaster are replaced with an IsMaster(dev).
2009-05-22xfree86: treat other drivers as mouse drivers in the config.Peter Hutterer1-9/+16
Historically, if no input device was referenced in the ServerLayout, the server would pick the first "mouse" device found in the xorg.conf. This patch gives evdev, synaptics, vmmouse and void the same status. If there is a section in the config file using this driver - use it as the core pointer. Device selection is in driver-order, not in config-order. If a "mouse" device is listed after a "synaptics" device, the "mouse" device gets preference. This replicates the original behaviour. This code only takes effect if AllowEmptyInput is off and there is no core pointer in the server layout. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-21EDID: Be more cautious about finding vendor blocks.Adam Jackson1-2/+4
Many old monitors zero-fill the detailed descriptors, so check for that to avoid a useless warning like: (WW) RADEON(0): Unknown vendor-specific block 0
2009-05-21xfree86: treat other drivers as mouse drivers in the config.Peter Hutterer1-9/+16
Historically, if no input device was referenced in the ServerLayout, the server would pick the first "mouse" device found in the xorg.conf. This patch gives evdev, synaptics, vmmouse and void the same status. If there is a section in the config file using this driver - use it as the core pointer. Device selection is in driver-order, not in config-order. If a "mouse" device is listed after a "synaptics" device, the "mouse" device gets preference. This replicates the original behaviour. This code only takes effect if AllowEmptyInput is off and there is no core pointer in the server layout. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-20randr: Setting gamma: inverse logic looks more saneMatthias Hopf1-1/+1
2009-05-20Xi: remove DeviceIsPointerTypePeter Hutterer1-9/+2
This approach is broken anyway. DIPT only checked for the XInput type "MOUSE" and the only user of this is xf86ActivateDevice when it sets the Activate/DeactivateGrab functions. Since synaptics and wacom set their own types, evdev only sets MOUSE for, well, mice half the devices didn't have this set correctly anyway. Instead, ActivatePointerGrab should be merged together with ActivateKeyboardGrab. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-18Cygwin/X: link with libmain.a to provide main()Jon TURNEY1-1/+1
Commit 987579c930bda803427a28cb82773c389f5110d6 moves main.c into into libmain.a to be linked with separately, and updates the various DDXs to link with libmain.a, except Xwin, which also needs this change. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-05-16input: reduce the number of superfluous hierarchy eventsPeter Hutterer3-12/+12
There's only two reasons for hierarchy events: - device is added, removed, etc. In this case we want to send the event as it happens. - devices are added in a XIChangeDeviceHierarchy request. In this case we only want one event cumulating all changes.
2009-05-16kdrive: set Activate/Deactivate grab for input devices (#21591)Peter Hutterer1-0/+4
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
2009-05-16xfree86: Remove superfluous ifdef DEBUG checks.Peter Hutterer22-301/+118
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-16xfree86: Remove superfluous ifdef DEBUG checks.Peter Hutterer22-301/+118
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-16kdrive: set Activate/Deactivate grab for input devices (#21591)Peter Hutterer1-0/+4
X.Org Bug 21591 <http://bugs.freedesktop.org/show_bug.cgi?id=21591>
2009-05-15Solaris: Make sure non-inline versions of asm routines end with ret statementsDavid Marx3-3/+3
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-05-15xfree86: add edid quirk for Samsung Syncmaster 2333HDJulien Cristau1-0/+5
It reports vertical size in cm in the detailed mode. X.Org bug#21750 <http://bugs.freedesktop.org/show_bug.cgi?id=21750> Reported-by: Peter Poklop <Peter.Poklop@gmx.at> Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-05-14Fix mem_barrier() on AlphaMatt Turner1-1/+2
Some clean up (da086901c6579e41b28b1418fa12ebb82744fc87) went a bit too far and removed the needed mem_barrier macro on Alpha. This re-adds it.
2009-05-14xfree86: Add two __FreeBSD_kernel__ checksJulien Cristau2-2/+4
Debian bug#525475 <http://bugs.debian.org/525475> Reported-by: Petr Salinger <Petr.Salinger@seznam.cz> Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-05-14Update several of my and/or Red Hat's licenses to standard form.Adam Jackson4-34/+38
2009-05-14randr12: Initialize and keep track of updates to VidMode extension gamma value.Michel Dänzer2-5/+7
This way clients querying the gamma value via the VidMode extension at least get the last value set via the same, rather than always something bogus. Signed-off-by: Michel Dänzer <daenzer@vmware.com>
2009-05-14randr12: Fix calculation of gamma ramp values.Michel Dänzer2-4/+4
The reciprocal gamma value was missed in the first copy and this mistake was propagated to the second one. Signed-off-by: Michel Dänzer <daenzer@vmware.com>
2009-05-11DRI2: update DRI2 private drawable width & height according to X drawableJerome Glisse1-0/+2
2009-05-09XQuartz: pbproxy standalone: added missing variable declarations.Jeremy Huddleston1-0/+3
(cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)
2009-05-08Fix a couple off-by-one array boundary checks.Alan Coopersmith1-1/+1
Error: Write outside array bounds at Xext/geext.c:406 in function 'GEWindowSetMask' [Symbolic analysis] In array dereference of cli->nextSib[extension] with index 'extension' Array size is 128 elements (of 4 bytes each), index <= 128 Error: Buffer overflow at dix/events.c:592 in function 'SetMaskForEvent' [Symbolic analysis] In array dereference of filters[deviceid] with index 'deviceid' Array size is 20 elements (of 512 bytes each), index >= 0 and index <= 20 Error: Read buffer overflow at hw/xfree86/loader/loader.c:226 in function 'LoaderOpen' [Symbolic analysis] In array dereference of refCount[new_handle] with index 'new_handle' Array size is 256 elements (of 4 bytes each), index >= 1 and index <= 256 These bugs were found using the Parfait source code analysis tool. For more information see http://research.sun.com/projects/parfait Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Adam Jackson <ajax@redhat.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-05-08xfree86: fix xf86PostMotionEventP type checkingPeter Hutterer1-3/+4
We only put internal events into the queue now, so let's check for ET_Motion rather than the MotionNotify. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>