Commit graph

3777 commits

Author SHA1 Message Date
Jeremy Huddleston
09354a4098 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-06-27 10:42:12 -07:00
Jeremy Huddleston
d42523cc77 XQuartz: More localization updates
(cherry picked from commit 7fbe974246)
2009-06-19 21:16:46 -07:00
Adam Jackson
dbac41b624 pci: Dump vendor/devices ids in the printed device list
(cherry picked from commit eb35402d0a)
2009-06-19 12:45:25 -04:00
Jerome Glisse
540d5b87a4 DRI2: update DRI2 private drawable width & height according to X drawable
(cherry picked from commit f250eea2e9)
2009-06-11 22:46:00 -07:00
Ian Romanick
ec9f1ae324 DRI2: Force allocation of real-front buffer for non-windows as well
For redirected rendering we end up with pixmaps (which the app thinks are
windows) that are double buffered.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Pierre Willenbrock <pierre@pirsoft.de>
(cherry picked from commit 0d9d3f3e36)
2009-06-11 22:46:00 -07:00
Ian Romanick
4fad615d68 DRI2: Implement protocol for DRI2GetBuffersWithFormat
This change implements the protocol for DRI2GetBuffersWithFormat, but
the bulk of the differences are the changes to the extension / driver
interface to make this function work.  The old CreateBuffers and
DeleteBuffers routines are replaced with CreateBuffer and DeleteBuffer
(both singular).

This allows drivers to allocate buffers for a drawable one at a time.
As a result, 3D drivers can now allocate the (fake) front-buffer for a
window only when it is needed.  Since 3D drivers only ask for the
front-buffer on demand, the real front-buffer is always created.  This
allows CopyRegion impelemenations of SwapBuffers to continue working.
As with previous version of this code, if the client asks for the
front-buffer for a window, we instead give it the fake front-buffer.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
2009-06-11 22:46:00 -07:00
Ian Romanick
98c3c21735 DRI2: Add interface for drivers to query DRI2 extension version
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 28ddfc88d8)
2009-06-11 22:46:00 -07:00
Ian Romanick
d7277296ed DRI2: Synchronize the contents of the real and fake front-buffers
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 567cf67959)
2009-06-11 22:46:00 -07:00
Ian Romanick
73b786f7e7 DRI2: Do not send the real front buffer of a window to the client
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit f1a995d149)
2009-06-11 22:45:59 -07:00
Ian Romanick
32d250a881 DRI2: Add fake front-buffer to request list for windows
If a front-buffer is requested for a window, add the fake front-buffer
to the list of requested buffers.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit aa2928325f)
2009-06-11 22:45:59 -07:00
Adam Jackson
db61eff891 EDID: Add modes from Established Timings III descriptor to mode pool
EDID 1.4, section 3.10.3.9
(cherry picked from commit 99e22b86c5)
2009-06-11 15:22:00 -04:00
Adam Jackson
ebca49e0fe EDID: Be more cautious about finding vendor blocks.
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
(cherry picked from commit a2c5ee36b2)
2009-06-11 15:21:11 -04:00
Adam Jackson
c643d24cde vfb: Fix depth setup.
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().
(cherry picked from commit 45530d1609)
2009-06-11 15:19:47 -04:00
Jeremy Huddleston
b2ffbfd930 XQuartz: AIGLX dispatch table cleanup
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 e10c53421f)
2009-06-06 22:24:03 -07:00
Jeremy Huddleston
dbea4c04df XQuartz: Default to forcing the dialog box before quitting.
This will show the quit dialog for users of other WMs.
(cherry picked from commit 639ee0c913)
(cherry picked from commit 09432fa5b1)
2009-06-06 22:23:43 -07:00
Jeremy Huddleston
eecbd596fe XQuartz: English localization update for HIG compliance
(cherry picked from commit 86b319d7cb)
2009-05-29 11:44:49 -07:00
Jeremy Huddleston
247e70e21b XQuartz: More localization updates
(cherry picked from commit b107390c9f)
2009-05-27 10:08:47 -07:00
Jeremy Huddleston
45128ae020 Merge commit 'origin/server-1.6-branch' into xorg-server-1.6-apple 2009-05-27 10:08:36 -07:00
Jeremy Huddleston
04c9e80f08 Fix a couple off-by-one array boundary checks.
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>
(cherry picked from commit b680bda34d)
2009-05-09 11:42:17 -07:00
Jeremy Huddleston
71a4dcb1d8 XQuartz: pbproxy standalone: added missing variable declarations.
(cherry picked from commit 2d947d17a3)
2009-05-09 11:39:09 -07:00
Alan Coopersmith
0fbf6f30f7 Don't leak default font path when appending built-ins
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 66539cc05d)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 22:56:56 -07:00
Alan Coopersmith
773e4890b3 Don't leak canonical module name and patterns if module is built-in
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 1c101d75d4)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 22:56:28 -07:00
Dave Airlie
7cd596e0dd randr12: looking up these bits if randr isn't initialised is bad.
When xinerama is enabled we don't get randr protocol, but the
driver might still want randr internals
(cherry picked from commit faf7dfa099)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 22:49:55 -07:00
Alan Coopersmith
bc95f29441 Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
Fixes OpenSolaris Bug 8315:
Xorg segfaults when screensaver fades in cross-endian xdmcp session
<http://defect.opensolaris.org/bz/show_bug.cgi?id=8315>

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
(cherry picked from commit 7d0f7518c2)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 22:48:49 -07:00
Jon TURNEY
3f0c73694b Remove references to rgb.txt from files section of Xserver and Xorg man pages
The references to this file in the server code were removed in commit dda10c9066

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
(cherry picked from commit d0dd649035)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 22:47:43 -07:00
Jesse Barnes
fdbb6fd3d3 Don't prepare outputs & crtcs if set_mode_major is present
A driver with this hook will take care of preparing the outputs & crtcs,
so calling the prepare functions will just cause unnecessary flicker.

