fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-24 06:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7105 commits 90 branches 540 tags 82 MiB
Commit graph

430 commits

Author SHA1 Message Date
Jeremy Huddleston
10e0603fb9 XQuartz: Re-enable support for capslock 
(cherry picked from commit 4901b8147e)
 2009-02-25 11:35:19 -08:00
Jeremy Huddleston
8e16e64f55 XQuartz: Don't need GlxSetVisualConfig any more 
Fixes build failure resulting from 516f8e2cad
(cherry picked from commit 066b17028a)

Signed-off-by: Keith Packard <keithp@keithp.com>
 2009-02-18 10:19:37 -08:00
Jeremy Huddleston
09cde70a6b XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard 
(cherry picked from commit 8620579483)
(cherry picked from commit 0dbc356795)

Signed-off-by: Keith Packard <keithp@keithp.com>
 2009-02-17 19:02:43 -08:00
Jeremy Huddleston
6bbe98f01d XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT 
(cherry picked from commit e01662cadc)
(cherry picked from commit fd08be749e)

Signed-off-by: Keith Packard <keithp@keithp.com>
 2009-02-17 19:02:37 -08:00
Jeremy Huddleston
519ae3a0df XQuartz: Don't need explicit Activate/EnableDevice in InitInput 
(cherry picked from commit b1d2978441)

Signed-off-by: Keith Packard <keithp@keithp.com>
 2009-02-17 19:02:28 -08:00
George Staplin
840b4da5f2 XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks. 
(cherry picked from commit 143224405b)
 2009-01-30 16:44:50 -08:00
Jeremy Huddleston
97a6f55f22 XQuartz: SnowLeopard: Help system book name changed in 10.6 
(cherry picked from commit b57cb05c69)
 2009-01-30 16:44:50 -08:00
Jeremy Huddleston
b530a0e97b XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation 
(cherry picked from commit f020900641)
 2009-01-30 16:44:49 -08:00
George Staplin
82fd4d1708 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.
(cherry picked from commit 9cf264e677)
 2009-01-30 16:44:49 -08:00
Jeremy Huddleston
9cbdcf1fa4 XQuartz: Only call DarwinUpdateModKeys when needed 
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647)
 2009-01-30 16:44:49 -08:00
George Staplin
037e52fd73 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.
(cherry picked from commit d514152195)
 2009-01-30 16:44:49 -08:00
George Staplin
ee9736b26b XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT. 
(cherry picked from commit 3c14546f58)
(cherry picked from commit a665ed16f7)
 2009-01-30 16:44:49 -08:00
George Staplin
b646513861 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.
(cherry picked from commit 94162b0f8a)
(cherry picked from commit 15bb6abd59)
 2009-01-30 16:44:49 -08:00
Jeremy Huddleston
ca21fd7ddf XQuartz: Add locking to make mieq thread safe on OSX 
(cherry picked from commit 7a8d226686)
 2009-01-12 10:42:11 -08:00
Jeremy Huddleston
671b71a6cb XQuartz: misc 1.6 updates (still --disable-glx) 
rlAccel is not longer compatable, and it's not worth fixing
  Don't override DeviceCursorInitialize with a noop
  Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f68168)
 2009-01-12 10:42:05 -08:00
Jeremy Huddleston
681cc0f38b XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth 
(cherry picked from commit 80b65c5b78)
(cherry picked from commit 932ed6e949)
 2009-01-12 10:41:51 -08:00
Jeremy Huddleston
7872669105 XQuartz: Make debugging output for invalid depths a bit more detailed 
(cherry picked from commit 609fb166b7)
(cherry picked from commit 1962af7ee3)
 2009-01-12 10:41:45 -08:00
Jeremy Huddleston
2eb09af561 XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger 
(cherry picked from commit 91f3c34357)
(cherry picked from commit 65ab2f44ea)
 2009-01-09 11:03:32 -08:00
Jeremy Huddleston
fecc82ee11 XQuartz: Copyright Update... happy new year 
(cherry picked from commit 9f1c26ae8d)
(cherry picked from commit df6ca888b0)
 2009-01-09 11:03:27 -08:00
Jeremy Huddleston
d80e35a9ae XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock 
(cherry picked from commit 49e59d32b8)
(cherry picked from commit adbfd49da2)
 2009-01-09 11:03:21 -08:00
Jeremy Huddleston
c32a680f26 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)
(cherry picked from commit 0676a580fc)
 2009-01-09 11:03:05 -08:00
Jeremy Huddleston
e08ce79152 XQuartz: Make sure to reset the saved key state when deactivating X11.app 
(cherry picked from commit 3eef78eb32)
(cherry picked from commit 0d2621b6d4)
 2009-01-09 11:02:59 -08:00
Jeremy Huddleston
bdf776b457 XQuartz: Honor system key repeat rate 
(cherry picked from commit 4303c9be39)
(cherry picked from commit 9faf3de7e5)
 2009-01-09 11:02:52 -08:00
