Commit Graph

5559 Commits

Author SHA1 Message Date
George Staplin
755f53eb40 XQuartz: GL: Make various changes to makeFormat, so that it works better. Now glxgears looks normal with the old libGL.
Add various GLX extensions to the list of supported extensions.

Reformat the oddly formatted code in some areas.

Use xalloc and xfree instead of malloc and free.
2008-11-28 14:03:21 -07:00
Jeremy Huddleston
635019ad18 XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3)
2008-11-28 12:59:09 -08:00
Jeremy Huddleston
e8151e5346 XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230c)
2008-11-28 12:58:25 -08:00
Jeremy Huddleston
a39d43bd01 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b4473)
2008-11-28 12:58:07 -08:00
Jeremy Huddleston
45fd0b681d XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c)
2008-11-28 12:57:58 -08:00
Jeremy Huddleston
03fd0ba554 XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786b)
2008-11-28 12:57:50 -08:00
Jeremy Huddleston
4fa7d91710 XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb34)
2008-11-28 12:57:45 -08:00
Jeremy Huddleston
7c73f70bd6 XQuartz: Simplify the xquartz_resetenv_display path
(cherry picked from commit d2e0624dd3)
2008-11-25 11:52:37 -08:00
Jeremy Huddleston
bbc490cf68 XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5a)
2008-11-25 11:52:32 -08:00
Jeremy Huddleston
a132f94e5c XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d)
2008-11-25 11:52:28 -08:00
Jeremy Huddleston
f5150a6ac4 XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
(cherry picked from commit 7a8c666594)
2008-11-25 00:53:49 -08:00
Jeremy Huddleston
8a53f33f11 XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
(cherry picked from commit fbf4b0d33f)
2008-11-25 00:53:42 -08:00
Jeremy Huddleston
f2a80c34d3 XQuartz: Dead code removal
(cherry picked from commit eeb323612e)
2008-11-25 00:53:36 -08:00
Jeremy Huddleston
a315d74d3d XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
(cherry picked from commit 3a500d9247)
2008-11-25 00:53:30 -08:00
Jeremy Huddleston
525a45d747 XQuartz: More dead code removal
(cherry picked from commit dcb0f6a2e6)
2008-11-25 00:53:24 -08:00
Jeremy Huddleston
37df4d8e2a XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
(cherry picked from commit 73ec6d3dfe)
2008-11-25 00:53:17 -08:00
Jeremy Huddleston
1fc07874e5 XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4)
2008-11-25 00:53:10 -08:00
Jeremy Huddleston
0c69f87717 XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3)
2008-11-25 00:53:06 -08:00
Jeremy Huddleston
b030eb0ce6 Xevie: Shutup gcc from warning about no previous prototype... 2008-11-22 14:39:37 -08:00
Jeremy Huddleston
d4a46fc3e6 fb: Removed a warning about unused variable 2008-11-22 14:33:01 -08:00
Jeremy Huddleston
d0f00dd2f9 dix: Added missing include for miPaintWindow 2008-11-22 14:30:36 -08:00
Jeremy Huddleston
7711c56dd6 XQuartz: Fixed --disable-glx 2008-11-22 14:06:50 -08:00
George Staplin
b772d64fce XQuartz: GL: Remove the inclusion of glcontextmodes.h.
Add some commentary about future directions needed for the GLX drawable
creation and destruction code.

Match xalloc with xfree.

I made some minor formatting improvements.
2008-11-22 11:37:08 -07:00
George Staplin
17f6a261fc XQuartz: GL: Add a branch to prevent a NULL DrawablePtr structure access.
In attach() check for pDraw being NULL, and also print an ErrorF message,
because we eventually want to track down why this is occuring.

It's unclear how this occurs, but as I noted in the 1.4 branch, I believe that
the DrawablePtr/struct _Drawable -> id is the member being accessed that causes
KERN_PROTECTION_FAILURE at 0x0000000000000004

This passes my tests using: env LIBGL_ALWAYS_INDIRECT=1 ./sometest.

I fixed a warning: caused by initializing the screen->base.visuals with the
configs.  It is a ** not a *.  It seems that some other part of GLX will
initialize this for us.
2008-11-22 11:06:28 -07:00
George Staplin
047ac0b4fd XQuartz: GL: Add 1 __GLXconfig for testing purposes. Now glxgears runs.
It looks much better with the new GLX/libGL, perhaps because of the old libGL
not understanding all of the tags written.  At least glxgears works with both.

glxgears is not a test for all OpenGL features, so most likely some things
are broken still.  Direct rendering is known to not work, or at least being
reported as not working.
2008-11-21 18:27:42 -07:00
George Staplin
594e81c397 XQuartz: GL: Convert some of the indirect.c code to work with the change to __GLXconfig.
Fix some obvious errors with uninitialized new members of GLX structs.

