summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-07-31Bump release number to 1.6.3xorg-server-1.6.3Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-29Remove hardcoded gcc -Wall option from configure.acAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 442967c90dd9d8483a56bdc9237c49e33d619126)
2009-07-29selinux: Only activate if policy says to be an object managerAdam Jackson1-0/+4
(cherry picked from commit 283a081572d8db787c77d09e5ba6bcadebf4f7fe)
2009-07-29quirk: use first detailed timing as preferred for PEA prod 9003 (rh#492359)Ben Skeggs1-0/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 048697ccfa31cf7f7a29afa90a2f702d43efb7d4)
2009-07-29config: add HAL error checksRémi Cardona1-10/+22
This patch simplifies error handling in the HAL code and fixes a segfault if libhal_find_device_by_capability() failed. Fixes http://bugs.gentoo.org/278760 Based on a patch by Martin von Gagern <Martin.vGagern@gmx.net> Signed-off-by: Rémi Cardona <remi@gentoo.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit b1c3dc6ae226db178420e3b5f297b94afc87c94c)
2009-07-29Don't printf NULL pointers on HAL connection errorAlan Coopersmith1-3/+6
Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9)
2009-07-26Bump to version 1.6.2.901 (1.6.3 RC1)xorg-server-1.6.2.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26xfree86: move didLock assignment down to where the function pointer is valid.Dave Airlie1-1/+1
crtc->funcs->lock is NULL, so it's no use calling it here. Move it down so it's actually defined before we use it. Introduced with 6f59a8160042ea145514fdcb410f17f33fd437c2. Tested-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 0de58c88aba7ddd69b04f24ab5b2967c359aa69e) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: fix operation order so that rotation+transform worksBenjamin Defnet1-3/+3
The matrix multiply to combine rotation and projective transforms was being done in the wrong order. Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit b2bf67b61c564a4b92a429ca9ad455403161f33a) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26hw/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> (cherry picked from commit 6f59a8160042ea145514fdcb410f17f33fd437c2) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: Nuke broken set_origin shortcutMatthias Hopf1-13/+0
Shortcut is impossible to implement this way, because we don't know for sure whether the crtc of an output has changed or not. (cherry picked from commit cadf65a6e190a8952ad3cc216dc9ea55241de91a) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26randr: fix server crash in RRGetScreenInfoJulien Cristau1-2/+3
We don't return rates to randr < 1.1 clients, so don't allocate space for them. This fixes a FatalError due to not all allocated space being used. X.Org bug#21861 <http://bugs.freedesktop.org/show_bug.cgi?id=21861> Reported-by: Guillaume Quintin <coincoin169g@gmail.com> Signed-off-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 12e725d08b4cf7dbb7f09b9ec09fa1b621156ea9) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26Replace dixLookupResource by dixLookupResourceBy{Type,Class}Keith Packard21-94/+161
dixLookupResource attempted to automatically detect whether the caller wanted a lookup by-type or by-class, unfortunately, it guessed wrong for RT_NONE. Instead of trying to make the guess better, this patch just reverts the unification and creates separate functions for each operation. (cherry picked from commit f8dd80d13bb5313a11b38b280f8ad3e22f0a6300) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26One = is more than adequate here. Make is sh safe.Robert Noland1-2/+2
(cherry picked from commit b3e3154cce47add97f5561088036ce3b9e7dc937) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26configure: libXinerama isn't needed anymoreRémi Cardona1-1/+1
since libXinerama commit 90d4d23bf2e94721149ddc0a80093b10a82e8845 and xineramaproto commit 21477147613c28c968b5e1eb9d8aea7017dd399d, the server no longer needs libXinerama. Signed-off-by: Rémi Cardona <remi@gentoo.org> (cherry picked from commit 2c69deb92e11542f615df0f24fdc03e3b4415475) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26EXA: Only pass CT_YXBANDED to RECTS_TO_REGION() if that is really true.Michel Dänzer1-1/+11
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=22642 . (cherry picked from commit 35758544813f156eaac28844e693b2a28f6de316) Signed-off-by: Keith Packard <keithp@keithp.com>
2009-07-26Fix key repeat problem.Kim Woelders1-1/+1
Signed-off-by: Kim Woelders <kim@woelders.dk>
2009-07-09xdmcp: Don't crash on X -query with more than 255 IP addresses. (#20675)Adam Jackson1-1/+3
You could be more clever than this, but the wire protocol says this really is an array of not more than 255 ARRAY8, so it's not just a matter of changing the types. (cherry picked from commit 0eb19f9437b7d8c19592e49eedb028771d300d80)
2009-07-08Fix build of drivers with 1.6.2 when not using --install-libxf86configAlan Coopersmith1-6/+2
c859b736d1d23c5dc2f53958b1e76660e6d45018 removed duplicate entries for these from the Makefile, but removed a different set than was done in master branch, causing xf86Parser.h to not be installed, which in turn breaks the build of drivers like -ati, -intel & -nv that use xf86Modes.h, which includes xf86Parser.h Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Keith Packard <keithp@keithp.com>
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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 02:55:54 +0000