Commit graph

473 commits

Author SHA1 Message Date
Jeremy Huddleston
d42523cc77 XQuartz: More localization updates
(cherry picked from commit 7fbe974246)
2009-06-19 21:16:46 -07:00
Jeremy Huddleston
b2ffbfd930 XQuartz: AIGLX dispatch table cleanup
This should fix some issues when building on different versions of OSX.  We only use extensions that OpenGL.framework's glext.h header tells us are supported.
(cherry picked from commit e10c53421f)
2009-06-06 22:24:03 -07:00
Jeremy Huddleston
dbea4c04df XQuartz: Default to forcing the dialog box before quitting.
This will show the quit dialog for users of other WMs.
(cherry picked from commit 639ee0c913)
(cherry picked from commit 09432fa5b1)
2009-06-06 22:23:43 -07:00
Jeremy Huddleston
eecbd596fe XQuartz: English localization update for HIG compliance
(cherry picked from commit 86b319d7cb)
2009-05-29 11:44:49 -07:00
Jeremy Huddleston
247e70e21b XQuartz: More localization updates
(cherry picked from commit b107390c9f)
2009-05-27 10:08:47 -07:00
Jeremy Huddleston
71a4dcb1d8 XQuartz: pbproxy standalone: added missing variable declarations.
(cherry picked from commit 2d947d17a3)
2009-05-09 11:39:09 -07:00
Jeremy Huddleston
6904f0cb80 XQuartz: Localization update
(cherry picked from commit 9435fc5e20)
2009-04-22 19:30:25 -07:00
Jeremy Huddleston
5d8caf5b9f XQuartz: Make sure the bgMouseLocationUpdated state is consistent
(cherry picked from commit 8fa8a8e1db)
2009-04-22 19:30:14 -07:00
Jeremy Huddleston
428b463b78 XQuartz: Use correct values for ProximityIn and ProximityOut
This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c2)
2009-04-11 17:26:25 -07:00
Jeremy Huddleston
e63eb56e62 XQuartz: Solve the tablet 100% CPU bug
This happened because we put a byte in the fd to wake up dispatch, but we never actually enqueued anything in mieq because the num_events was 0.
(cherry picked from commit c21ca7558d)
2009-04-11 17:25:23 -07:00
Jeremy Huddleston
1a1e46d701 XQuartz: Re-enable background window checking
since that code was not the culprit for the wacom tablet, background 100% CPU bug
(cherry picked from commit fc1dc5d71b)
2009-04-11 17:23:01 -07:00
Jeremy Huddleston
0e32904f16 XQuartz: Only set MotionNotify on activation if it is updated.
(cherry picked from commit ae8077a251)
2009-04-11 17:22:49 -07:00
Jeremy Huddleston
7add477ffe XQuartz: Make sure the Fn doesn't trigger unneccessary calls to DarwinUpdateModKeys()
(cherry picked from commit 70a18558c6)
2009-04-11 17:22:37 -07:00
Jeremy Huddleston
55878a78c0 XQuartz: Re-enable Fn as an option for 3button mouse simulation.
Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5)
2009-04-11 17:22:16 -07:00
Jeremy Huddleston
64d82c7d16 XQuartz: xprSetWindowLevel updated to store the level requested by the WM
(cherry picked from commit c28c2ddc3a)
2009-04-10 00:48:31 -07:00
Jeremy Huddleston
d6b413a8ba XQuartz: Update window levels when changing rootless state
(cherry picked from commit 1359ded5bf)
2009-04-10 00:47:39 -07:00
Jeremy Huddleston
192be8e4f9 XQuartz: Fix window levels for rooted mode to allow showing the menu bar.
(cherry picked from commit 80759a4186)
2009-04-10 00:47:27 -07:00
Jeremy Huddleston
886f8b6af3 XQuartz: Properly set the window level for the root window
(cherry picked from commit bdf9286d1c)
2009-04-10 00:47:15 -07:00
Jeremy Huddleston
137db09a35 XQuartz: Properly set the menu bar and hotkey state when changing rootless mode.
Currently no code path exhibits the broken behavior since we only toggle into rootless if we don't have the root.
(cherry picked from commit 970f100ca3)
2009-04-10 00:47:02 -07:00
Jeremy Huddleston
fed3bbdc61 XQuartz: In rooted mode, make sure we start in the hidden state.
(cherry picked from commit 5ecc497f71)
2009-04-10 00:46:47 -07:00
Jeremy Huddleston
e221c4e398 XQuartz: Send MotionNotify before button presses when X11 is in the background
(cherry picked from commit c80d0ec18e)
2009-04-10 00:46:35 -07:00
Jeremy Huddleston
3644e9d1a5 XQuartz: Revert most of the previous override redirect patch
The changes actually caused all windows to move to the current space.  Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142)
2009-04-10 00:46:22 -07:00
Jeremy Huddleston
f0c80564e6 XQuartz: Use updated Xplugin API to send overide-redirect windows to the current space when they're ordered in
This fixes the annoying "using a menu moves me to another space" bug
(cherry picked from commit 9e6dab89e0)
2009-04-05 16:32:11 -07:00
Jeremy Huddleston
c5eef1e95b XQuartz: Send a MotionNotify event for the mouse cursor when activating X11.app
Otherwise if X11.app was activated with a mouse click, the location of the even is the last location of the cursor before X11 was deactivated
(cherry picked from commit c7457d7b31)
2009-04-05 16:32:03 -07:00
Jeremy Huddleston
3c80f6214a XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
(cherry picked from commit f393fb686c)
2009-04-01 13:53:13 -07:00
Jeremy Huddleston
bbab36899e XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
(cherry picked from commit 49871e9917)
2009-04-01 13:53:01 -07:00
Jeremy Huddleston
c7b56dd9c9 XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
(cherry picked from commit 276ee3bb08)
2009-04-01 13:52:48 -07:00
Jeremy Huddleston
bd40a10350 XQuartz: Don't report mouse events while X11 is not the foreground application
(cherry picked from commit 5d1dd35096)
2009-03-31 18:12:40 -07:00
Jeremy Huddleston
faef10ec17 XQuartz: Fix mouse tracking for quake, et. al. in wine
Patch courtesy of Codeweavers

