summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2011-08-14XQuartz: Initialize darwin pointer valuatorsPelle Johansson1-2/+2
This fixes a regression introduced by: 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde http://xquartz.macosforge.org/trac/ticket/498 Signed-off-by: Pelle Johansson <pelle@morth.org> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-08-09Xephyr/dri: register screen and window privates on initJulien Cristau1-0/+4
Fixes assertion failure when calling dixSetPrivate Debian bug#632549 <http://bugs.debian.org/632549> Reported-and-tested-by: Mohammed Sameer <msameer@foolab.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-07-31Xquartz: include new localization files in the tarballJulien Cristau1-0/+9
Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-31XQuartz: xpr: Don't FatalError if xp_unlock_window failsJeremy Huddleston1-3/+6
We added the FatalError in 5d1d9d9ae39fab2ee2ac085f9776f82768828dc8 but it caused a regression http://xquartz.macosforge.org/trac/ticket/482 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-31XQuartz: Use CFSTR to avoid implicit cast warning of NSString * to CFStringRefJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-29Merge remote-tracking branch 'whot/for-keith'Keith Packard15-36/+62
2011-07-27Terminate the log with one last message.Peter Hutterer12-30/+30
Instead of just closing the log when everything is done, put one more message in stating that we're actually terminating. Users or scripts that look at the Xorg.log will then know that a) the server has terminated properly and b) why the server terminated (to some degree, given that most real-world errors will be caused by AbortServer()). Acked-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-27Initialize the fd to -1 for xorg.conf input devices.Peter Hutterer1-0/+3
For hotplugged devices, xf86AllocateInput does that for us but the xorg.conf path is different. Since not all drivers reset the fd during PreInit but may still call close(pInfo->fd) in all cases, this can terminate the logging early. Reproducible: add a wacom driver InputDevice section with no Option Device. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-07-27xfree86: NULL option values are technically valid, don't strdup themPeter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-07-27xfree86: duplicate xorg.conf device information before xf86NewInputDevicePeter Hutterer1-5/+27
xf86ConfigLayout.inputs contains the information from the xorg.conf file. Passing this into xf86NewInputDevice means the device will get cleaned up on exit and the pointers in xf86ConfigLayout.inputs are left dangling. In the second server generation, this results in a server crash. Also, rename pDev to pInfo. pDev is pretty much reserved for DeviceIntPtr types. Reproducible: AutoAddDevices off and xorg.conf input sections, trigger server regeneration. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-07-27xfree86: Remove devices that failed to enable on startupPeter Hutterer1-0/+1
Devices that succeeded during PreInit and DEVICE_INIT but failed in DEVICE_ON would be deleted through xf86DeleteInput but not removed from the list of input devices (and not turned off). The result was a double free on server shutdown. Fix this by calling RemoveDevice if EnableDevice fails. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-07-26Remove hw/xwin/xlaunchJon TURNEY23-3557/+1
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2011-07-19XQuartz: Localization updatesJeremy Huddleston90-32473/+42771
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-19XQuartz: Add english NIB changes for scroll_in_device_directionJeremy Huddleston3-108/+243
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-19XQuartz: Add GUI controls to toggle scroll_in_device_directionJeremy Huddleston2-2/+18
Also cleaned up the wording for fullscreen_menu. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-19XQuartz: Add a scroll_in_device_direction preferenceJeremy Huddleston3-12/+36
This preference allows users to override the related option in Mac OS X's Mouse/Trackpad preferences. This effectively lets the user determine which "context" all of X11 fits into for context-based scrolling until such API exists within X11 itself to pass along to X11 clients. This is applicable to Mav OS X 10.7+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-19XQuartz: Add diagnostic error checking to xp_destroy_surface.George Staplin1-1/+6
This occurred to me in hindsight after the last commit. If the original developer had done this, we would have noticed the problem sooner. (cherry picked from commit aa0a57996f3e7d16238f69976958c2526821388b)
2011-07-19XQuartz: Fix a memory leak with surfaces that a new test found.George Staplin1-11/+45
xp_destroy_surface was called with a surface id of 0, due to some premature cleanup that set it to 0. This means the surfaces weren't being destroyed until the window was. The code that did that was: pDRIDrawablePriv->sid = 0; In long running applications this leak may or may not have been harmful. With the old libGL the surfaces weren't destroyed until the context was destroyed or a new context created. In the new libGL they are reference counted, and released much sooner, so we ran into a resource leak more noticeably with some tests. Make the Apple DRI code dispatch events to the client(s) for destroyed surfaces, when a resource is destroyed. This seems to work in my tests, however this clearly wasn't working for a while, so bugs may result in the future if it enables some new (unexpected) side effects. Also add a few helpful comments to aid in understanding the code in the future. Tested with the test suite, Pymol, and various Mesa demos. (cherry picked from commit bede83eb19a1629396fcd5a46441f8476a8fcd1b)
2011-07-19XQuartz: DRI: Dead code removalJeremy Huddleston1-1/+14
Also add some comments that weren't merged in from server-1.4-apple's 99babae1326485c27eb9253db83afdd6aef9e362 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-18XQuartz: Add some sanity checking and a fallback for the bundle id.Jeremy Huddleston1-0/+5
This way we'll print an error and still mostly work rather than crashing if someone installs XQuartz.app incorrectly or tries running the server within the build system rather than the installed system. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-15XQuartz: DarwinEQFini doesn't return BoolJeremy Huddleston2-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-07XWinrc: replace hard coded section number with __filemansuffix__Gaetan Nadon1-1/+1
Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07glx: Remove a few lingering traces of __GLXscreen.GLXVersionJon TURNEY3-8/+4
The GLXversion member of the __GLXscreen struct is just cruft since commit ad5c0d9efa47476ed5cf75c82265c73919e468b4, when we started returning the minimum GLX version supported by all of the screens on the display, rather than the maximum version supported by the server. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin: Add -wgl option to XWin manpageJon TURNEY1-0/+4
Document the -[no]wgl options in the XWin manpage Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin: Add items to WGL AIGLX todoJon TURNEY1-2/+11
Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin: Report Window XIDs in Window debug messagesJon TURNEY2-13/+6
Report Window XIDs in Window create/destroy/reparent debug messages It's actually quite useful if you are trying to corrolate those events with what a client is doing... Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin: Add a flag to track which windows have been drawn to using WGL.Jon TURNEY5-2/+34
Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Fix some warnings in generated wrapper codeColin Harrison1-1/+1
Add a suitable cast to the generated code for glWinSetupDispatchTable() so it doesn't generate screeds of warnings Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Handle failure to get any fbconfigs more gracefully.Jon TURNEY1-3/+23
Handle failure to get any useful pixel formats for GLX fbconfigs more gracefully: If we didn't get any useful pixel formats from wglGetPixelFormatAttribivARB(), fall back to using DescribePixelFormat(). If that doesn't give us any useful pixel formats, fallback to software rendering. This works around a problem with Intel 845G drivers, where wglGetPixelFormatAttribivARB() doesn't seem to work as we expect it to... Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Don't spam log with wglwrap symbol resolution status at startupJon TURNEY1-8/+5
... instead just log if an attempt is made to call a wrapper for a function which didn't resolve Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Better handling of SetPixelFormat() failureJon TURNEY1-9/+17
Propagate and report the failure if SetPixelFormat() fails Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Improvements to glxWinErrorMessage() reporting in WGL GLX providerJon TURNEY1-5/+8
Request the message using languageID 0 (best effort), rather than only using language neutral messages Always report the numeric error code. Trim any trailing \r from FormatMessage() output Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07hw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbersJon TURNEY1-1/+15
Some graphics hardware supports hundreds of pixel formats, so adjust formatting in fbconfig dumper for 3 digit index numbers Also report the PFD_SUPPORT_DIRECTDRAW, PFD_DIRECT3D_ACCELERATED and PFD_SUPPORT_COMPOSITION flags introduced with aero Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-01Merge remote-tracking branch 'whot/for-keith'Keith Packard42-44/+76
2011-07-01input: free the EQ allocated memory on shutdown (#38634)Peter Hutterer14-5/+25
mieqFini() already does the right thing, but it needs to be called by the various DDXs and the XTest Extension. X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Acked-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01KDrive: Remove useless miPointerUpdateSprite callDaniel Stone1-1/+0
miPointerUpdateSprite is already called from mieqProcessInputEvents, so calling it by hand immediately after isn't massively helpful. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01DMX: Remove useless miPointerUpdateSprite callDaniel Stone1-3/+0
miPointerUpdateSprite is already called from mieqProcessInputEvents, so calling it by hand immediately after isn't massively helpful. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01XWin: Remove executable bit from headersDaniel Stone4-0/+0
Headers don't really need to be mode 0755. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01XKB: Add debug key actions for grabs & window treeDaniel Stone1-0/+15
Add four new private XKB actions for debugging: * PrGrbs: print active grabs to the log file * Ungrab: ungrab all currently active grabs * ClsGrb: kill clients with active grabs * PrWins: dump the current window tree to the log file To use these, you need to modify your XKB maps, e.g. the following to have Ctrl+Alt+(F9-F12) mapped to the above: - compat/xfree86: interpret XF86LogGrabInfo { action = Private(type=0x86, data="PrGrbs"); }; interpret XF86Ungrab { action = Private(type=0x86, data="Ungrab"); } interpret XF86ClearGrab { action = Private(type=0x86, data="ClsGrb"); } interpret XF86LogWindowTree { action = Private(type=0x86, data="PrWins"); } - symbols/pc: key <FK09> { type="CTRL+ALT", [ Return, XF86LogGrabInfo ] }; key <FK10> { type="CTRL+ALT", [ Return, XF86Ungrab ] }; key <FK11> { type="CTRL+ALT", [ Return, XF86ClearGrab ] }; key <FK12> { type="CTRL+ALT", [ Return, XF86LogWindowTree ] }; At the moment, this only works if the grabbing client continues to call AllowEvents, as the server does no event processing at all when a device is frozen. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-30Fix UTF-8 encodingMatěj Cepl25-35/+35
Report to find out all non-UTF-8 files created by cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then /bin/true else echo $FILE fi done >>report Signed-off-by: Matěj Cepl <mcepl@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> [Daniel: git am failed for me, so I redid it. The method listed in the commit message also failed, so I just used file/grep/iconv. The results are the same though.] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-30dri2: restore Screen->ConfigNotify on closeMarcin Slusarz1-0/+1
ConfigNotify is set by DRI2ScreenInit, but not restored to previous state on close. Fix it. (I'm preparing a patch for xf86-video-nouveau which detects GPU lockup after dri2 init and it needs to reinitialize dri2) Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-29Merge remote-tracking branch 'jturney/master'Keith Packard5-7/+93
2011-06-29Merge remote-tracking branch 'jbarnes/master'Keith Packard2-5/+4
2011-06-29Merge remote-tracking branch 'kibi/master'Keith Packard2-6/+5
2011-06-29Cygwin/X: Left-justify website link in About boxYaakov Selkowitz2-2/+2
Left-justify website link in About box. This is a cosmetic fix to make the About box display correctly when Windows is configured with a non-default DPI value Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Tested-by: Colin Harrison <colin.harrison@virgin.net>
2011-06-29Cygwin/X: Preserve client area size and position on Windows window style changeJon TURNEY3-5/+91
When the style changes, adjust the window size so the client area remains the same. Otherwise the window size may change when sizing is reflected from Windows to X, and some windows are drawn expecting them to be exactly the requested size (e.g. the gmplayer control window) Use DeferWindowPos to delay the resize to preserve client area on WM_STYLECHANGING until after the style change has actually happened in WM_STYLECHANGED As a consquence of this, we need to be more careful to create windows with exactly the requested placement and client area initially, so the client area matches what the X client requested Also synchronize the X windows idea of the placement of a window which Windows is allowed to place Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Tested-by: Colin Harrison <colin.harrison@virgin.net>
2011-06-29DRI2/GLX: use new swap event typesJesse Barnes2-5/+4
Use the new event types so we can pass a valid SBC value to clients. Fix up the completion calls to use CARD32 instead of CARD64 to match the new field size. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-06-28XQuartz: Fix Makefile dependenciesJeremy Huddleston1-1/+3
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables. This resulted in not relinking if some components were rebuilt (like libdix, libos, etc). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28XQuartz: 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>
2011-06-28Merge remote-tracking branch 'dbn/no-libxorg'Keith Packard7-50/+27
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 19:11:41 +0000