summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2011-03-08dix: Remove usage_hint from pixmaps, store it in ->drawable.classAdam Jackson9-21/+18
The class field was unused for pixmaps, and we don't have enough classes to justify a whole uint32 anyway. Reviewed-by: Soren Sandmann <ssp@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
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-03Merge remote branch 'whot/for-keith'Keith Packard5-48/+114
2011-03-03Merge remote branch 'jeremyhu/master'Keith Packard10-11/+94
2011-03-03Merge remote branch 'rjy/clientids'Keith Packard1-0/+1
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-02-28Merge branch 'next' into for-keithPeter Hutterer4-46/+110
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-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-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 Nicholson3-10/+11
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 Nicholson1-1/+2
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-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-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 Packard5-107/+50
2011-02-23Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct"Keith Packard3-115/+65
This reverts commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc.
2011-02-23Revert "randr: Add sprite position transforms"Keith Packard5-97/+12
This reverts commit 66294afcab7b7a82f7dd897767e46c48a94b8ee8.
2011-02-23Revert "randr: Implement RRSetCrtcConfigs"Keith Packard1-1/+0
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 Packard3-109/+4
This reverts commit 82612045e11f2b882ae132e184a9629f43f1c424.
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 Packard1-2/+2
This reverts commit a88d70fb20a2bc3152b84adff4380857e6cfadf5.
2011-02-23Revert "Separate out screen size and screen pixmap sizes in RRScreenSizeSet"Keith Packard2-80/+31
This reverts commit 752c368421c1c824752cf467fba9318d75d2ca2c.
2011-02-23xfree86: If the driver found modes on an output, don't add moreAdam Jackson1-1/+9
Inferring modes from sync ranges is only valid if the monitor says it's valid. If the monitor says it's valid, then we'll have already added those modes during EDID block parse. If it doesn't, then we should believe it. If there's no EDID for an output, but sync ranges from the config, we'll still add default modes as normal. Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-1/+1
glxvendor.c: In function ‘__glXVForwardPipe0WithReply’: glxvendor.c:205:10: warning: ‘be_buf’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-2/+2
glxvendor.c: In function ‘__glXVForwardAllWithReply’: glxvendor.c:284:10: warning: ‘be_buf’ may be used uninitialized in this function glxvendor.c:285:10: warning: ‘be_buf_size’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-1/+1
glxsingle.c: In function ‘__glXForwardPipe0WithReply’: glxsingle.c:218:10: warning: ‘be_buf’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-2/+2
glxsingle.c: In function ‘__glXForwardAllWithReply’: glxsingle.c:300:10: warning: ‘be_buf’ may be used uninitialized in this function glxsingle.c:301:10: warning: ‘be_buf_size’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-0/+1
glxsingle.c: In function ‘__glXDisp_ReadPixels’: glxsingle.c:760:11: warning: ‘buf’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-54/+0
render2swap.c:264:13: warning: ‘swapArray’ defined but not used Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-1/+1
glxcmds.c: In function ‘CreateGLXPixmap’: glxcmds.c:1663:20: warning: comparison between pointer and integer glxcmds.c:1663:38: warning: comparison between pointer and integer Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-0/+1
glxcmds.c: In function ‘CreateGLXPixmap’: glxcmds.c:1641:22: warning: ‘pGlxScreen’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-2/+2
glxcmds.c: In function ‘CreateContext.clone.6’: glxcmds.c:105:19: warning: ‘be_fbconfigId’ may be used uninitialized in this function glxcmds.c:104:14: warning: ‘be_vid’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-24/+18
glxcmds.c: In function ‘__glXGetDrawableAttributes’: glxcmds.c:3295:8: warning: ‘screen’ may be used uninitialized in this function glxcmds.c:3298:8: warning: ‘attribs_size’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23glxproxy: warning fixAdam Jackson1-19/+12
glxcmds.c: In function ‘__glXChangeDrawableAttributes’: glxcmds.c:3464:8: warning: ‘screen’ may be used uninitialized in this function Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-02-23xfree86: Fix undefined reference to `XNFsprintf' on sparc.Cyril Brulebois1-1/+1
Build failure on sparc: | copying selected object files to avoid basename conflicts... | CCLD Xorg | ./.libs/libxorg.a(xf86sbusBus.o): In function `xf86SbusConfigureNewDev': | […]/hw/xfree86/common/xf86sbusBus.c:712: undefined reference to `XNFsprintf' | collect2: ld returned 1 exit status Fix typo introduced in: 3a9bb93dd178084f4ff1abcea331ca5a62f88ce6 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Apologized-for-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-02-23Merge branch 'mi-cleanup' into nextPeter Hutterer19-220/+272
2011-02-22xfree86: update GetMaster check for the VCP.Peter Hutterer1-4/+2
Same result, but now also triggers on slave keyboards that send pointer events. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2011-02-22xfree86: replace two inputInfo.pointer uses with device loops.Peter Hutterer2-14/+59
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
2011-02-18Merge remote branch 'whot/for-keith'Keith Packard1-1/+1
2011-02-18Replace malloc with calloc to initialize the buffers[] as NULL in ↵Justin Dou1-1/+1
do_get_buffers function The calling for allocate_or_reuse_buffer may fail due to some reason, e.g. out of memory. If the buffers[] were not initialized to be NULL, the following err_out may try to access an illegal memory, which will cause X crash afterward. Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Justin Dou <Justin.Dou@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 10:00:25 +0000