Commit graph

3146 commits

Author SHA1 Message Date
Jeremy Huddleston
9f04b10dea XQuartz: Update GLX code from George's efforts on the 1.6 branch 2009-02-24 22:43:47 -08:00
Jeremy Huddleston
03579fe1d5 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 22:30:13 -08:00
Adam Jackson
ddd0691bfa Build fixes
(cherry picked from commit 95000e34df)
2009-02-24 22:28:00 -08:00
Adam Jackson
300322b883 Remove loadable font renderer support.
(cherry picked from commit affec10635)
2009-02-24 22:27:09 -08:00
Jeremy Huddleston
159e6a1b20 X n'est pas une print API.
(cherry picked from commit 1c8bd318fb)
2009-02-24 22:26:32 -08:00
Adam Jackson
e8a45d97d3 Death to APPGROUP.
(cherry picked from commit eafaf40fb3)
2009-02-24 22:24:03 -08:00
Jeremy Huddleston
7446e740ae 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:22:53 -08:00
Keith Packard
49ced08e79 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 18:00:19 -08:00
Jeremy Huddleston
8b607c9c50 XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder 2009-02-12 15:33:47 -08:00
Jeremy Huddleston
5bbe168761 Revert "XQuartz: Re-enable rlAccel"
This reverts commit c962559889.

It's causing new crashes that I don't feel like debugging... Let EXA solve it in 1.6...
2009-02-05 13:04:55 -08:00
Jeremy Huddleston
43a2df3968 XQuartz: Accept bundle version 2.1.6 to work with our startup method
(cherry picked from commit 7f29665573)
2009-02-03 10:03:57 -08:00
Jeremy Huddleston
29cf2954bf XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
(cherry picked from commit 8620579483)
2009-02-02 12:34:30 -08:00
Jeremy Huddleston
da87934366 XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
(cherry picked from commit e01662cadc)
2009-02-01 15:13:03 -08:00
George Staplin
92f00abc1f XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
(cherry picked from commit 143224405b)
2009-01-26 10:26:56 -08:00
Jeremy Huddleston
b231fb1f35 XQuartz: SnowLeopard: Help system book name changed in 10.6
(cherry picked from commit b57cb05c69)
2009-01-25 21:25:08 -08:00
Jeremy Huddleston
242e58f57b XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
(cherry picked from commit f020900641)
2009-01-16 15:59:42 -08:00
Jeremy Huddleston
3e02b987cc 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:38:55 -08:00
Jeremy Huddleston
1c88a68bed XQuartz: Get rid of SwitchCoreKeyboard where it's not needed... 2009-01-10 03:07:37 -08:00
Jeremy Huddleston
366b08598c 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
(cherry picked from commit f7b6c1907c)
2009-01-10 00:59:52 -08:00
George Staplin
3c14546f58 XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT. 2009-01-09 16:08:26 -07:00
George Staplin
94162b0f8a XQuartz: GL: Make many more fbconfigs and visuals available for the 1.5 branch.
Use a __GLXconfig linked list struct to store the configurations for the
fbconfigs and visuals in a pGlxScreen.