Fix mouse movement tracking.  For a non-window-related mouse-move event,
calculate the new position by adding the event's delta-x and delta-y values
to the previous mouse position.  Do not rely on the current mouse position
because it may have been changed by a XWarpPointer call.
(cherry picked from commit 7a67935b05)
2009-03-30 20:41:29 -07:00
Jeremy Huddleston
da8b2891a1 XQuartz: Implement SendPSN for AppleWM
(cherry picked from commit 779e9fdc2d)
2009-03-04 13:40:35 -08:00
Jeremy Huddleston
ccf5f7bc07 XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
(cherry picked from commit 3e2427e6e9)
2009-02-26 21:25:13 -08:00
Jeremy Huddleston
dd787b6638 XQuartz: Re-enable support for capslock
(cherry picked from commit 4901b8147e)
2009-02-24 23:13:42 -08:00
Jeremy Huddleston
955e0fe68d XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations
(cherry picked from commit 1d479fa4f3)
2009-02-24 22:21:05 -08:00
George Staplin
d3120241f9 XQuartz: GL: Change from xalloc to xcalloc to potentially avoid
uninitialized data in the __GLXAquaContext.
2009-02-21 22:33:10 -07:00
George Staplin
c7e3383309 XQuartz: GL: Fix a bug with an uninitialized GLX data structure.
This was causing a crash randomly, due to random memory contents.
Use xcalloc to prevent this in the future, due to future changes or mistakes.

Set the drawableType to include GLX_PIXMAP_BIT and GLX_PBUFFER_BIT.
The new libGL supports these.

Set the max Pbuffer width/height, based on the results of a test program.
We may someday want to revisit this depending on what users need, so that
we create a CGLContextObj, make it current, and call glGetIntegerv to
gather the information at runtime.
2009-02-21 22:22:52 -07:00
George Staplin
295fe25bd8 XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH.
It had a copy and paste mistake that I didn't notice. :/
It was using the CreatePixmapReq.

Also add a missing B16 to the end of the length for the DestroyPixmapReq struct.

