Commit Graph

4441 Commits

Author SHA1 Message Date
George Staplin
d0b249f1c5 GL: glx: Fix an issue with the glxint.h causing an ABI disagreement over the number of properties sent.
This is apparently resolved in newer branches of the X server.

Add some assertions to prevent this from happening again in the 1.4 branch, and write out the total
number of properties actually written, rather than the value from glxint.h.
2009-03-14 20:40:52 -06:00
Jeremy Huddleston
cb3e9e2bb0 XQuartz: GLX - dead code removal 2009-03-06 23:13:56 -05:00
Jeremy Huddleston
363a6df948 1.4.2-apple36 2009-03-06 10:23:06 -05:00
Jeremy Huddleston
779e9fdc2d XQuartz: Implement SendPSN for AppleWM 2009-03-04 13:38:29 -08:00
George Staplin
aa0a57996f XQuartz: Add diagnostic error checking to xp_destroy_surface.
This occurred to me in hindsight after the last commit.  If the
original developer had done this, we would have noticed the
problem sooner.
2009-03-04 02:03:52 -07:00
George Staplin
bede83eb19 XQuartz: Fix a memory leak with surfaces that a new test found.
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.
2009-03-04 01:39:58 -07:00
George Staplin
99babae132 XQuartz: GL: Fix a problem with uninitialized data in __glXAquaScreenProbe.
I added a memset to fix the issue with an uninitialized function pointer,
and potentially other GLX data in ->base.

Also use xalloc and xfree, instead of malloc.

Enable the alpha bits from the __GLcontextModes.  The alphaBits are no
longer always 0 as the previous comment eluded to.

Add some commentary about how some of the data structures work.

Cleanup some of the GLAQUA_DEBUG_MSG.

This was tested with various Mesa demos in a variety of situations over
indirect.
2009-03-02 01:22:15 -07:00
Jeremy Huddleston
3e2427e6e9 XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym 2009-02-26 21:22:48 -08:00
Jeremy Huddleston
7f24969f6d 1.4.2-apple35 2009-02-25 11:31:23 -08:00
Jeremy Huddleston
516b82709f bundle version 2.3.3 2009-02-25 11:31:05 -08:00
Jeremy Huddleston
ffaec14cd1 XQuartz: Integrate DRI changes backported from the 1.6 branch 2009-02-25 01:22:33 -08:00
Jeremy Huddleston
4901b8147e XQuartz: Re-enable support for capslock 2009-02-24 23:12:57 -08:00
Adam Jackson
9f6e855f4e Build fixes
(cherry picked from commit 95000e34df)
2009-02-24 22:28:36 -08:00
Jeremy Huddleston
ab0a4ad821 1.4.2-apple34 2009-02-24 19:46:33 -08:00
Jeremy Huddleston
1d479fa4f3 XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations 2009-02-24 18:54:16 -08:00
Jeremy Huddleston
f1ce588fd1 XQuartz: Nuke an include that snuck in with the APPGROUP cherry-pick 2009-02-24 18:51:02 -08:00
Jeremy Huddleston
4b9fc7fc82 Death to APPGROUP.
(cherry picked from commit eafaf40fb3)
2009-02-24 18:40:42 -08:00
Jeremy Huddleston
61a4e5e588 More XPRINT nuke 2009-02-24 18:38:40 -08:00
Jeremy Huddleston
9a2dfb067c Default to use standard bitmap fonts, with builtins as fallback
The builtin-fonts configure option was removed, as it at best should
have been a runtime option. Instead, now it always register all "font
path element" backends, and adds built-ins fonts at the end of the
default font path.
  This should be a more reasonable solution, to "correct" the most
common Xorg FAQ (could not open default font 'fixed'), and also don't
break by default applications that use only the standard/historical
X Font rendering.
(cherry picked from commit 49b93df8a3)

    Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 69a2728891)
