summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2011-06-29XQuartz: Make a call to activateIgnoringOtherApps in our ↵Jeremy Huddleston1-9/+16
NSApplicationActivatedEventType handler In addition, this change will not call into the X11 activation unless an X11 window was active when we deactivated. We can't rely on the event and current key windows because the key window will be nil until activated, and the event will only reference the window if the window was clicked (whereas it will be nil if we activated via dock or cmd-tab). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit c8b80a82d97d92d445c1c0af6dba42c9de7c56cd)
2011-06-17XQuartz: GLX: Use _glapi_create_table_from_handle to create out dispatch tableJeremy Huddleston1-1049/+30
This will allow XQuartz built on older systems to pickup capabilities on newer systems and prevent runtime failures when building on newer systems and running on older ones. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> This commit squashes three cherry-picks: (cherry picked from commit 3fa5d27e46ea8af55dcaaad7a99973c38bd11967) (cherry picked from commit feab04397de2684568dedaaaa8f299cac9f44f8b) (cherry picked from commit 34e2598f0ad247071bd6a4312d9014d6e3b2305a)
2011-06-17XQuartz: Add missing include for <pthread.h>Jeremy Huddleston1-0/+2
BuildFix for Leopard and earlier. https://trac.macports.org/ticket/29717 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit c3df4df40761760b281a21f63336ca955670f7bc)
2011-06-03XQuartz: GLX: Create a new dispatch table rather than modifying the existing oneJeremy Huddleston1-1/+11
Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b 0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684 1 X11.bin 0x00000001001315b0 DoCreateContext + 163 2 X11.bin 0x000000010013509f __glXDispatch + 211 3 X11.bin 0x00000001000c7dad Dispatch + 785 4 X11.bin 0x00000001000b97e5 dix_main + 1022 5 X11.bin 0x00000001000122bc server_thread + 50 6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331 7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13 http://lists.apple.com/archives/X11-users/2011/May/msg00045.html Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 38df706c6b8a339c4267cae7be0881c4362f36da)
2011-05-28linux: Retry VT ioctls while errno == EINTRAaron Plattner1-34/+49
When the smart scheduler is enabled, the VT ioctls (particularly VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs. Previously, this caused the server to immediately continue on to ScreenInit, almost certainly causing a crash or failure because the X server that owned the VT hadn't finished cleaning up. As of commit 7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError instead. Retrying the ioctl as long as it fails with errno == EINTR fixes the problem and allows server regenerations to trigger VT switches that actually succeed. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 88c4622b594a1725d0cee86bc82ad640d241c520)
2011-05-22XQuartz: Don't crash if CG increases our display resolutionJeremy Huddleston1-2/+3
miPaintWindow would cause fbFill() to overwrite pScreen's pixmap which was sized for the old resolution. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 1fb501ad1521cfedaa5cf3052d45a924ef1866cf)
2011-05-22XQuartz: RandR: Don't crash if X11 is launched while there are no attached ↵Jeremy Huddleston3-100/+117
displays If CG reports no displays when launching, we could crash in RandR. Instead, just provide a fake 800x600 display until we are notified about displays being attached. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 60af79e35ee8546a99d15a1358aac3deabfa22be)
2011-05-16XQuartz: Bump bundle version to 2.6.3Jeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-16XQuartz: RandR: Avoid over-releasing if we are unable to determine the ↵Jeremy Huddleston1-8/+11
current display mode. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 384eb45b944a4386eae74a5503423c13b5f2a659)
2011-05-16XQuartz: Don't call mieqEnqueue during server shutdownJeremy Huddleston2-11/+11
Found-by: GuardMalloc Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 25191648b8db87735a99243697f73036255c1eb6)
2011-05-13Make xorg.conf.example rule compatible with Solaris makeAlan Coopersmith1-1/+1
Solaris make won't substitute $< in explicit rules, only implicit ones Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> (cherry picked from commit 8d229c4cf9e5bde78373ef3dd32708817ac97152)
2011-05-13XQuartz: Don't call into CoreFoundation after fork() and before exec()Jeremy Huddleston1-3/+21
After fork()ing, we should just limit ourselves to setting up the environment, file descriptors, and exec()ing. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit c89a6f824eaf647d2b182f79fbd78f5bd1c3a27f)
2011-05-04XQuartz: Fix incorrect typedefs with XPLUGIN_VERSION < 4Jeremy Huddleston1-3/+3
Ok, this time for sure... how many brown bags can I fit over my face? Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0fc7ec6dd504aa03e1a1b18c60942c0c8c8b701b)
2011-05-04glx: Remove noop dispatch tableAdam Jackson1-9/+0
We can never hit this, because the indirect GLX dispatch code always forces a current context and checks that it's non-NULL before calling into the dispatch table. If it's _not_ null, then _glapi_set_context will call into the driver, which is responsible for calling _glapi_set_dispatch to make sure the dispatch table is non-NULL. Also remove _glapi_set_warning_func and friends, since we can no longer call them even from dead code. Reviewed-by: Dave Airlie <airlied@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit b0c665ac0fe6840dda581e4d0d0b76c703d62a7b)
2011-04-28XQuartz: BuildFix to build correctly with XPLUGIN_VERSION < 4Jeremy Huddleston1-12/+6
This fixes a regression introduced by d79cc14a51f3e8d4d2f66aad055092672cab1526 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0f284f0f42f26a242eb3153787f2e98b6b88dff8)
2011-04-27XQuartz: pbproxy: LP64: Fix itteration through XGetWindowProperty where ↵Emanuele Giaquinta1-3/+8
sizeof(long) != 4 http://xquartz.macosforge.org/trac/ticket/476 Signed-off-by: Emanuele Giaquinta <emanuele.giaquinta@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 72ed7551f494c61283a7ac3d7b570eac39cc9786)
2011-04-27XQuartz: Fix compilation warnings with XPLUGIN_VERSION >= 4Jeremy Huddleston2-2/+15
xprAppleWM.c:143: warning: initialization from incompatible pointer type xprAppleWM.c:144: warning: initialization from incompatible pointer type Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit d79cc14a51f3e8d4d2f66aad055092672cab1526)
2011-04-27XQuartz: Fix prototypes for thread functionsJeremy Huddleston3-5/+9
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 3960115dbc83ec1eb8d9c8e90466af3fa0b32abd)
2011-04-27XQuartz: Make the DarwinProcessFDAdditionQueue_thread wait 3 seconds to ↵Jeremy Huddleston2-16/+23
allow xinitrc to catch up Previously, we weren't always waiting the full three seconds. This should be better, but is still sub-optimal. We really want to start processing these once a WM has been started. http://xquartz.macosforge.org/trac/ticket/416 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 7524dbd06113ec081eaa882aa54e03553ccf96aa)
2011-04-07man: list the drivers that are ignored when hotplugging (#35209)Peter Hutterer1-3/+10
X.Org Bug 35209 <http://bugs.freedesktop.org/show_bug.cgi?id=35209> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Julien Cristau <jcristau@debian.org> (cherry picked from commit 6f46ae3c69c48f389560af1491ed1729ba45866f)
2011-04-07xfree86: allow to check for options without warnings in the logSimon Thum1-27/+48
This allows set_percent_option in synaptics to work as described, and should generally enable to check option syntax without log spam. Signed-off-by: Simon Thum <simon.thum@gmx.de> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 38ffeec0c89e83afc62579dec221c325d667cc1e)
2011-04-07fix percent options parsingSimon Thum1-1/+1
Signed-off-by: Simon Thum <simon.thum@gmx.de> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 2fbccc881bfab4bdc5b97f74a7e5bcec7fdeae20)
2011-04-04XQuartz: Bump bundle version to 2.6.2Jeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-04xfree86: loader: fix memory leaks in LoaderListDirsTiago Vignatti1-0/+6
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
2011-04-04xfree86: fix memory leak in xf86LoadModulesTiago Vignatti1-1/+3
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04xfree86: fix bad free configInputDevicesTiago Vignatti1-1/+2
introduced in 93ca526892c0d22afa05cce6496198c652043a19. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04xfree86: fix memory leaks in configLayoutTiago Vignatti1-6/+19
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04xfree86: fix memory leak in xf86ConfigFbEntityTiago Vignatti1-0/+1
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04xfree86: dri2: fix memory leak and free resources properlyTiago Vignatti1-2/+7
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-04-04xorg: remove unused pointer values all over the serverTiago Vignatti1-2/+2
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-28hw/dmx/doc: Update list of doxygen-generated filesJeremy Huddleston1-12/+135
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-27xfree86: print out which driver is about to be used.Peter Hutterer1-0/+2
Makes reading the log file a lot easier for those that don't magically recognise the log spew by the individual drivers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> (cherry picked from commit fad10cb38ef2433c82f8a43d3b7d64e323728060)
2011-03-27xfree86: block signals between EnableDevice and first CheckMotion()Peter Hutterer1-0/+3
Devices usually enable SIGIO processing in EnableDevice. CheckMotion initialises the pointer sprite, sends Enter/Leave events, etc. This leaves us with a small window where events may be processed without the sprite or pointer position (as seen from the protocol) is valid. Block signals during this window. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit 18413f55089623123537c1499b02aa95ca2014d2)
2011-03-27xfree86/common: Remove a configScreen leak when conf_screen is NULLErkki Seppälä1-1/+3
configScreen used a dynamically allocated buffer for XF86ConfScreenRec when conf_screen argument was NULL. This pointer was never stored anywhere, nor was it released, so this patch makes the function use automatically allocated storage in that situation. [ajax: minor grammar fix] Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> (cherry picked from commit a19771e4337d1c4600550314bbc42a1495a023ff)
2011-03-27Don'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> (cherry picked from commit 00779932de861bf7ac8c625802f1afed75d01b6f)
2011-03-14xfree86/modes: Fixed memory leak in xf86InitialConfigurationErkki Seppälä1-13/+8
There were two memory leaks in the function: one was the lack of free for "enabled", the other was the full lack of releasing anything when configuration was too small. The first issue was fixed by adding the missing free, the other was addressed by replacing the duplicate memory releasing sequences with one that is gotoed into. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 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> (cherry picked from commit d3adf2d9350bee4125107e2ea1ed0c51bb736562)
2011-03-10loader: 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> (cherry picked from commit 628d16a92a7fa556fbb70bf4a4adf57ec05c190b)
2011-03-09vbe: 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> (cherry picked from commit d8caa782009abf4dc17b945e325e83fda299a534)
2011-03-03XQuartz: pbproxy: Protect against possible collision between Cocoa and X11 ↵Jeremy Huddleston1-0/+2
Cursor types Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 69a9171dbbafd6a7db702d48770d28fb54717545)
2011-03-03XQuartz: Don't use deprecated CoreGraphics API on SL and LionJeremy Huddleston1-1/+26
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0343aed1f082baf4bfbd730c1c3582f1410b8741)
2011-03-03XQuartz: 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> (cherry picked from commit 8cf3348e90846f5b04236479042228fb98ac8f70)
2011-03-03XQuartz: 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> (cherry picked from commit 968652983f8e6ae6889b48e15f4098ff6ad4a15a)
2011-03-03XQuartz: 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> (cherry picked from commit 13578b852b7631f99cf1fd5e2e5469edc5aae369)
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 19:32:00 +0000