Add a type argument for the screen's drawable creation function, and pass the type to
__glXDrawableInit().

GLX still doesn't work.  There is more work needed to get it working again.  This gets
it building at least, although there are some warnings in the dispatch table setup,
that seem to be caused by const differences.

I also #if 0ed a bunch of function bodies that will need to be revisited soon.
2008-11-21 17:31:10 -07:00
George Staplin
3bed9b65c8 XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
The new replacement is __GLXconfig.
2008-11-21 17:28:11 -07:00
Jeremy Huddleston
3a18cd5044 XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit e62107e552)
2008-11-21 11:55:20 -08:00
Jeremy Huddleston
2195e017b4 XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be)
2008-11-21 11:55:17 -08:00
Jeremy Huddleston
bf699f0ae7 XQuartz: spewCallStack is noop on Tiger now...
(cherry picked from commit 56c469a68b)
2008-11-21 10:59:36 -08:00
Jeremy Huddleston
c589c30e37 XQuartz: pbproxy: Added some typedefs for types not available on Tiger
(cherry picked from commit 0947aa7911)
2008-11-21 10:59:29 -08:00
Jeremy Huddleston
fc01b09acf XQuartz: More Tiger ifdefs
(cherry picked from commit 803509072f)
2008-11-21 10:59:21 -08:00
Jeremy Huddleston
d03f4b1764 XQuartz: Resurrect the old audio path for Tiger
(cherry picked from commit a61a8d9047)
2008-11-21 10:59:12 -08:00
Jeremy Huddleston
fc44266502 XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
and just have the AppKit thread wake it up.
(cherry picked from commit 799715b8f3)
2008-11-21 10:59:07 -08:00
Jeremy Huddleston
b3ea0a2473 mi: Don't hold the event mutex during SaveScreens()
(cherry picked from commit 17eebd7c10)
2008-11-19 10:58:20 -08:00
Jeremy Huddleston
b02b5593d5 XQuartz: pbproxy: nuke RCS Id, update header license/copyright
(cherry picked from commit 477c6968a8)
2008-11-19 10:58:11 -08:00
Jeremy Huddleston
1ed6b4d101 XQuartz: pbproxy: Remove thread-main.m
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a)
2008-11-19 10:58:00 -08:00
Jeremy Huddleston
b8cc3acdac dix: Fix some sanity in getevents.c 2008-11-15 21:58:24 -08:00
Jeremy Huddleston
6baa808a85 XQuartz: Don't use TIS on Tiger...
(cherry picked from commit be8ac84c15)
2008-11-15 19:52:46 -08:00
Jeremy Huddleston
ceaf1c7e55 XQuartz: Integrated xpbproxy into the server.
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 4294493632)
2008-11-15 19:51:59 -08:00
Jeremy Huddleston
763195d338 XQuartz: Actually add glcontextmodes.[hc] 2008-11-14 15:13:22 -08:00
Ben Byer
460b63af21 fix compilation on systems that don't have
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2)
2008-11-14 15:09:39 -08:00
Jeremy Huddleston
a186cab6ae XQuartz: Initial work on readding GLX to the 1.5 server 2008-11-14 14:57:09 -08:00
Jeremy Huddleston
b5bb6dbc8f Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
(cherry picked from commit 7dff93ec1a)
2008-11-14 11:09:53 -08:00
Jeremy Huddleston
84c68a9699 XQuartz: Made X11Application.m a little more tidy.
(cherry picked from commit 3520386261)
2008-11-14 11:09:45 -08:00
Jeremy Huddleston
82a03b631c XQuartz: Fixed XBell() when not using system alert.
(cherry picked from commit aa0e9ab1c7)
2008-11-13 11:34:12 -08:00
Jeremy Huddleston
628679275f XQuartz: Added more debugging to handoff spew
(cherry picked from commit acefa7e3c8)
2008-11-13 11:34:07 -08:00
George Staplin
73493d1ce9 XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
This prevents visuals with odd sizes.  The machine I use didn't have
this problem, but it shows up on some others.
(cherry picked from commit ed181382dd)
2008-11-13 11:33:59 -08:00
George Staplin
33b8ee7846 XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
Use the settings queried from the system in xprScreen.c, rather than those 2 calls.

The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
and not all of the visuals were usable with GLX.  Some of the visuals aren't usable
with GLX still, such as DirectColor, but that seems to be acceptable based on my
understanding of the manual that states "a subset of visuals are made available
for OpenGL rendering."
(cherry picked from commit 373b8a5f32)
2008-11-13 01:19:26 -08:00
Jeremy Huddleston
bd8098d05b XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
(cherry picked from commit 54d20f6d33)
2008-11-13 01:19:16 -08:00