2009-02-24 17:52:03 -08:00
Julien Cristau
403745e52d Ansify declaration of FontToXError()
(cherry picked from commit e85d5d707d)
2009-02-24 17:50:38 -08:00
Jie Luo
443d218c84 Remove duplicate load of freetype font renderer.
libXfont will do this for us in FontFileRegisterFpeFunctions.
(cherry picked from commit e3ff850174)
2009-02-24 17:50:26 -08:00
Jeremy Huddleston
2f0f662941 Remove loadable font renderer support.
(cherry picked from commit affec10635)
2009-02-24 17:49:41 -08:00
Adam Jackson
6cab826c52 Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server.  Lunacy.  Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
(cherry picked from commit a82e6efb7b)
2009-02-24 17:47:24 -08:00
Tiago Vignatti
4f419215ee Remove NOFONTSERVERACCESS macro
dix: this is semantically different but it goes through the same path in
the code.
(cherry picked from commit f3b29efc4d)
2009-02-24 17:47:13 -08:00
Jeremy Huddleston
725c2cbaa7 X n'est pas une print API.
(cherry picked from commit 1c8bd318fb)
2009-02-24 17:46:36 -08:00
Alan Coopersmith
696d2d7109 Return a valid X error when stuck in font alias loop
Part of fix for Sun bug 4258475
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475>
(cherry picked from commit 1a01e96c6d)
2009-02-24 17:40:29 -08:00
Jeremy Huddleston
389e2656c0 Silence the harmless FreeFontPath error message.
(cherry picked from commit 9113fa3de3)
2009-02-24 17:39:46 -08:00
Adam Jackson
1f69f2d037 requestingClient is an xprintism, hide it for other servers.
(cherry picked from commit 7c0709a736)
2009-02-24 17:22:31 -08:00
Jeremy Huddleston
83d7a8b2ad Revert "XQuartz: DefineInitialRootWindow is gone"
I pushed this to the wrong branch...

This reverts commit 346b25f88f.
2009-02-22 00:42:09 -08:00
Jeremy Huddleston
346b25f88f XQuartz: DefineInitialRootWindow is gone 2009-02-22 00:39:41 -08:00
Keith Packard
bde1e3a7c9 X11/fonts/fontmod.h doesn't exist anymore.
libXfont 1.4.0 no longer includes this file, nor do we need it, so just stop
attempting to reference it.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 4557b3f6c4)
2009-02-18 17:59:45 -08:00
Jeremy Huddleston
1dd273621d XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder
(cherry picked from commit 8b607c9c50)
2009-02-12 15:35:43 -08:00
Jeremy Huddleston
77e054fc74 1.4.2-apple33 2009-02-09 22:25:11 -08:00
Jeremy Huddleston
e87290dfab Revert "XQuartz: Re-enable rlAccel"
This reverts commit 8121f30bd2.
2009-02-05 13:08:15 -08:00
Jeremy Huddleston
7f29665573 XQuartz: Accept bundle version 2.1.6 to work with our startup method 2009-02-03 09:58:51 -08:00
Jeremy Huddleston
8620579483 XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard 2009-02-02 12:30:57 -08:00
Jeremy Huddleston
e01662cadc XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT 2009-02-01 15:08:02 -08:00
George Staplin
e2450a4227 XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
(cherry picked from commit 143224405b)
(cherry picked from commit 92f00abc1f)
2009-02-01 15:05:21 -08:00
Jeremy Huddleston
fc19796e0e XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
(cherry picked from commit f020900641)
(cherry picked from commit 242e58f57b)
2009-01-30 09:26:07 -08:00
Jeremy Huddleston
2ea738ebc5 Nuke dix-config-post-verbatim.h
(cherry picked from commit d7a2d6a802)
2009-01-30 09:25:54 -08:00
Jeremy Huddleston
2bcd2e71f1 1.4.2-apple32 2009-01-29 17:12:31 -08:00
Jeremy Huddleston
035c36ffa5 XQuartz: mieq: Wait for the server to finish initializing before letting other threads mieqEnqueue
Avoid possible race condition whereby one thread might call mieqEnqueue before InitAndStartDevices finishes
(cherry picked from commit 94e417ac87)
2009-01-16 14:06:46 -08:00
Jeremy Huddleston
34cb657164 Rootless: Fix a variable scope issue that causes crahses when sizeof(void *) != sizeof(CARD8)
(cherry picked from commit b1c2d711e7)
2009-01-16 13:00:08 -08:00
Jeremy Huddleston
48a2210439 XQuartz: Only call DarwinUpdateModKeys when needed
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647)
2009-01-11 16:39:15 -08:00
Jeremy Huddleston
f7b6c1907c XQuartz: Update padding in appledristr. This shouldn't change how the struct ends up in memory, but should make it more obvious for human eyes 2009-01-07 18:27:21 -08:00
Jeremy Huddleston
f54736c2b0 XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
2009-01-07 10:50:35 -08:00
Jeremy Huddleston
9f1c26ae8d XQuartz: Copyright Update... happy new year 2009-01-02 11:06:12 -08:00
Jeremy Huddleston
87163c9641 1.4.2-apple31 2009-01-02 10:59:33 -08:00
Jeremy Huddleston
49e59d32b8 XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock 2009-01-02 10:58:40 -08:00
Jeremy Huddleston
5ac87d00b2 Revert "XQuartz: Ignore mach IPC until the appkit thread is ready to avoid possible deadlock (this can be reversed once pbproxy uses server API)"
Gonna try this a different way...

This reverts commit 9eec2d3e3b.
2009-01-02 10:36:43 -08:00