Now the AppleDRIDestroyPixmap request seem to work.
2009-02-18 21:43:19 -07:00
Jeremy Huddleston
066b17028a XQuartz: Don't need GlxSetVisualConfig any more
Fixes build failure resulting from 516f8e2cad
2009-02-17 23:24:25 -08:00
George Staplin
7e99b55651 XQuartz: Add driWrap.h that I missed in the last commit.
This should complete the GLXPixmap commits for now.
2009-02-16 17:33:19 -07:00
George Staplin
630518766b XQuartz: Add support for GLXPixmaps to the AppleDRI.
This involved wrapping some GCOps to get the proper behavior
when using X11 raster ops mixed with OpenGL (see driWrap.c).

This extends the AppleDRI protocol with create and destroy pixmap
functions.

The dri.c code has been extended quite a bit to enable this, and
to initialize the wrapping of CreateGC for GCOps.

This has been tested with tests/glxpixmap and proven to work with
the new libGL.  Existing applications seem to work fine too. Redraws
all appear to be correct.

There may be some bugs lurking that I haven't found yet.  I plan
to drive them out by extending the libGL test suite.
2009-02-16 17:22:18 -07:00
Jeremy Huddleston
eea42726b1 XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder
(cherry picked from commit 8b607c9c50)
2009-02-12 15:45:23 -08:00
George Staplin
58c4116c47 XQuartz: xpr: The dri.c code for pixmaps was wrong in several ways. They weren't
being exported correctly by Xplugin.

This should fix a bug with the surface for a window, when an export fails.
Before the export could fail and leave behind an invalid (freed) pointer in the dix privates.

I have an idea of how to fix the GLXPixmaps now without using CGLSetOffScreen.

This work is a step towards that.  The Xplugin will need a small patch to fix an
issue that this change brought forth.
2009-02-06 12:55:09 -07:00
Jeremy Huddleston
0d5dd1501a XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f29665573)
2009-02-03 10:04:18 -08:00
Jeremy Huddleston
0dbc356795 XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
(cherry picked from commit 8620579483)
2009-02-02 12:34:49 -08:00
Jeremy Huddleston
fd08be749e XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
(cherry picked from commit e01662cadc)
2009-02-01 15:12:50 -08:00
George Staplin
143224405b XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks. 2009-01-26 03:02:38 -07:00
Jeremy Huddleston
b57cb05c69 XQuartz: SnowLeopard: Help system book name changed in 10.6 2009-01-16 19:26:07 -08:00
Jeremy Huddleston
f020900641 XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation 2009-01-15 20:57:42 -08:00
George Staplin
9cf264e677 XQuartz: xpr: Cleanup some of the code and possibly fix part of the GLX Pixmap problem.
Split DRICreateSurface into 3 functions.

Make CreateSurfaceForPixmap use xp_configure_surface.  I suspect this is partly why
GLXPixmaps never worked.

It will require some more work and thoughts for pbuffers, unless we fake those with
pixmaps and surfaces.
2009-01-12 19:30:43 -07:00
George Staplin
d514152195 XQuartz: GL: Make indirect.c build and work in the 1.6 branch.
Reorder some header files and provide some types earlier on.

Remove the static __GLXextensionInfo __glDDXExtensionInfo; that isn't
used in 1.4 or 1.5, and seems to have been removed from 1.6.  Remove
the data structures associated with that too.

Remove __glXAquaDrawableResize.  The GLX structure doesn't use
it anymore, and the Apple version did nothing useful before.

__glXAquaDrawableSwapBuffers(): base no longer contains a drawGlxc
member.  Now provide the the Apple/Aqua context in the __GLXAquaDrawable
struct.  Add the context member to the __GLXAquaDrawable struct.

Remove the fallback configs.  They aren't used in 1.4 or 1.5 either.

Remove init_visuals().  It's not used in 1.4 or 1.5 either.

In the drawable constructor initialize the state properly, including
the new context member.

Remove glAquaResetExtension() -- it's not used anymore.

This has been tested remotely and proven to work with glxgears,
fire, various texture programs I wrote, and various Mesa demos.
2009-01-12 14:14:44 -07:00
Jeremy Huddleston
b1d2978441 XQuartz: Don't need explicit Activate/EnableDevice in InitInput 2009-01-11 16:34:36 -08:00