Commit Graph

451 Commits

Author SHA1 Message Date
Jeremy Huddleston
8f04a52373 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e)
2008-12-21 21:35:33 -08:00
Jeremy Huddleston
029d255a65 XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
(cherry picked from commit 22f664ab95)
2008-12-21 21:35:22 -08:00
Jeremy Huddleston
b1f166f298 XQuartz: update quoting in case X11.app is moved to a directory with a space.
(cherry picked from commit cc805dc799)
2008-12-21 21:35:04 -08:00
Jeremy Huddleston
2f47bda645 XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
(cherry picked from commit b62ed1f8ea)
2008-12-21 21:34:50 -08:00
Jeremy Huddleston
22b2811e6a XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fc)
2008-12-21 21:33:17 -08:00
Jeremy Huddleston
450739efa9 XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce)
2008-12-15 03:22:17 -08:00
Jeremy Huddleston
aee27be278 XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
(cherry picked from commit 748d9e5bd7)
2008-12-15 03:22:01 -08:00
Peter Hutterer
cb95642dc8 Remove #define NEED_EVENTS and NEED_REPLIES
A grep on xorg/* revealed there's no consumer of this define.

Quote Alan Coopersmith:
"The consumer was in past versions of the headers now located
in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h,
all the event definitions were only available if NEED_EVENTS were
defined, and all the reply definitions required NEED_REPLIES.

Looks like Xproto.h dropped them by X11R6.3, which didn't have
the #ifdef's anymore, so these are truly ancient now."

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2008-12-12 11:43:32 +10:00
Jeremy Huddleston
119d9c46e8 XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e0)
2008-12-10 15:08:33 -08:00
Jeremy Huddleston
c46b564c47 XQuartz: fixed make dist
(cherry picked from commit 2d52367ab9)
2008-12-10 15:08:20 -08:00
Jeremy Huddleston
23156a21d8 XQuartz: Make debugging output for invalid depths a bit more detailed
(cherry picked from commit 609fb166b7)
2008-12-10 15:08:05 -08:00
Jeremy Huddleston
76351d2faf XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6)
2008-12-10 15:07:52 -08:00
Jeremy Huddleston
e5ce6e198f XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38)
2008-12-10 15:07:35 -08:00
Jeremy Huddleston
ecaaf0462d XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
2008-12-10 15:07:26 -08:00
Jeremy Huddleston
ea94995982 XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b3)
2008-12-10 15:07:15 -08:00
Jeremy Huddleston
ccd2c668c1 XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
(cherry picked from commit a41e7f75de)
2008-12-06 14:12:27 -08:00
Jeremy Huddleston
7ebd0c7e8d XQuartz: Corrected name/command labels in the customization widget
(cherry picked from commit a689c23f17)
2008-12-06 14:12:27 -08:00
Jeremy Huddleston
fa4f2527a5 XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
2008-12-03 21:59:23 -08:00
George Staplin
01eaebdc98 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.
(cherry picked from commit 755f53eb40)
2008-11-28 13:18:27 -08:00
Jeremy Huddleston
3d527b91b4 XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3)
(cherry picked from commit 635019ad18)
2008-11-28 13:02:54 -08:00
Jeremy Huddleston
71d3df7cc3 XQuartz: Avoid some warning messages being spewed to system.log by AppKit
(cherry picked from commit 780eff230c)
2008-11-28 13:02:52 -08:00
Jeremy Huddleston
a9796c7bc4 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b4473)
2008-11-28 13:02:41 -08:00
Jeremy Huddleston
ef4179f43a XQuartz: Fix dead-acute on Greek keyboards
(cherry picked from commit 807f2ec35c)
2008-11-28 13:02:25 -08:00
Jeremy Huddleston
800f5c681b XQuartz: Fix Czech keyboard dead-acute
(cherry picked from commit 771df2786b)
2008-11-28 13:02:12 -08:00
Jeremy Huddleston
ac57bb36d5 XQuartz: Fix an uninitialized keyboard_type on Tiger
(cherry picked from commit 27b1a5eb34)
2008-11-28 13:01:59 -08:00
Jeremy Huddleston
eb474adf98 XQuartz: Simplify the xquartz_resetenv_display path
(cherry picked from commit d2e0624dd3)
2008-11-25 11:53:12 -08:00
Jeremy Huddleston
94df1ab7f0 XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5a)
2008-11-25 11:53:06 -08:00
Jeremy Huddleston
0b314c50a2 XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d)
2008-11-25 11:52:59 -08:00
Jeremy Huddleston
065d2afb0c XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
(cherry picked from commit 7a8c666594)
2008-11-25 00:54:52 -08:00
Jeremy Huddleston
13df49dca2 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:54:47 -08:00
Jeremy Huddleston
40187f782b XQuartz: Dead code removal
(cherry picked from commit eeb323612e)
2008-11-25 00:54:42 -08:00
Jeremy Huddleston
b55cad4569 XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
(cherry picked from commit 3a500d9247)
2008-11-25 00:54:37 -08:00
Jeremy Huddleston
d508a3dcca XQuartz: More dead code removal
(cherry picked from commit dcb0f6a2e6)
2008-11-25 00:54:32 -08:00
Jeremy Huddleston
41fbdf72f2 XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
(cherry picked from commit 73ec6d3dfe)
2008-11-25 00:54:27 -08:00
Jeremy Huddleston
09c3f6e04c XQuartz: Dead code removal
(cherry picked from commit 46c077d9b4)
2008-11-25 00:54:22 -08:00
Jeremy Huddleston
ab12c75162 XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3)
2008-11-25 00:54:17 -08:00
Jeremy Huddleston
8964b8d0ec XQuartz: More 1.6 server API updates 2008-11-22 14:23:23 -08:00
Jeremy Huddleston
ad0f232165 XQuartz: Fixed --disable-glx 2008-11-22 14:04:28 -08:00
Jeremy Huddleston
8e2287c220 XQuartz: Updated some code to use newer server API 2008-11-22 13:57:45 -08:00
George Staplin
6eb33bc0cb 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.
(cherry picked from commit b772d64fce)
2008-11-22 11:13:51 -08:00
George Staplin
429b4b20d5 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.
(cherry picked from commit 17f6a261fc)
2008-11-22 11:13:46 -08:00
Jeremy Huddleston
76fcfc4801 XQuartz: GLX: sync up indirect.c to match George's updates in the xorg-server-1.5-apple branch 2008-11-21 20:25:55 -08:00
George Staplin
1a717779b6 XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
The new replacement is __GLXconfig.
(cherry picked from commit 3bed9b65c8)
2008-11-21 20:10:57 -08:00
Jeremy Huddleston
ca64b5949d XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit e62107e552)
2008-11-21 11:55:49 -08:00
Jeremy Huddleston
393325f908 XQuartz: spewCallStack is noop on Tiger now...
(cherry picked from commit 56c469a68b)
2008-11-21 10:59:41 -08:00
Jeremy Huddleston
5d47a5d652 XQuartz: pbproxy: Added some typedefs for types not available on Tiger
(cherry picked from commit 0947aa7911)
2008-11-21 10:59:34 -08:00
Jeremy Huddleston
b262788401 XQuartz: More Tiger ifdefs
(cherry picked from commit 803509072f)
2008-11-21 10:59:26 -08:00
Jeremy Huddleston
5107444443 XQuartz: Resurrect the old audio path for Tiger
(cherry picked from commit a61a8d9047)
2008-11-21 10:59:17 -08:00
Jeremy Huddleston
d7ee76f9dd 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:10 -08:00
Jeremy Huddleston
c4ec71b405 XQuartz: pbproxy: nuke RCS Id, update header license/copyright
(cherry picked from commit 477c6968a8)
2008-11-19 10:58:15 -08:00
Jeremy Huddleston
42f330cf9e XQuartz: pbproxy: Remove thread-main.m
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a)
2008-11-19 10:58:06 -08:00
Jeremy Huddleston
03f7a66a1a XQuartz: Don't use TIS on Tiger...
(cherry picked from commit be8ac84c15)
2008-11-15 19:52:52 -08:00
Jeremy Huddleston
e8112784e8 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:52:34 -08:00
Jeremy Huddleston
bc4f804cd8 XQuartz: Actually add glcontextmodes.[hc]
(cherry picked from commit 763195d338)
2008-11-14 15:13:59 -08:00
Ben Byer
aedafbea0e fix compilation on systems that don't have
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2)
2008-11-14 15:11:42 -08:00
Jeremy Huddleston
b078936571 XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae)
2008-11-14 15:10:32 -08:00
Jeremy Huddleston
1d7049f8fd Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
(cherry picked from commit 7dff93ec1a)
2008-11-14 11:10:24 -08:00
Jeremy Huddleston
3c12483264 XQuartz: Made X11Application.m a little more tidy.
(cherry picked from commit 3520386261)
2008-11-14 11:10:15 -08:00
Jeremy Huddleston
5bad5d2abe XQuartz: Fixed XBell() when not using system alert.
(cherry picked from commit aa0e9ab1c7)
2008-11-13 11:34:32 -08:00
Jeremy Huddleston
0fca8588a2 XQuartz: Added more debugging to handoff spew
(cherry picked from commit acefa7e3c8)
2008-11-13 11:34:27 -08:00
George Staplin
47d3821870 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:34:21 -08:00
George Staplin
33edd32702 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:43 -08:00
Jeremy Huddleston
1523476afa XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
(cherry picked from commit 54d20f6d33)
2008-11-13 01:19:35 -08:00
George Staplin
1f301a0051 XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
It was returning inverted values in comparison to the 1.4 branch.  This resulted in
the windows not drawing due to a deep path of: RootlessReorderWindow ->
SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
AppleWMDoReorderWindow.
(cherry picked from commit d1d398db76)
2008-11-13 01:18:49 -08:00
Jeremy Huddleston
f59352881f XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
(cherry picked from commit 980df1b4ff)
2008-11-06 14:49:54 -08:00
George Peter Staplin
13d06f5aaf XQuartz: GL: Add capability detection for depth buffers, and multisampling.
GL/capabilities.c: Add handleDepthModes(), and extend
handleRendererDescription() for the various depth and multisampling flags.

Add initialization of the new config options to initConfig().

GL/capabilities.h: Add depth and multisample config members.

GL/visualConfigs.c: Add depth and multisampling support to the visual config
setup.
(cherry picked from commit f527381eea)
2008-11-05 19:23:48 -08:00
George Peter Staplin
34bb06b292 XQuartz: GL: Work around problems with really deep visuals.
GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
because they introduce drawing problems.

GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
actually seemed to cause some problems.  The current visualConfigs.c code seems
to do a reasonable job of setting up visuals for XQuartz.

GL/visualConfigs.c: Make use of the proper visual .class.   Eliminate depth 0.
It seems we really just want 24 for now, and 0 I think was a flaw in the original
code.
(cherry picked from commit 1e5f63f15e)
2008-11-05 19:23:41 -08:00
Jeremy Huddleston
39e82a9b12 XQuartz: Replace deprecated API usage thanks to Robery Murphy
(cherry picked from commit 71dd052412)
2008-11-05 19:23:36 -08:00
Jeremy Huddleston
b4db46320a XQuartz: version string updated for 2.3.2_beta3
(cherry picked from commit 81bb412857)
2008-11-05 19:23:30 -08:00
Daniel Stone
8c3753a0b7 A bit of whitespace cleanup in include directives.
It's #include <foo>, not # include <foo>

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-04 16:01:07 +10:30
Jeremy Huddleston
f8af66ddb2 XQuartz: Add option to allow access to the menu in fullscreen mode
(cherry picked from commit 637a9f4bd1)
2008-10-31 20:05:39 -07:00
Jeremy Huddleston
c5086badf0 XQuartz: LP64 related casting fixes from Bob Murphy
(cherry picked from commit ea71710aaa)
2008-10-31 19:03:38 -07:00
Jeremy Huddleston
ecd55bc859 XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
(cherry picked from commit c883a78ef0)
2008-10-31 15:50:06 -07:00
Jeremy Huddleston
9f49f5172d XQuartz: Silence pointer debug spam
(cherry picked from commit 9ca099e928)
2008-10-31 15:49:52 -07:00
Jeremy Huddleston
93298c7f8f XQuartz: Don't map the menu bar to the screen area.
(cherry picked from commit 1115917ada)
2008-10-31 15:49:44 -07:00
Jeremy Huddleston
31907986a6 XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
(cherry picked from commit 5fc73b1141)
2008-10-31 15:49:32 -07:00
George Peter Staplin
227d782a1b XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
This is used in libGL to determine a preferred visual.  glxinfo -v will also
report "visualCaveat=Slow" for such visuals.
(cherry picked from commit d5c17f585a)
2008-10-31 15:49:25 -07:00
Jeremy Huddleston
5287602a41 XQuartz: if 0 out a block to avoid thread-unsafe lockups
(cherry picked from commit 60d7359a67)
2008-10-31 15:48:24 -07:00
Jeremy Huddleston
93d7cd31c5 XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
(cherry picked from commit 490756c7fb)
2008-10-31 15:48:15 -07:00
Jeremy Huddleston
f12d7ad164 XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b)
2008-10-28 22:01:40 -07:00
George Peter Staplin
273df54685 XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
It seems that we were calling copy_completed: too soon.  Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662)
2008-10-28 22:01:34 -07:00
George Peter Staplin
313d87341a XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede)
2008-10-28 22:01:29 -07:00
George Peter Staplin
9007d3beea XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
This may work, unfortunately I don't have test apps that fail.

The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.

The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa95)
2008-10-28 22:01:22 -07:00
Jeremy Huddleston
b742da0b71 XQuartz: pbproxy: fixed blocking
(cherry picked from commit bb330a1b1c)
2008-10-28 22:00:52 -07:00
Jeremy Huddleston
c885110aed Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
(cherry picked from commit 3647215310)
2008-10-28 22:00:42 -07:00
George Peter Staplin
e7c26964ee XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
(cherry picked from commit fe35a36390)
2008-10-28 22:00:36 -07:00
George Peter Staplin
21ea9d82aa XQuartz: GL: Add feature detection of color sizes, and accum sizes.
This gives us a *lot* more visuals, and they should be more accurate.
Some of the visuals may have been wrong before.  This may enable more
OpenGL programs to behave correctly.

I also suspect libGL needs a little work to handle some of these correctly.
(cherry picked from commit 98a084ce9c)
2008-10-28 22:00:29 -07:00
Jeremy Huddleston
80b6768536 XQuartz: Do check_xinitrc() later to avoid possible deadlock.
(cherry picked from commit af95174a08)
2008-10-23 19:22:36 -07:00
George Peter Staplin
d837d4e2af XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
(cherry picked from commit 6bcbb9ba85)
2008-10-23 19:22:28 -07:00
George Peter Staplin
6a2693b2f9 XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes.  I think indirect.c should
be using the same feature detection and GLX visual config code.  The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f2)
2008-10-23 19:22:16 -07:00
Jeremy Huddleston
28d4f71193 XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
(cherry picked from commit 6622efca21)
2008-10-23 16:30:53 -07:00
Jeremy Huddleston
3e999d35c2 XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
(cherry picked from commit bf561a06b2)
2008-10-23 14:17:19 -07:00
Jeremy Huddleston
75067d12e4 XQuartz: Added missing semicolons to Localizable.strings
(cherry picked from commit e9fe3f36d9)
2008-10-23 14:17:10 -07:00
Jeremy Huddleston
a003932dcc XQuartz: Default dpi to 96 instead of 75
(cherry picked from commit 08a5a333d7)
2008-10-23 14:17:04 -07:00
Jeremy Huddleston
2d764e21f2 XQuartz: pbproxy: SIGHUP reloads preferences.
(cherry picked from commit cbc0935ef7)
2008-10-23 14:16:57 -07:00
Jeremy Huddleston
c837d182c4 XQuartz: Only send mouse events while in the background if we're over a visible window.
This "breaks" xeyes but gets rid of annoying tooltips.
(cherry picked from commit 10090a132a)
2008-10-21 09:34:56 -07:00
Jeremy Huddleston
2a9613980f XQuartz: More fullscreen fixes
Start in rooted mode when enabled
  Make the hotkey cmd-alt-a behave
(cherry picked from commit 22a54e4617)
2008-10-21 09:34:49 -07:00
Jeremy Huddleston
e4ea1494de XQuartz: Cleaned up keyboard init and map reload.
(cherry picked from commit f78c9fc06c)
2008-10-21 09:34:40 -07:00
Jeremy Huddleston
ebb2e1449c XQuartz: Fixed follow-keyboard-layout
≈
(cherry picked from commit a9f9fbf512)
2008-10-21 09:34:28 -07:00
Jeremy Huddleston
f67cd31d2c XQuartz: More progress towards fullscreen...
(cherry picked from commit 628cae86b4)
(cherry picked from commit b47b7ab6d6)
2008-10-21 09:34:17 -07:00