Fixes bug #21077
(cherry picked from commit 94648bb797)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 12:35:03 -07:00
Julien Cristau
eac2b3658a Bug#21324: Add quirk for Iiyama Vision Master 450
Reported-by: Jeremy Henty <onepoint@starurchin.org>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 0dfb97f15f)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 12:34:12 -07:00
Tormod Volden
b3c42e6450 xfree86: edid quirk for Philips LCD LP154W01-TLAJ
This panel reports its vertical size in cm.

X.Org bug#21000 <http://bugs.freedesktop.org/show_bug.cgi?id=21000>

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit b1dab580bd)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 12:34:00 -07:00
Ander Conselvan de Oliveira
0df12a3f01 xfree86: Remove device from inputInfo.devices if ActivateDevice failed.
After the call to xf86ActivateDevice, the new device will be added to
inputInfo.devices. However, if the subsequent call to ActivateDevice
fails, the correponding InputInfoRec for the device is deleted but an
entry still remains in inputInfo.devices. This might lead to a server
crash later on (on InitAndStartDevices for instance) when the device
control proc would be called for an invalid device.
(cherry picked from commit efa31092d6)

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 12:31:41 -07:00
Ian Romanick
199bb36715 DRI2: Send the version the code actually supports
This prevents building an older server with a new dri2proto.h from
resulting in a DRI2 extension module that lies about the version it
supports.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 44227ef1b7)

Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08 12:23:27 -07:00
Jeremy Huddleston
6904f0cb80 XQuartz: Localization update
(cherry picked from commit 9435fc5e20)
2009-04-22 19:30:25 -07:00
Jeremy Huddleston
5d8caf5b9f XQuartz: Make sure the bgMouseLocationUpdated state is consistent
(cherry picked from commit 8fa8a8e1db)
2009-04-22 19:30:14 -07:00
Jeremy Huddleston
428b463b78 XQuartz: Use correct values for ProximityIn and ProximityOut
This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c2)
2009-04-11 17:26:25 -07:00
Jeremy Huddleston
e63eb56e62 XQuartz: Solve the tablet 100% CPU bug
This happened because we put a byte in the fd to wake up dispatch, but we never actually enqueued anything in mieq because the num_events was 0.
(cherry picked from commit c21ca7558d)
2009-04-11 17:25:23 -07:00
Jeremy Huddleston
1a1e46d701 XQuartz: Re-enable background window checking
since that code was not the culprit for the wacom tablet, background 100% CPU bug
(cherry picked from commit fc1dc5d71b)
2009-04-11 17:23:01 -07:00
Jeremy Huddleston
0e32904f16 XQuartz: Only set MotionNotify on activation if it is updated.
(cherry picked from commit ae8077a251)
2009-04-11 17:22:49 -07:00
Jeremy Huddleston
7add477ffe XQuartz: Make sure the Fn doesn't trigger unneccessary calls to DarwinUpdateModKeys()
(cherry picked from commit 70a18558c6)
2009-04-11 17:22:37 -07:00
Jeremy Huddleston
55878a78c0 XQuartz: Re-enable Fn as an option for 3button mouse simulation.
Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5)
2009-04-11 17:22:16 -07:00
Jeremy Huddleston
64d82c7d16 XQuartz: xprSetWindowLevel updated to store the level requested by the WM
(cherry picked from commit c28c2ddc3a)
2009-04-10 00:48:31 -07:00
Jeremy Huddleston
d6b413a8ba XQuartz: Update window levels when changing rootless state
(cherry picked from commit 1359ded5bf)
2009-04-10 00:47:39 -07:00
Jeremy Huddleston
192be8e4f9 XQuartz: Fix window levels for rooted mode to allow showing the menu bar.
(cherry picked from commit 80759a4186)
2009-04-10 00:47:27 -07:00
Jeremy Huddleston
886f8b6af3 XQuartz: Properly set the window level for the root window
(cherry picked from commit bdf9286d1c)
2009-04-10 00:47:15 -07:00
Jeremy Huddleston
137db09a35 XQuartz: Properly set the menu bar and hotkey state when changing rootless mode.
Currently no code path exhibits the broken behavior since we only toggle into rootless if we don't have the root.
(cherry picked from commit 970f100ca3)
2009-04-10 00:47:02 -07:00
Jeremy Huddleston
fed3bbdc61 XQuartz: In rooted mode, make sure we start in the hidden state.
(cherry picked from commit 5ecc497f71)
2009-04-10 00:46:47 -07:00
Jeremy Huddleston
e221c4e398 XQuartz: Send MotionNotify before button presses when X11 is in the background
(cherry picked from commit c80d0ec18e)
2009-04-10 00:46:35 -07:00
Jeremy Huddleston
3644e9d1a5 XQuartz: Revert most of the previous override redirect patch
The changes actually caused all windows to move to the current space.  Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142)
2009-04-10 00:46:22 -07:00
Jeremy Huddleston
f0c80564e6 XQuartz: Use updated Xplugin API to send overide-redirect windows to the current space when they're ordered in
This fixes the annoying "using a menu moves me to another space" bug
(cherry picked from commit 9e6dab89e0)
2009-04-05 16:32:11 -07:00
Jeremy Huddleston
c5eef1e95b XQuartz: Send a MotionNotify event for the mouse cursor when activating X11.app
Otherwise if X11.app was activated with a mouse click, the location of the even is the last location of the cursor before X11 was deactivated
(cherry picked from commit c7457d7b31)
2009-04-05 16:32:03 -07:00
Jeremy Huddleston
3c80f6214a XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
(cherry picked from commit f393fb686c)
2009-04-01 13:53:13 -07:00
Jeremy Huddleston
bbab36899e XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
(cherry picked from commit 49871e9917)
2009-04-01 13:53:01 -07:00