Also, remove the __GLXvisualConfig/GlxSetVisualConfigs code that isn't used
anymore.  There is more code we can remove later, but I want to do that in
separate commits.
2009-01-09 16:02:06 -07:00
Jeremy Huddleston
4db744e1a7 XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
(cherry picked from commit 91f3c34357)
2009-01-07 01:47:28 -08:00
Jeremy Huddleston
3a3ccf5354 XQuartz: Bundle version 2.4.0 2009-01-06 15:32:44 -08:00
Jeremy Huddleston
c7ce0957e0 XQuartz: Copyright Update... happy new year
(cherry picked from commit 9f1c26ae8d)
2009-01-02 11:07:10 -08:00
Jeremy Huddleston
7bdcfad9b5 XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
(cherry picked from commit 49e59d32b8)
2009-01-02 11:02:17 -08:00
Jeremy Huddleston
a4c3c38aca XQuartz: Don't use NX_SECONDARYFNMASK, NX_NUMERICPADMASK, NX_HELPMASK
We don't have keycodes for them, so don't try to use them
(cherry picked from commit cb912aca3a)
2008-12-31 12:45:22 -08:00
Jeremy Huddleston
a70b3ac8db XQuartz: Make sure to reset the saved key state when deactivating X11.app
(cherry picked from commit 3eef78eb32)
2008-12-31 12:43:34 -08:00
Jeremy Huddleston
b3cd762f33 XQuartz: Honor system key repeat rate
(cherry picked from commit 4303c9be39)
2008-12-31 12:43:22 -08:00
Jeremy Huddleston
74a2b2dfe2 XQuartz: Better avoid stuck keys on context switches
(cherry picked from commit e9963f1a4f)
2008-12-31 12:43:09 -08:00
Jeremy Huddleston
6ad7224c25 XQuartz: Workaround OSX VNC server bug for modifier key state
A better approach which ensures we have a L modifier key down if we are told neither are down and atleast one is down... =/
(cherry picked from commit bc13dda345)
2008-12-31 12:42:52 -08:00
Jeremy Huddleston
3a7ac7639a XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
(cherry picked from commit 00f3a2e33c)
2008-12-31 12:42:42 -08:00
Jeremy Huddleston
a06470b2fe XQuartz: Try harder to get the user's login environment
(cherry picked from commit 6bedaddd78)
2008-12-28 22:17:20 -08:00
Jeremy Huddleston
6ca83863da XQuartz: Reposition windows when we enter fullscreen to ensure our root window
(cherry picked from commit 7617d3659b)
2008-12-28 22:17:07 -08:00
Jeremy Huddleston
c962559889 XQuartz: Re-enable rlAccel
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd2)
2008-12-28 22:15:42 -08:00
Jeremy Huddleston
4541e444fb XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
(cherry picked from commit 80b65c5b78)
2008-12-23 12:45:52 -08:00
Jeremy Huddleston
c53455ceea XQuartz: Don't use keycode 0 to determine !swallow since our most common key to swallow is actual keycode 0 (a)
(cherry picked from commit 33f43a7f03)
2008-12-21 21:35:51 -08:00
Jeremy Huddleston
ea0d28bd0e XQuartz: Update our "screens" when we toggle rootless rather than when we toggle fullscreen
This old behavior was used as a workaround for the menubar behavior in the older server,
but we handle it better now and need to update our screens when we toggle the rootless
state instead.
(cherry picked from commit 508aa95bc2)
2008-12-21 21:35:37 -08:00
Jeremy Huddleston
10203479d1 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e)
2008-12-21 21:35:24 -08:00
Jeremy Huddleston
20e2d76dca XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
(cherry picked from commit 22f664ab95)
2008-12-21 21:35:13 -08:00
Jeremy Huddleston
e9e2783e23 XQuartz: update quoting in case X11.app is moved to a directory with a space.
(cherry picked from commit cc805dc799)
2008-12-21 21:34:58 -08:00
Jeremy Huddleston
dd48afc8e7 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:41 -08:00
Jeremy Huddleston
a638a64469 XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fc)
2008-12-17 13:56:46 -08:00
Jeremy Huddleston
d5341e5e3b Merge commit 'origin/server-1.5-branch' into xorg-server-1.5-apple 2008-12-17 13:56:30 -08:00
Luc Verhaegen
244e960bb0 XAA PixmapOps: Sync before accessing unwrapped callbacks.
When using any XAAPixmapOps, we call into unknown but freshly
unwrapped callbacks (like fb ones). Unlike the XAA*Fallback calls,
we did so without syncing first, exposing us to all kinds of
synchronisation issues.

I believe that the rendering errors appeared now because *PaintWindow
vanished (e4d11e58), and we just use miPaintWindow instead. This
takes a less direct route to the hw and ends up at
PolyFillRectPixmap, which very often left drawing artifacts.

We now sync accordingly, and no longer get the rendering artifacts i
was methodically reproducing on radeonhd, radeon, unichrome...

Also, in order to allow driver authors to remove extensive syncing
or flushing to hide this issue, create XAA_VERSION_ defines, put
them in xaa.h and bump the patchlevel.

(novell bug #435791)
(cherry picked from commit 59f9fb4b8c)
2008-12-16 14:05:54 -05:00
Julien Cristau
bfe5a13499 xfree86: xf86SetDepthBpp needs to respect the driver's depth24flags
When setting the depth to 24, leave bpp unset so the logic to pick
a supported value is used instead of ignoring the driver's preference
and forcing 32 bpp.
(cherry picked from commit 991c88b754)
2008-12-16 14:05:43 -05:00
Egbert Eich
38e0a542fc int10: Do an mprotect(..,PROT_EXEC) on shmat()ed memory ranges.
When the linux kernel sets the NX bit vm86 segfaults when it tries to execute
code in memory that is not marked EXEC. Such code gets called whenever
we return from a VBIOS call to signal the calling program that the call
is actually finished and that we are not trapping for other reasons (like
IO accesses).
Use mprotect(2) to set these memory ranges PROT_EXEC.
(cherry picked from commit a9e20306fb)
2008-12-16 14:04:30 -05:00
Jeremy Huddleston
db663223e1 XQuartz: Updated menu item ordering for better HIG compliance
(cherry picked from commit 4c9bb241ce)
2008-12-15 03:21:57 -08:00
Jeremy Huddleston
a5f781c498 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:21:40 -08:00
Jeremy Huddleston
f8c10acd09 XQuartz: Fix path to executable
(cherry picked from commit 7e9d3698e0)
2008-12-10 15:08:23 -08:00
Jeremy Huddleston
f0014240ed XQuartz: fixed make dist
(cherry picked from commit 2d52367ab9)
2008-12-10 15:08:11 -08:00