Commit Graph

550 Commits

Author SHA1 Message Date
Jeremy Huddleston 5b91dfac6f Rootless: Abstract some of the Xplugin specific stuff which has crept into rootlessWindow.c
The rootless extension now directly calls some Xplugin functions, and relies
on types defined in Xplugin.h, which isn't very abstracted :-)

This patch is a start at abstracting some of the Xplugin specific stuff which
has crept into rootlessWindow.c.  This has been done in a pretty mindless fashion,
without much thought as to if the additions to the generic rootless interface are
the correct ones

There is some confusion as to if RootlesscolormapCallback() returns a Bool or
xp_error_enum value (not so abstact), but I have no way of checking, of finding
out if Xplugin actually checks the result :-)

Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-13 13:59:57 -07:00
Jeremy Huddleston 24e640e1fa XQuartz: Fix a possible minor memory leak 2009-10-02 19:20:24 -07:00
Jeremy Huddleston c4886fbabc XQuartz: Send mouse location with scroll events.
This fixes the problem where (0, 0) was sent as the mouse location with scroll
button events causing the event to not reach the client.
2009-10-02 18:58:35 -07:00
Jeremy Huddleston 3d7cf468df XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0
Is fink really _still_ relying on this X11R7.x version string?
2009-10-01 11:58:18 -07:00
Jeremy Huddleston 873467adad XQuartz: Set the proper bitmap for key repeats...
XkbSetRepeatKeys lies and doesn't do what it says it will...
2009-09-30 00:23:47 -07:00
Jeremy Huddleston f11a356bce XQuartz: Cleaned up keymap setting for easier maintenance
(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston f3223c71cf XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston 9b98b88322 XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston 6df00917ca XQuartz: Fix QuartzSetCursor to match the expected prototype.
(cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0)
2009-09-27 23:31:41 -07:00
Jeremy Huddleston 67a51cd9ef XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-09-27 23:31:35 -07:00
Jeremy Huddleston 96780eaf32 XQuartz: Nuke TSM
It's deprecated in SnowLeopard.  Ben and I both have no idea what it is for.  It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye.
(cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
2009-09-27 23:31:29 -07:00
Jeremy Huddleston 15e15816a2 XQuartz: Fix inverse map from mode_switch to alt
(cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
2009-09-27 23:31:23 -07:00
Jeremy Huddleston 558d803b29 XQuartz: Force a keymap resync on the first keypress to workaround XKB mucking with our keymap.
We need to find a better way to work with XKB on this.
(cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
2009-09-27 23:31:16 -07:00
Jeremy Huddleston 226b1033b4 XQuartz: Transition from xEvent based mieq to InternalEvent
(cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
2009-09-27 23:31:07 -07:00
Jeremy Huddleston a2cd211778 XQuartz: Stop checking version numbers of the bundle because CFBundleGetVersionNumber is gimpish
(cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
2009-09-26 23:45:35 -07:00
Jeremy Huddleston fbfbf93405 XQuartz: Add pressure/tilt property labels
(cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
2009-09-26 23:30:57 -07:00
Jeremy Huddleston 65f1484089 XQuartz: Fix a brain-o array indexing problem
/bop Peter
(cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
2009-09-26 23:30:51 -07:00
Jeremy Huddleston 7159381881 XQuartz: Nuke duplicate locks that make painful headaches
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
2009-09-26 23:30:46 -07:00
Jeremy Huddleston dc1e1bebff XQuartz: Use internal xshm header for new xextproto
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be)
(cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
2009-09-26 23:30:39 -07:00
Jeremy Huddleston 33bf9cb69d XQuartz: GLX capabilities: Allow 16bit accumulation buffers
http://xquartz.macosforge.org/trac/ticket/308
(cherry picked from commit e9e63a2118b76b6c31c4081fec08a99e4d796e22)
2009-09-23 18:21:48 -07:00
Peter Hutterer 55747d256d input: define server-supported protocol versions in one single file.
include/protocol-versions.h specifies each extension version as supported by
the server and sent back on the wire to the client.

This fixes up several issues with the server potentially reporting a higher
version of the protocol if recompiled against a newer version of the
protocol.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Rémi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
2009-09-21 21:47:35 +10:00
Jeremy Huddleston 422cd7a674 XQuartz: pbproxy: Remove debugging XBell()
(cherry picked from commit 1fd7c1fd4740393a32e261af33e64c19be48ca9a)
2009-09-14 14:29:50 -07:00
Jeremy Huddleston 1e0caf9a2c XQuartz: launchd: Fallback on :0 if prefix:0 gives an error for the socket name
(cherry picked from commit 647c871dc9f2d0adc172b401cde89ffbdfcc4d7a)
2009-09-06 14:06:28 -07:00
Jeremy Huddleston 081f72390a XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
2009-09-06 14:06:16 -07:00
Jeremy Huddleston 7ece2cb220 XQuartz: pbproxy: 64bit fixes: Properly process an array of Atoms
(cherry picked from commit 1b659cda1af02762a31cc7875e457b08c8dc68b5)
2009-09-06 14:06:06 -07:00
Jeremy Huddleston 1747120043 XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
2009-09-05 02:53:59 -07:00
Jeremy Huddleston 1f61bbeffd XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
2009-09-04 00:42:44 -07:00
Jeremy Huddleston 0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
2009-09-04 00:42:31 -07:00
Jeremy Huddleston a8e634b86d XQuartz: GLX: Drawable does not contain resize anymore.
(cherry picked from commit 1e642f22fbf029bb3917091cb5fa2f78b4a92f62)
2009-08-31 15:59:45 -07:00
Jeremy Huddleston 6f3cc08ec0 XQuartz: GL: Unset GL_EXT_gpu_program_parameters for Tiger/ppc
See http://trac.macports.org/ticket/20638
(cherry picked from commit 0f3a89d306838b3c75a73cd1e9e2928737222b70)
2009-08-31 07:45:50 -07:00
Jeremy Huddleston fdb29ebeed XQuartz: GL: Explicitly set GL_EXT symbols to 0 if they are not in OpenGL.framework to prevent X11's glext.h from setting them to 1.
(cherry picked from commit 7fe37137d826d1b698e87a5b35050dd02f0a4d4b)
2009-08-31 07:45:40 -07:00
Jeremy Huddleston af76bddd7a XQuartz: Check NSINTEGER_DEFINED to make sure the NSInteger and NSUInteger types are defined.
(cherry picked from commit 36e02a8649c0a545084cce5fb2c5717277b9273c)
2009-08-25 20:17:41 -07:00
Jeremy Huddleston 07c935b72f XQuartz: Use applewmproto 1.4 updated headers.
(cherry picked from commit 203df06c0eb2dcd5adfa788a1ba9569650c15f9c)
2009-08-25 20:16:47 -07:00
Jeremy Huddleston 931160fcf3 XQuartz: AIGLX: Provide empty __glXAquaDrawableResize to avoid crashing in DoMakeCurrent
(cherry picked from commit 60a1d2c2764f2f02c0751940a264588717afce79)
2009-08-05 16:17:47 -07:00
Jeremy Huddleston 0fe639a314 XQuartz: Only save lastpt on mouse/tablet events
(cherry picked from commit 552be074e5be6492df3e290e8b7d9daff1a2cb34)
2009-08-05 16:17:33 -07:00
Jeremy Huddleston 491c2d74c1 XQuartz: Use mouseLocation rather than locationInWindow when setting lastpt
I don't understand the *why* ... I just see that it works better this way for games like Quake2 through wine.  It *should* be better the other way, but somehow it's not.

I guess this will go in my list of puzzles to unravel.
(cherry picked from commit 65ae2d00e1a53f97f2ff9522406ab69d50bf3199)
2009-08-05 16:17:22 -07:00
Jeremy Huddleston df6c013524 XQuartz: Don't use location delta for tablets since NSEvent does not give a precise delta.
(cherry picked from commit 6c5bf756a7f5389cdfe2e43a339d7c31a3e522e9)
2009-08-05 16:17:09 -07:00
Jeremy Huddleston e360104880 XQuartz: Purge redundant QuartzBell
(cherry picked from commit de14a63d20095e1537fd74352850c734d900031d)
2009-08-05 16:17:01 -07:00
Jeremy Huddleston ae65daab08 XQuartz: Unify how we set our bitmasks for visuals
(cherry picked from commit c230b52c27ce50ac6c27011ec8e88f1b263b25f9)
2009-07-31 15:34:13 -07:00
Jeremy Huddleston 4a53fed41d XQuartz: Dead code removal for StaticColor visual
(cherry picked from commit e457a44e87950207f6c16bf82bf5af11c777ecf1)
2009-07-31 15:34:07 -07:00
Jeremy Huddleston da0a274780 XQuartz: Cleanup the bitmask setting for GLX visuals.
(cherry picked from commit d32c3df258e748958ef997c675dc4fae118c0d7b)
2009-07-31 15:34:03 -07:00
Jeremy Huddleston 70ac671af2 XQuartz: no DirectColor
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
2009-07-31 15:33:58 -07:00
Jeremy Huddleston c0c72a866a XQuartz: Define DDXRingBell
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
2009-07-31 15:33:54 -07:00
Jeremy Huddleston a85523dc50 XQuartz: Avoid a possible spinlock in applicationWillTerminate
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
2009-07-28 22:54:11 -07:00
Jeremy Huddleston 1e49c8d340 XQuartz: Avoid namespace collission for BOOL in Sparkle
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
2009-07-28 22:54:06 -07:00
Jeremy Huddleston c81595e23b XQuartz: Overhaul setting up visuals
The main change is cleanup of the visualConfigs and setting up alpha correctly there to match the visuals being added earlier (so the default visual has a corresponding GLX visual)
(cherry picked from commit 7351db5c8746be30a4047469ee9b50bc19e62a89)
2009-07-26 02:35:49 -07:00
Jeremy Huddleston 7f28c555b8 XQuartz: Use CopyKeyClass to copy the keymap to the virtual core keyboard.
(cherry picked from commit 9a801d1716f005c30be076fcc9ac8dbb3e74d989)
2009-07-25 20:19:05 -07:00
Jeremy Huddleston 1031ac3a73 Revert "XQuartz: Copy the keyboard map to the core keyboard"
This reverts commit 795de791cf.
2009-07-25 20:18:38 -07:00
Jeremy Huddleston 48703083a1 XQuartz: Use pDev=NULL for DarwinSendDDXEvent
These events aren't really related to physical input devices anyways, so it doesn't make sense to use the pointer.
(cherry picked from commit bfe0b9cfa7af4a48dba849cab1eb152c409b4e08)
2009-07-25 20:18:15 -07:00
Jeremy Huddleston dab8de0368 XQuartz: Bump the reported version to X11R7.4
(cherry picked from commit c83f701aa75c75433b8745f5d79bca3a7516df91)
2009-07-25 15:25:35 -07:00