summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-04vbe: Fix malloc size bugAdam Jackson1-1/+1
v2: Slightly more obvious sizing math. ==14882== Invalid write of size 2 ==14882== at 0x6750267: VBEGetVBEInfo (vbe.c:400) ==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) ==14882== by 0x471895: InitOutput (xf86Init.c:519) ==14882== by 0x422778: main (main.c:205) ==14882== Address 0x4f32fa8 is 72 bytes inside a block of size 73 alloc'd ==14882== at 0x4A0640D: malloc (vg_replace_malloc.c:236) ==14882== by 0x675024B: VBEGetVBEInfo (vbe.c:398) ==14882== by 0x6142064: ??? (in /usr/lib64/xorg/modules/drivers/vesa_drv.so) ==14882== by 0x471895: InitOutput (xf86Init.c:519) ==14882== by 0x422778: main (main.c:205) Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-03-03loader: Don't distribute sdksyms.c and make it depend on the configKeith Packard1-3/+6
sdksyms.c is constructed by processing header files with the C preprocessor. Its contents will vary depending on the precise configuration options, and so must depend on the config header files. We have one header file which is always changed when any config option is modified called do-not-use-config.h (which may want a different name at some point), so make sdksyms.c depend on that file. Also, we don't want to ship this file; it always needs to be built. So, include it in the nodist_libloader_la_SOURCES list to prevent it from being added to the tarball. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2011-03-03configure.ac: bump version for 1.11 developmentJulien Cristau1-2/+2
Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-03-03Merge remote branch 'whot/for-keith'Keith Packard46-750/+875
2011-03-03Merge remote branch 'jeremyhu/master'Keith Packard12-13/+100
2011-03-03Merge remote branch 'sandmann/for-keithp'Keith Packard10-518/+151
2011-03-03Merge remote branch 'rjy/clientids'Keith Packard11-42/+425
2011-03-01XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 ↵Jeremy Huddleston1-0/+2
Cursor types Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-01Delete RegionClipSpans()Søren Sandmann Pedersen2-244/+0
Nothing uses it. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Søren Sandmann Pedersen <ssp@redhat.com>
2011-03-01xext: Remove XCALIBRATE extensionAdam Jackson4-318/+0
Nobody can have been using this, it's never called from extension init. XI2 device properties should now be a functional replacement. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-28Merge branch 'next' into for-keithPeter Hutterer40-428/+649
Conflicts: dix/devices.c Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-27XQuartz: Don't use deprecated CoreGraphics API on SL and LionJeremy Huddleston1-1/+26
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-27Revert "rootless: Remove ROOTLESS_WORKAROUND"Jeremy Huddleston2-2/+6
Christof Wolf has reported a regression that seems to be caused by this change, so reverting the change in the 1.9 branch. We'll investigate a proper fix in master for 1.10. This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-28Don't clobber input device options from xorg.confMatthieu Herrb1-2/+4
Since commit b8d9c5ff removed commonOptions, we now need to append the "Core{Keyboard,Pointer}" options to the existing list. Fixes passing options to devices confirured in xorg.conf on systems where autoaddevices is false. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-27XQuartz: RandR: Add RandR modes for the primary display in multi-monitor configsJeremy Huddleston2-10/+7
We now support using RandR to set the resolution of the primary display (and place a shielding window on other displays) in multi-monitor configurations. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-27XQuartz: RandR: Provide an alert box when entering a RandR mode for the ↵Jeremy Huddleston4-0/+36
first time. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-27XQuartz: RandR: Capture the display when switching modes with RandRJeremy Huddleston5-0/+23
This will prevent native windows from resizing as we change resolutions. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-26Implement fbAddTriangles() in terms of pixman_add_triangles()Søren Sandmann Pedersen1-82/+9
This allows the remaining triangle-to-trap conversion code to be deleted. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2011-02-26Move miTriangles to fb as fbTriangles()Søren Sandmann Pedersen7-157/+90
The fb version simply calls the new pixman_composite_triangles(). This allows us to get rid of miCreateAlphaPicture(). Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2011-02-26Move miTrapezoids() into fb as fbTrapezoids()Søren Sandmann Pedersen6-75/+92
The main consumer of trapezoids, cairo, is using the Trapezoids request, which is currently implemented in the miTrapezoids() function. That function splits the request into smaller bits and calls lower level functions such as AddTrap. By moving the implementation of the whole request into fb, we can instead call pixman_composite_trapezoids() to do the whole request in one step. There are no callers of miTrapezoids in any of the open source drivers, although exa and uxa have their own copies of the function. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2011-02-26Require pixman 0.21.6Søren Sandmann Pedersen1-1/+1
The following patches need pixman_composite_trapezoids() and pixman_add_triangles(). Signed-off-by: Soren Sandmann <ssp@redhat.com>
2011-02-25Version bumped to 1.10Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-25input: Ensure Valuator axes are aligned as neededKeith Packard1-6/+8
Let the compiler figure out the correct alignment for the axes data for a valuator by using a union to force double alignment of the initial ValuatorClassRec structure in the allocation. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-02-25hw/dmx/doc: Add explicit dependency for all doxygen output filesKeith Packard1-24/+39
Instead of listing one of the doxygen output files and depending on sequential execution to ensure that the other files were present before make checked for them, create explicit dependencies so that make will not check for the additional files until after doxygen has been run. This allows parallel make to work correctly in this directory. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net>
2011-02-25hw/xwin: Look for gl spec files in $(srcdir) or .Keith Packard1-2/+2
Tarballs include the downloaded gl spec files, which will end up in $(srcdir). But, git-based builds will not have them at all and will need to download them from opengl.org. They'll land in in the build directory instead of $(srcdir), and so we need to allow them to be in either place. This change checks for the files in $(srcdir), linking them to . if present. Otherwise, it downloads them from opengl.org. A suggested better solution is to have Mesa install these files somewhere. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net>
2011-02-25dmx: Construct paths in doxygen.conf to fix VPATH buildsDan Nicholson4-10/+12
The paths in doxygen.conf assumed that srcdir=builddir and broke otherwise. Use autoconf to fill in the paths to the srcdir so that the files can be found when users have a separate build directory (as with distcheck). Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
2011-02-25xfree86: Allow sdksyms.dep to be included portablyDan Nicholson2-1/+4
Non-GNU makes don't deal with the sinclude or -include variants that allow Makefile stubs to be created and then included during the build. Instead, create an empty file at the end of configure so that the regular include statement can be included. This is how automake handles automatic source dependencies. In order to trick automake into not processing the include statement, a variable is used. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-02-24Version bumped to 1.9.99.903 (1.10 RC3)Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-25dix: release all buttons and keys before reattaching a device (#34182)Peter Hutterer1-0/+42
Testcase: xinput float <keyboard name> results in the keyboard's enter key being repeated as the device is detached while the key is still physically down. To avoid this, release all keys and buttons before reattaching the device. X.Org Bug 34182 <http://bugs.freedesktop.org/show_bug.cgi?id=34182> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org>
2011-02-24Merge remote branch 'jeremyhu/master'Keith Packard10-245/+893
2011-02-24xfree86: Bump video ABI to 10.0Keith Packard1-1/+1
RandR 1.4 revert changed things Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929)Michel Dänzer1-4/+5
If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy pitch to that instead of to a possibly bogus value derived from the new width. This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes https://bugs.freedesktop.org/show_bug.cgi?id=33929 . On the other hand, the system memory copy doesn't need the pitch to be aligned beyond the PixmapBytePad of the width. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Acked-by: Cyril Brulebois <kibi@debian.org> Tested-by: Cyril Brulebois <kibi@debian.org> Reported-by: Thierry Vignaud <thierry.vignaud@gmail.com> Tested-by: Thierry Vignaud <thierry.vignaud@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24XQuartz: Localization UpdatesJeremy Huddleston9-245/+891
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-24XQuartz: Add LSApplicationCategoryType key to Info.plistJeremy Huddleston1-0/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-24Merge remote branch 'kibi/master'Keith Packard1-1/+1
2011-02-24Removing unused codeAlexandr Shadchin2-13/+1
In OpenBSD removed support PCCONS in 2002 year http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2 Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24Merge remote branch 'ajax/for-keithp'Keith Packard8-113/+57
2011-02-24record: avoid crash when calling RecordFlushReplyBuffer recursivelyErkki Seppälä1-1/+5
RecordFlushReplyBuffer can call itself recursively through WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts when the recording client's buffer cannot be completely emptied in one WriteClient. When a such a recursion occurs, it will not be broken out of which results in segmentation fault when the stack is exhausted. This patch adds a counter (a flag, really) that guards against this situation, to break out of the recursion. One alternative to this change would be to change _CallCallbacks to check the corresponding counter before the callback loop, but that might affect existing behavior, which may be relied upon. Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-25include: document list interface.Peter Hutterer1-2/+180
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-02-23Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct"Keith Packard3-115/+65
This reverts commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc.
2011-02-23Revert "Require RandR protocol version 1.4 or newer"Keith Packard1-1/+1
This reverts commit c8bc25fd7629df10f2825b7cc713b031ae78f223.
2011-02-23Revert "randr: Add sprite position transforms"Keith Packard11-333/+46
This reverts commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8.
2011-02-23Revert "randr: Implement RRSetCrtcConfigs"Keith Packard6-750/+44
This reverts commit d94a035ea9eb3167fc4f35b2d9f0d53f8807014c.
2011-02-23Revert "hw/xfree86/modes: Add optional driver API for RRSetCrtcConfigs"Keith Packard2-163/+28
This reverts commit 86c489c319c705f710bee3897fe27600ce15008e.
2011-02-23Revert "randr: Add per-crtc pixmaps"Keith Packard11-355/+20
This reverts commit 82612045e11f2b882ae132e184a9629f43f1c424.
2011-02-23Revert "randr: Hook up the new RandR 1.4 functionality"Keith Packard3-139/+1
This reverts commit afb6ebf1d5829346c40fe1053c9f50afe926e6c6.
2011-02-23Revert "DIX is responsible for ref counting scanout pixmaps."Keith Packard1-0/+4
This reverts commit 96b4d4787bf82edd9d06eb9a6e94bc45412c7df2.
2011-02-23Revert "Set sprite transforms from RRSetCrtcConfigs"Keith Packard4-33/+27
This reverts commit a88d70fb20a2bc3152b84adff4380857e6cfadf5.
2011-02-23Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"Keith Packard6-96/+41
This reverts commit 752c368421c1c824752cf467fba9318d75d2ca2c.
2011-02-23Revert "ProcRRSetCrtcConfigs uses 'configs' without being initialized"Keith Packard1-2/+2
This reverts commit b0f4bd61f0caf80f3be9a176f1f7a707bc6628d8.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 13:30:16 +0000