Jeremy Huddleston
16560db0c0 XQuartz: Better avoid stuck keys on context switches 
(cherry picked from commit e9963f1a4f)
(cherry picked from commit 4be8d7346b)
 2009-01-09 11:02:48 -08:00
Jeremy Huddleston
66f801f5a0 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)
(cherry picked from commit c67a3e2972)
 2009-01-09 11:02:42 -08:00
Jeremy Huddleston
a05dbce402 XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu 
(cherry picked from commit 00f3a2e33c)
(cherry picked from commit d790c9dd04)
 2009-01-09 11:02:34 -08:00
Jeremy Huddleston
de78ac4378 XQuartz: Try harder to get the user's login environment 
(cherry picked from commit 6bedaddd78)
(cherry picked from commit 338f096861)
 2009-01-09 11:02:24 -08:00
Jeremy Huddleston
c391114df9 XQuartz: Reposition windows when we enter fullscreen to ensure our root window 
(cherry picked from commit 7617d3659b)
(cherry picked from commit 61ae56f973)
 2009-01-09 11:02:19 -08:00
Jeremy Huddleston
beafebef82 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)
(cherry picked from commit 85347902d9)
 2009-01-09 11:02:14 -08:00
Jeremy Huddleston
86ba5eff62 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)
(cherry picked from commit 84f0c03418)
 2009-01-09 11:00:27 -08:00
Jeremy Huddleston
2a42a059ce 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)
(cherry picked from commit 7e7758e178)
 2009-01-09 11:00:21 -08:00
Jeremy Huddleston
51319550c9 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing 
(cherry picked from commit 67455e716e)
(cherry picked from commit 7dc0dafef1)
 2009-01-09 11:00:16 -08:00
Jeremy Huddleston
b0503b69f9 XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock 
(cherry picked from commit 22f664ab95)
(cherry picked from commit 4c256c0e9c)
 2009-01-09 11:00:11 -08:00
Jeremy Huddleston
6c635faa6f XQuartz: update quoting in case X11.app is moved to a directory with a space. 
(cherry picked from commit cc805dc799)
(cherry picked from commit ecc3a7b609)
 2009-01-09 11:00:05 -08:00
Jeremy Huddleston
14d9ccf0ce XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells 
(cherry picked from commit b62ed1f8ea)
(cherry picked from commit c3812aec97)
 2009-01-09 10:59:56 -08:00
Jeremy Huddleston
5ff6b1e7ed XQuartz: Name the startup shell script X11 for better compatability 
(cherry picked from commit f84613d6fc)
(cherry picked from commit 102abeda37)
 2009-01-09 10:59:25 -08:00
Jeremy Huddleston
f427d3aaa7 XQuartz: Updated menu item ordering for better HIG compliance 
(cherry picked from commit 4c9bb241ce)
(cherry picked from commit 73987010b2)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d0eb4337e3 XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe. 
(cherry picked from commit 748d9e5bd7)
(cherry picked from commit fd31984e0c)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
d9e1fdcd40 XQuartz: Fix path to executable 
(cherry picked from commit 7e9d3698e0)
(cherry picked from commit 5926b213b3)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
e93daf4e71 XQuartz: fixed make dist 
(cherry picked from commit 2d52367ab9)
(cherry picked from commit 13eff12902)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
1cf76f23c7 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)
(cherry picked from commit fdf6425612)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
22d3ecda18 XQuartz: unset DISPLAY if we didn't get a launchd socket handoff 
(cherry picked from commit b959727f38)
(cherry picked from commit 9cbed0a325)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
9eb5f30929 XQuartz: unsetenv(DISPLAY) if we're not org.x.X11 
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
(cherry picked from commit 99b2cbf061)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
19e6f73710 XQuartz: Removed some debug spew 
(cherry picked from commit 370dcf11b3)
(cherry picked from commit 8065953ea8)
 2008-12-16 12:03:05 -08:00
Jeremy Huddleston
ced368287b XQuartz: darwinPointer reports the actual pixel position now rather than a relative position 
(cherry picked from commit a41e7f75de)
(cherry picked from commit 70930f6d31)
 2008-12-16 12:03:04 -08:00
Jeremy Huddleston
b5687a9d12 XQuartz: Corrected name/command labels in the customization widget 
(cherry picked from commit a689c23f17)
(cherry picked from commit 9ac2e68d86)
 2008-12-16 12:03:04 -08:00
Jeremy Huddleston
df3f23fe8d XQuartz: pbproxy: Simplify linking 
(cherry picked from commit 909cc5c4dc)
(cherry picked from commit cbb9ee57f8)
 2008-12-16 12:03:04 -08:00
George Staplin
db115e7870 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:15 -08:00
Jeremy Huddleston
d4fb734c63 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:01:07 -08:00
Jeremy Huddleston
e9ee5d4f61 XQuartz: Avoid some warning messages being spewed to system.log by AppKit 
(cherry picked from commit 780eff230c)
 2008-11-28 13:01:04 -08:00