summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-07-07Bump to version 1.6.2xorg-server-1.6.2Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06dri2: Preserve compatibility with 1.6 DRI2 API/ABIKeith Packard3-77/+203
The old DRI2 buffer allocation API wasn't great, but there's no reason to make the server stop working with those drivers. This patch has the X server adapting to the API provided by the driver, using the new API where available and falling back to the old API as necessary. A warning will be placed in the log file when the old API is in use. (cherry picked from commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06xfree86: remove duplicate header entries in Makefile.amArkadiusz Miskiewicz2-4/+2
fixes https://bugs.freedesktop.org/show_bug.cgi?id=22547 This bug was fixed in a big clean-up commit in master, which cannot be backported (see commit b1dac41fb3853ca8182048ea57b88b6e84ecceb3) Signed-off-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06dri2: support glXWaitGL & glXWaitX by copying fake front to front andAlan Hourihane4-11/+67
vice-versa. (cherry picked from commit 2a8b8077d8f6001eb57deba60e1009fc99c28668) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-06xinerama: Put the proto version in the code instead using proto headers.Eric Anholt1-2/+4
Proto headers updating resulting in the server advertising new versions is broken. This should be applied to every extension. This fixes the build against slightly-older xineramaproto. (cherry picked from commit b349a764e98f0d8f221190157ffa0904b91beca5) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Build against DRI_TEX_BUFFER_VERSION 1Keith Packard1-1/+4
setTexBuffer2 isn't present in this version of the structure, so don't try to call it. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Bump version to 1.6.1.902xorg-server-1.6.1.902Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29xfree86: fix SWCursor check in xf86CursorSetCursor.Peter Hutterer1-3/+3
Wrong check for inputInfo.pointer resulted in a SW cursor being rendered when the pointer left the screen (in a Xinerama setup). We must call the sprite rendering function if - SW cursors are enabled, or - The current device is not the VCP and not attached to the VCP. Backported from commit 66089e9129a821cfb1983d3d35f41b975a52de5e for server-1.6-branch by Peter Hutterer Reported-by: Gordon Yuan <GordonYuan@viatech.com.cn> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Change default for ExaOptimizeMigration to falseJulien Cristau1-1/+1
Quoting Michel Dänzer in <1234862541.4823.541.camel@thor>: Unfortunately, there are still bugs left in EXA which prevent it from working 100% correctly with the option enabled, see http://bugs.freedesktop.org/show_bug.cgi?id=16416 http://bugs.freedesktop.org/show_bug.cgi?id=19940 So disable it for now to avoid corruption. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Make 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> (cherry picked from commit 69a9545d1f8110841538410818df19fd960412c5) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29dix/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> (cherry picked from commit e244a5991e2cc55f5aa2f6e5255f1dabf56f0235) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29kdrive: 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> (cherry picked from commit b1b5ec45c1cb650ccb8c659218f9481379c777d9) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29dix: ensure Activate/DeactivateGrab has a valid value.Peter Hutterer1-0/+2
Xephyr doesn't manually set Activate/DeactivateGrab for new devices, resulting in a NULL-pointer dereference later when a grab is activated. Avoid the segfault by ensuring that the pointer is always valid. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6f9e22049862ee9ac7f604411d005d8bb1b2dd1c) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Resync COPYING file with notices in code base as of xorg-server-1.6.1Alan Coopersmith1-682/+111
Remove notices for code no longer in tree (Xprint, Xgl, kdrive, cfb, etc.) Add/update notices for new/changed code in tree Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit b746a00cffca5c553b607a8e9c1074294a23b443) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Fix a couple off-by-one array boundary checks.Jeremy Huddleston3-3/+3
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 b680bda34da130ce408783f04214771471e41e8d) (cherry picked from commit 04c9e80f083659e63cffec8969fb3a0cfc551a97) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29xfree86: restore default off for DontZapPeter Hutterer3-10/+8
Zapping is triggered by xkb these days, so note in the man page that it's the Terminate_Server action. Since it's XKB, personal preferences towards or against zapping should be achieved through xkb rulesets. If Terminate_Server is not in the xkb actions, then we can't zap anyway and we don't need a default of DontZap "on". This patch restores the old meaning of DontZap - disallow zapping altogether, regardless of XKB's current keymap. Ideally, this patch should be accompanied by b0f64bdab00db652e in xkeyboard-config. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 737b49199a05299486064e6e762cf2a2f6f95be6) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29EXA: Always damage glyph cache pixmap manually after uploading a glyph.Michel Dänzer1-36/+37
Signed-off-by: Michel Dänzer <daenzer@vmware.com> (cherry picked from commit 7c8327f0a75087a85864256a9cea80dd4b86def5) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29EXA: Take GC client clip type into account for migration.Michel Dänzer4-24/+25
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=18950 . Signed-off-by: Michel Dänzer <daenzer@vmware.com> (cherry picked from commit 850675d4de4373e5df95507dbf2cd9affaaf54bc) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.Tomas Janousek1-3/+5
In ProcXkbGetKbdByName, mrep.firstVModMapKey, .nVModMapKeys and .totalVModMapKeys were not initialized, contained random values and caused accesses to unallocated and later modified memory, causing XkbSizeVirtualModMap and XkbWriteVirtualModMap to see different number of nonzero values, resulting in writes past the end of an array in XkbSendMap. This patch initializes those values sensibly and reverts commits 5c0a2088 and 6dd4fc46, which have been plain non-sense. Signed-off-by: Tomas Janousek <tomi@nomi.cz> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 525aa17f804d37d1cfcbbf6b8e6cddb45e999b20) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29Support setTexBuffer2 in AIGLX.Kristian Høgsberg3-3/+16
Fixes broken GLX_tfp, specifically, lets compositors ignore un-defined alpha channel for pixmaps. (cherry picked from commit 91b697efdefba125348dbcaf584ee51a7f8c9bf6) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-06-29EDID: Fix timing class names to match the specAdam Jackson1-3/+3
(cherry picked from commit 5c1afac5eea1d8327c74342d12d082b75f0cebde)
2009-06-19pci: Dump vendor/devices ids in the printed device listAdam Jackson1-6/+4
(cherry picked from commit eb35402d0a5290e8a73d7d1e92f173294c364cc2)
2009-06-11Use a #define instead of a magic numberIan Romanick1-2/+4
The number of buffers is likely to change in the future, so having this as a define is the right way to go. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 03aebed519986c4dd03e02b3b3d4af1f64595ca7)
2009-06-11DRI2: update DRI2 private drawable width & height according to X drawableJerome Glisse1-0/+2
(cherry picked from commit f250eea2e90fc50bec5214c2f41132b95edc2c46)
2009-06-11DRI2: Force allocation of real-front buffer for non-windows as wellIan Romanick1-8/+11
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 0d9d3f3e361f769822caedccf4c2a58cc9930ecc)
2009-06-11DRI2: Implement protocol for DRI2GetBuffersWithFormatIan Romanick5-88/+284
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-11DRI2: Add interface for drivers to query DRI2 extension versionIan Romanick2-0/+27
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 28ddfc88d8d547941c7f4713db527a3c2f9ec35a)
2009-06-11DRI2: Add missing front-buffer flush callback.Ian Romanick1-0/+8
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit d1e916d29be8b470cbc8cadcf6e83991fdbc5a9f)
2009-06-11DRI2: Don't leave empty entries in private->buffersIan Romanick1-8/+9
This should fix bug #21130. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit de1e43181bd670877b994db221ad8a04b5d63324)
2009-06-11DRI2: Synchronize the contents of the real and fake front-buffersIan Romanick1-0/+22
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 567cf67959b30432ae30f4851ec17b3a375ab838)
2009-06-11DRI2: Do not send the real front buffer of a window to the clientIan Romanick2-2/+32
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit f1a995d1496d73741731e32f475097c44a8da972)
2009-06-11DRI2: Add fake front-buffer to request list for windowsIan Romanick1-0/+40
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 aa2928325fe51d94a636dde9c090e8f54a311a12)
2009-06-11EDID: Add modes from Established Timings III descriptor to mode poolAdam Jackson3-4/+86
EDID 1.4, section 3.10.3.9 (cherry picked from commit 99e22b86c5f1a3653f3caaf01368a777d2b208d0)
2009-06-11EDID: 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 (cherry picked from commit a2c5ee36b21c2ee5c0468f1b251e74c1412dbecb)
2009-06-11vfb: 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(). (cherry picked from commit 45530d16097459a756696e255ab4e72d6e51fbc4)
2009-05-19xace: Fix a bad device access hook call.Eamon Walsh1-3/+3
Add a proper access mode, and reverse the logic of the return value. Zero ("Success") is returned on success from the hook calls. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> (cherry picked from commit 3cea176d5abcb0f14eefbdcbe17fed0847524dd4)
2009-05-11xselinux: Relax ownership restriction on SetSelectionUseContext.Eamon Walsh1-9/+0
Instead, clients should keep track of the selection instances they use. (cherry picked from commit 0952d12717031e9dda9e48123bb922d0f4e81834) Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
2009-05-08Don't leak default font path when appending built-insAlan Coopersmith1-2/+11
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 66539cc05d0b017b9feb4a038499907810140623) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Don't leak canonical module name and patterns if module is built-inAlan Coopersmith1-1/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 1c101d75d4855b2698e3fc8d2dd662f20585812f) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Xi: don't double-swap the XListDeviceProperties reply.Peter Hutterer1-7/+0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 50cc8adafca4ba3838d468278d6eb8a4692d2488) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Xi: fix copy/paste error causing sizeof against wrong struct.Peter Hutterer1-1/+1
This wrong check may cause BadLength to be returned to the client even if the length is correct. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 8b583ca2b21155359c6255f406c96599b277c762) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08os: don't malloc memory in LogVMessageVerb.Peter Hutterer1-16/+6
LogVWrite is limited to a buffer size of 1024, so we don't loose anything here by truncating. This way we can use LogVMessageVerb (and xf86Msg and friends) during signal handlers with the normal message types. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 0e0642ee9466d3268476d0084a83a9d93a4aa555) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08randr12: looking up these bits if randr isn't initialised is bad.Dave Airlie1-2/+4
When xinerama is enabled we don't get randr protocol, but the driver might still want randr internals (cherry picked from commit faf7dfa099f5b42a703313fbd1bf8afdad07a179) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Fix byte swapping of XF86VidMode{Get,Set}GammaRampAlan Coopersmith1-10/+6
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 7d0f7518c2235a9dc783029971259ddaada2db20) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Remove references to rgb.txt from files section of Xserver and Xorg man pagesJon TURNEY2-6/+0
The references to this file in the server code were removed in commit dda10c9066a660b647384179f82e1da8e063264f Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit d0dd649035fc3698c5b436f9d9d248116aa106a3) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Remove long-gone '-co' option from Xserver man pageJon TURNEY1-4/+0
The '-co' option was removed in commit dda10c9066a660b647384179f82e1da8e063264f Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit b0ad9e1ced9619f37acf77764c395c57b86cf463) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08XkbSetNamedIndicator should ignore SD's without LED'sAlan Coopersmith1-0/+2
When ProcXkbSetNamedIndicator is called on a core device, and we walk the slaves to set the LED's on each of them, ignore any slaves that do not have either a KbdFeedbackCtrl or LedCtrl structure. (This is much more critical in xserver-1.5-branch, where we walk *all* devices, not just the slaves of the specified master, and thus return failure when setting an LED on the Core Keyboard and hit a xf86-input-mouse device with no LED's to set.) Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 557dbadf3be273255e8fdb12d9321f4e88bf2b65) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08xserver 1.6.1.901xorg-server-1.6.1.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08dix: fix calculation of number of fake KeyRelease eventsPierre Ossman1-5/+9
Signed-off-by: Pierre Ossman <pierre@ossman.eu> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-05-08Xi: don't send XKB mapping notifications when XKB is disabledPierre Ossman1-1/+2
Signed-off-by: Pierre Ossman <pierre@ossman.eu> Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 01:31:13 +0000