4a53fed41d
XQuartz: Dead code removal for StaticColor visual
...
(cherry picked from commit e457a44e87950207f6c16bf82bf5af11c777ecf1)
2009-07-31 15:34:07 -07:00
da0a274780
XQuartz: Cleanup the bitmask setting for GLX visuals.
...
(cherry picked from commit d32c3df258e748958ef997c675dc4fae118c0d7b)
2009-07-31 15:34:03 -07:00
70ac671af2
XQuartz: no DirectColor
...
(cherry picked from commit df2fbc410f2c484612f65a6539a6cb069ef4a468)
2009-07-31 15:33:58 -07:00
c0c72a866a
XQuartz: Define DDXRingBell
...
(cherry picked from commit 113347381289497cb2a79994d0ef5f427ae63ac5)
2009-07-31 15:33:54 -07:00
a85523dc50
XQuartz: Avoid a possible spinlock in applicationWillTerminate
...
(cherry picked from commit f430cda0fdcc1a8fc5f4795743b40f09ff0bd869)
2009-07-28 22:54:11 -07:00
1e49c8d340
XQuartz: Avoid namespace collission for BOOL in Sparkle
...
(cherry picked from commit 227c6e01a641b72158201553273299283cdb5599)
2009-07-28 22:54:06 -07:00
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
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
1031ac3a73
Revert "XQuartz: Copy the keyboard map to the core keyboard"
...
This reverts commit 795de791cf
2009-07-25 20:18:38 -07:00
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
dab8de0368
XQuartz: Bump the reported version to X11R7.4
...
(cherry picked from commit c83f701aa75c75433b8745f5d79bca3a7516df91)
2009-07-25 15:25:35 -07:00
9e74bb97ab
XQuartz: xpr: Added missing include for RootlessHideAllWindows
...
(cherry picked from commit 75e104730810acbb11bf8503bac24ea25243b2ac)
2009-07-25 15:25:23 -07:00
09b024db63
XQuartz: Use the master device in DarwinSendDDXEvent to avoid duplicate events.
...
(cherry picked from commit 6fa62192af937aa9656f64b516050bc099231c7a)
2009-07-25 15:25:17 -07:00
795de791cf
XQuartz: Copy the keyboard map to the core keyboard
...
This still doesn't handle the modifier map... gotta figure out what to do now that SwitchCoreKeyboard is gone
(cherry picked from commit 427e1aab41dabb54354bfd30f2baae98ac8202c0)
2009-07-25 15:25:06 -07:00
fb46474feb
XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
...
This was in place to work around the issue that was correctly solved with the
previous commit (changing the Windows menu behavior). Reverting this change
no longer causes crashing, so it's safe to show the dialog now.
(cherry picked from commit 023cef31bbb2ab80a241098d82fcfd35ada75fc0)
2009-07-24 09:42:18 -07:00
0d73893a57
XQuartz: Change handling of Windows menu to workaround a bug triggered by mixing Sparkle and X11 windows
...
<rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
(cherry picked from commit 27ac5135267be9cb221329ae68461117dd43a4bf)
2009-07-24 09:42:00 -07:00
171409cecb
XQuartz: Set can_quit to true during a Sparkle-initiated relaunch.
...
(cherry picked from commit b2e9a77111d4572402d8ca95e3368db97ba7d598)
2009-07-24 09:41:46 -07:00
7ff84d350b
XQuartz: Added a "Check for X11 Updates..." menu item.
...
(cherry picked from commit 305144bfa4b59791123c44e869fab93a084792d6)
2009-07-24 09:41:32 -07:00
be4dd35ffe
XQuartz: Initial support for automatic updates through Sparkle
...
(cherry picked from commit c45f1be36426bceeef9af67c26351114f14f5277)
2009-07-20 22:04:18 -07:00
f517fca31d
XQuartz: Localization updates
...
(cherry picked from commit 4b797fc1edf2bd963410a3133e3d2182ccfda4c3)
2009-07-16 17:32:10 -07:00
c8a3516514
XQuartz: Cleanup getGlCapabilities to avoid hardcoding the number of displays
...
(cherry picked from commit 12f7365f1f58d648217b16f09c2152fa47dcd7a1)
2009-07-16 17:32:04 -07:00
e7bc9ff816
XQuartz: Allow more than 3 OSX displays
...
(cherry picked from commit 45045eb3968069a8d74ce9188890a5537dc60fec)
2009-07-16 17:32:03 -07:00
53ae6b6338
XQuartz: Cleanup keymap locking, fix a possible synchro bug
...
(cherry picked from commit 33e7437a4984ee7c1b04b87d23dee7d4739d5f12)
2009-07-15 23:18:35 -07:00
0b4e6af857
xquartz: switch to byte counting functions
...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-07-14 10:13:45 +10:00
d6b8205e69
XQuartz: ProcAppleWMAttachTransient to play nice with the new Dock in SL
...
(cherry picked from commit ddc0242d8f291d0f961ba9aa8c883e39861ce2ad)
2009-07-03 19:46:00 -07:00
b8050bb6de
XQuartz: Don't leave zombied processes at startup
...
(cherry picked from commit 40c1406830588fa85d880e9f4e9ca570db1db306)
2009-06-27 18:26:08 -07:00
aaff92c8c2
XQuartz: 64bit fix for screen origin in AppleWM
...
(cherry picked from commit 60a757d2802a5c34acd91ca9a052937b5a169ede)
2009-06-27 18:25:56 -07:00
cabcc1a7ad
XQuartz: More localization updates
...
(cherry picked from commit 5925c1f48ad05bf94195b986c1fdefc52a20ae42)
2009-06-27 10:42:50 -07:00
ae20e748cd
XQuartz: More localization updates
...
(cherry picked from commit 7fbe974246f54535c545861a57c043d80e127ee7)
2009-06-19 21:16:47 -07:00
a30fef9956
input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7
...
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-06-18 14:41:47 +10:00
077556ec39
XQuartz: AIGLX dispatch table cleanup
...
This should fix some issues when building on different versions of OSX. We only use extensions that OpenGL.framework's glext.h header tells us are supported.
(cherry picked from commit e10c53421f1e780573c8adcd8ea89d6ffa28a819)
2009-06-06 22:24:06 -07:00
2429daa7e6
XQuartz: Default to forcing the dialog box before quitting.
...
This will show the quit dialog for users of other WMs.
(cherry picked from commit 639ee0c913f892776fee40bcfb856e0d7c2c7db5)
(cherry picked from commit 09432fa5b1cc8e9a30fb8aa4f8dfcd08c4a91e30)
2009-06-06 22:23:46 -07:00
ec9e9c8bca
XQuartz: English localization update for HIG compliance
...
(cherry picked from commit 86b319d7cbef39d75b54c9d321e5dbf097b552be)
2009-05-29 11:44:53 -07:00
f1441b8353
XQuartz: More localization updates
...
(cherry picked from commit b107390c9f30571902556b4d053e62d345a06254)
2009-05-27 10:16:11 -07:00
c2b668e6ff
XQuartz: pbproxy standalone: added missing variable declarations.
...
(cherry picked from commit 2d947d17a3ef5fb8cef959bff0eb08b8bb5b6548)
2009-05-09 11:41:47 -07:00
987579c930
dix: remove all but main() from main.c
...
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-28 15:57:14 +10:00
ccd28ca2ad
XQuartz: Localization update
...
(cherry picked from commit 9435fc5e20e25ce66ec85bde033daff51f39f69c)
2009-04-22 19:30:33 -07:00
a362d0f4fb
XQuartz: Make sure the bgMouseLocationUpdated state is consistent
...
(cherry picked from commit 8fa8a8e1db60c8ac60d10f1f15517471d2291f77)
2009-04-22 19:30:18 -07:00
b406886bbf
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
...
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-04-17 10:03:40 +10:00
140463a197
XQuartz: Use correct values for ProximityIn and ProximityOut
...
This was the other underlying cause of teh 100% CPU tablet issue.
(cherry picked from commit a9cecf34c23fbcd59b56b380c51d31a9fabc3eb7)
2009-04-11 17:26:27 -07:00
80a7bb2605
XQuartz: Solve the tablet 100% CPU bug
...
This happened because we put a byte in the fd to wake up dispatch, but we never actually enqueued anything in mieq because the num_events was 0.
(cherry picked from commit c21ca7558d2faf93c61f5feaafd7c878e9e21942)
2009-04-11 17:26:07 -07:00
6f8f7c78f1
XQuartz: Re-enable background window checking
...
since that code was not the culprit for the wacom tablet, background 100% CPU bug
(cherry picked from commit fc1dc5d71b2a488a8a94d953dd8e67353161a590)
2009-04-11 17:23:03 -07:00
8522a759c9
XQuartz: Only set MotionNotify on activation if it is updated.
...
(cherry picked from commit ae8077a251ef27381a755d57ff974767bda16148)
2009-04-11 17:22:50 -07:00
5e55becddc
XQuartz: Make sure the Fn doesn't trigger unneccessary calls to DarwinUpdateModKeys()
...
(cherry picked from commit 70a18558c6b0a02b633fd8974f002cdf3cdc713e)
2009-04-11 17:22:38 -07:00
bd1d917909
XQuartz: Re-enable Fn as an option for 3button mouse simulation.
...
Patch from Martin Otte <otte@duke.edu>
(cherry picked from commit b5ec3be6b5449b5d575bc1472fdd1c9cb15cb8be)
2009-04-11 17:22:20 -07:00
808fd2c67f
XQuartz: xprSetWindowLevel updated to store the level requested by the WM
...
(cherry picked from commit c28c2ddc3a8f3c5b9beec396953bb3ac9ee4714b)
2009-04-10 00:48:35 -07:00
dfb0d7aefb
XQuartz: Update window levels when changing rootless state
...
(cherry picked from commit 1359ded5bfc14a80fb998b01a54ecacb96c4ff88)
2009-04-10 00:47:40 -07:00
d5ef88d754
XQuartz: Fix window levels for rooted mode to allow showing the menu bar.
...
(cherry picked from commit 80759a4186bf0335edc85aecea2faf11fe09f491)
2009-04-10 00:47:28 -07:00
15146b8637
XQuartz: Properly set the window level for the root window
...
(cherry picked from commit bdf9286d1cbfeaaf8eaf03d28091e91ee587ee25)
2009-04-10 00:47:16 -07:00
8d5dcfe215
XQuartz: Properly set the menu bar and hotkey state when changing rootless mode.
...
Currently no code path exhibits the broken behavior since we only toggle into rootless if we don't have the root.
(cherry picked from commit 970f100ca3c5fc0662ae7658d49d118fbd9de943)
2009-04-10 00:47:03 -07:00
82d7cf5cdc
XQuartz: In rooted mode, make sure we start in the hidden state.
...
(cherry picked from commit 5ecc497f71c2133f773f6c56ad76cb778862ddd6)
2009-04-10 00:46:48 -07:00
e86f4e9302
XQuartz: Send MotionNotify before button presses when X11 is in the background
...
(cherry picked from commit c80d0ec18ef5b842447d31360406d0b5b9424222)
2009-04-10 00:46:35 -07:00
5ccfad8df0
XQuartz: Revert most of the previous override redirect patch
...
The changes actually caused all windows to move to the current space. Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142c622541bb5bac98652abae75d1101d)
2009-04-10 00:46:25 -07:00
2c03a63ff6
XQuartz: Use updated Xplugin API to send overide-redirect windows to the current space when they're ordered in
...
This fixes the annoying "using a menu moves me to another space" bug
(cherry picked from commit 9e6dab89e08a26d764ba1aeaeb804c3d25c667da)
2009-04-05 16:32:12 -07:00
67621f3b39
XQuartz: Send a MotionNotify event for the mouse cursor when activating X11.app
...
Otherwise if X11.app was activated with a mouse click, the location of the even is the last location of the cursor before X11 was deactivated
(cherry picked from commit c7457d7b31ddd2ddfd04dd6294bed4532664e1ab)
2009-04-05 16:32:02 -07:00
9180081ec3
XQuartz: Still send mouse events while X11 is in the background if we have test extensions enabled
...
(cherry picked from commit f393fb686cfbedb11a1539d4eaf5c491af8b3a64)
2009-04-01 13:53:15 -07:00
029307e79a
XQuartz: Return BadRequest when SendPSN isn't implemented rather than success
...
(cherry picked from commit 49871e99179d5176a1ec516c8f449e2dc219faea)
2009-04-01 13:53:04 -07:00
0603fbc1d3
XQuartz: Pad xAppleDRINotifyEvent to 32bytes to match sizeof(xEvent)
...
(cherry picked from commit 276ee3bb087c772f57a987519aa4d94afeceadaa)
2009-04-01 13:52:52 -07:00
3311ef6ec9
XQuartz: Don't report mouse events while X11 is not the foreground application
...
(cherry picked from commit 5d1dd35096334b59564d77caef7a97bd58845c5d)
2009-03-31 18:13:18 -07:00
0b6e14d46f
XQuartz: Fix mouse tracking for quake, et. al. in wine
...
Patch courtesy of Codeweavers
Fix mouse movement tracking. For a non-window-related mouse-move event,
calculate the new position by adding the event's delta-x and delta-y values
to the previous mouse position. Do not rely on the current mouse position
because it may have been changed by a XWarpPointer call.
(cherry picked from commit 7a67935b05a475215b9bdbb959e4f7e15f32416f)
2009-03-30 20:41:38 -07:00
daa9727a02
XQuartz: Implement SendPSN for AppleWM
...
(cherry picked from commit 779e9fdc2de9bfebc5f0a4c9d5f42e389fdd8593)
2009-03-04 13:39:43 -08:00
7907b37d96
XQuartz: Don't erase the mode_switch+keysym if it's the same as shift+keysym
...
(cherry picked from commit 3e2427e6e9675dd655c8ad328b82e12191b064f2)
2009-02-26 21:26:01 -08:00
d6976e1436
XQuartz: Re-enable support for capslock
...
(cherry picked from commit 4901b8147e593d26d7a31a9b73a201254b948916)
2009-02-24 23:14:01 -08:00
4b63f88b0a
XQuartz: Comment out the background pointer interaction that seems to be causing CPU spinning on some configurations
...
(cherry picked from commit 1d479fa4f3bca9cbd81808a6c87582422fd2a257)
2009-02-24 22:22:03 -08:00
9531b96470
XQuartz: DefineInitialRootWindow is gone
2009-02-22 00:41:52 -08:00
c7c50157b5
XQuartz: quartzKeyboard compile fixes for recent XKB Changes
...
Seems we're less divorced from XKB than we'd like for now... hopefully not having any rules installed will still let us override things the way we want to...
2009-02-22 00:29:48 -08:00
61abf3189f
XQuartz: GL: Change from xalloc to xcalloc to potentially avoid
...
uninitialized data in the __GLXAquaContext.
(cherry picked from commit d3120241f9f48d21f9a6ecfb848434a4a0270855)
2009-02-21 23:35:26 -08:00
5587f9b771
XQuartz: GL: Fix a bug with an uninitialized GLX data structure.
...
This was causing a crash randomly, due to random memory contents.
Use xcalloc to prevent this in the future, due to future changes or mistakes.
Set the drawableType to include GLX_PIXMAP_BIT and GLX_PBUFFER_BIT.
The new libGL supports these.
Set the max Pbuffer width/height, based on the results of a test program.
We may someday want to revisit this depending on what users need, so that
we create a CGLContextObj, make it current, and call glGetIntegerv to
gather the information at runtime.
(cherry picked from commit c7e338330943e0d03a99328c740540d03f018d20)
2009-02-21 23:35:22 -08:00
372977354c
XQuartz: Fix the new ProcAppleDRIDestroyPixmap code REQUEST_SIZE_MATCH.
...
It had a copy and paste mistake that I didn't notice. :/
It was using the CreatePixmapReq.
Also add a missing B16 to the end of the length for the DestroyPixmapReq struct.
Now the AppleDRIDestroyPixmap request seem to work.
(cherry picked from commit 295fe25bd8fa2d141291a9d9b6ef7b75fcccb4dd)
2009-02-20 11:54:45 -08:00
67faf41b3f
XQuartz: Don't need GlxSetVisualConfig any more
...
Fixes build failure resulting from 516f8e2cad1311a09764e2633644188d1e3c31bb
(cherry picked from commit 066b17028a35956a089815716e38571f305469c5)
2009-02-17 23:27:08 -08:00
bac13e54b1
XQuartz: Add driWrap.h that I missed in the last commit.
...
This should complete the GLXPixmap commits for now.
(cherry picked from commit 7e99b55651bf7f6275bb227d02f203fb885a67a2)
2009-02-16 21:42:54 -08:00
95052caa2c
XQuartz: Add support for GLXPixmaps to the AppleDRI.
...
This involved wrapping some GCOps to get the proper behavior
when using X11 raster ops mixed with OpenGL (see driWrap.c).
This extends the AppleDRI protocol with create and destroy pixmap
functions.
The dri.c code has been extended quite a bit to enable this, and
to initialize the wrapping of CreateGC for GCOps.
This has been tested with tests/glxpixmap and proven to work with
the new libGL. Existing applications seem to work fine too. Redraws
all appear to be correct.
There may be some bugs lurking that I haven't found yet. I plan
to drive them out by extending the libGL test suite.
(cherry picked from commit 630518766b01022c49fe3a9e7d501808f71b06e2)
2009-02-16 21:42:45 -08:00
d229ba7068
XQuartz: xpr: The dri.c code for pixmaps was wrong in several ways. They weren't
...
being exported correctly by Xplugin.
This should fix a bug with the surface for a window, when an export fails.
Before the export could fail and leave behind an invalid (freed) pointer in the dix privates.
I have an idea of how to fix the GLXPixmaps now without using CGLSetOffScreen.
This work is a step towards that. The Xplugin will need a small patch to fix an
issue that this change brought forth.
(cherry picked from commit 58c4116c47543b5e30c2232e7bee8efc0b9be176)
2009-02-12 15:47:13 -08:00
b17d6bed97
XQuartz: Fix copyright info in Info.plist to be prettier when viewed in Finder
...
(cherry picked from commit 8b607c9c507a68a6abda63831d227d0f8947028c)
2009-02-12 15:36:01 -08:00
6869efae74
XQuartz: Accept bundle version 2.1.6 to work with our startup method
...
(cherry picked from commit 7f2966557374cb5ea22bc7b73d5ca04891eb5e78)
2009-02-03 10:04:40 -08:00
f5c7f8a3ab
XQuartz: GLX: Fix accidental exclusion of glBlitFramebufferEXT on Leopard
...
(cherry picked from commit 8620579483789ae9ac1b68dbefe32b70011386de)
2009-02-02 12:36:01 -08:00
e2b4d3d4a1
XQuartz: GLX: OpenGL.framework on Tiger doesn't have glBlitFramebufferEXT
...
(cherry picked from commit e01662cadcaa4052e3a5aa82cbaed00a2d0220e0)
2009-02-01 15:13:40 -08:00
b137a0cdb1
XQuartz: GL: indirect.c changes to fix the build with newer OpenGL frameworks.
...
(cherry picked from commit 143224405ba74929c702a95de52b56df140b0d1b)
2009-01-26 10:28:03 -08:00
34b896e50f
XQuartz: SnowLeopard: Help system book name changed in 10.6
...
(cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)
2009-01-25 21:26:04 -08:00
f06a9d2e05
Input: Clean up keymap change notifications
...
Keyboard map notifications are always generated from within XKB code,
which also takes care of copying the keysyms, etc. If you need to
mangle the keymap yourself, generate a new core keymap/modmap, and pass
it to XkbApplyMappingChange.
SendMappingNotify is renamed to SendPointerMappingNotify (and ditto its
Device variants), which still only _sends_ the notifications, as opposed
to also doing the copying a la XkbApplyMappingChange.
Also have the modmap change code traverse the device hierachy, rather
than just going off the core keyboard.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-01-22 15:08:58 +11:00
32db27a7f8
Input: Remove modifierMap from core
...
We already have modmap (in the exact same format!) in XKB, so just use
that all the time, instead of duplicating the information.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-22 15:08:55 +11:00
f062e90a95
Input: Remove modifierKeyMap
...
Since modifierKeyMap is generated from modifierMap, just remove it, and
only generate it when we need to send the modifier map to the client.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-01-22 15:08:55 +11:00
64f924fbf5
Kill off --with-mesa-source completely
...
There were a few spots left in the source that were using the
--with-mesa-source defined headers or the now removed $(top_srcdir)/GL
directory. These aren't needed anymore as all the necessary source for
GLX is in $(top_srcdir)/glx.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-01-18 09:49:06 -08:00
5c41b3f9c8
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 9cf264e67744262b9f45079e6cd752eb3e3b0e08)
2009-01-15 21:05:00 -08:00
c5d52d4c37
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 d514152195452ae11ec7769c76489651620ad380)
2009-01-15 21:04:54 -08:00
1c504dff8a
XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
2009-01-15 21:03:27 -08:00
67710ad1d1
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
...
(cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
2009-01-11 16:39:33 -08:00
0720816aea
XQuartz: Only call DarwinUpdateModKeys when needed
...
Previously, we were calling it on almost every itteration through sendX11Event
(cherry picked from commit 6461729647ff4441d80811e73f0c0d2f108f2700)
2009-01-11 16:37:46 -08:00
c8bf582db8
XQuartz: Comment explaining the 0x10 flag for [e data2]
...
(cherry picked from commit 3c695280641c1205b97d3bb9f1d5e15a19cfa45f)
2009-01-11 13:56:46 -08:00
5339c22a8c
XQuartz: Add locking to make mieq thread safe on OSX
...
(cherry picked from commit 7a8d2266861e74176b5310b83652a9c10a170494)
2009-01-11 01:56:45 -08:00
1beff89810
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 c137f681680e1d04b1513a8be68aeda4d1c56fd5)
2009-01-11 01:55:26 -08:00
7a8abb9c85
XQuartz: Bundle version 2.4.0
...
(cherry picked from commit 3a3ccf5354e4275abe9d01f41a92602df5d690dc)
2009-01-11 01:54:28 -08:00
0d8184de59
XQuartz: GL: Set the __GLXconfig renderType to GLX_RGBA_BIT.
...
(cherry picked from commit 3c14546f58f8a138fe67c9cacc3bd0b7fa90c29a)
2009-01-10 01:00:24 -08:00
9c3975d63e
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 94162b0f8a25267aca280d25e216cc6bde47da6e)
2009-01-10 01:00:09 -08:00
a68373994f
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 f7b6c1907c326a1befd8b5c8a1d311d551e8670f)
2009-01-10 00:59:16 -08:00
fc14d52297
XQuartz: Use AvailabilityMacros.h instead of availability.h for Tiger
...
(cherry picked from commit 91f3c3435716195e6d606c8e2f6b0de52eb5972d)
2009-01-07 01:48:23 -08:00
af820259a0
XQuartz: Copyright Update... happy new year
...
(cherry picked from commit 9f1c26ae8d9ccf81cba0ab946326968a701f8c36)
2009-01-02 11:07:29 -08:00
d8c9ba37ab
XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock
...
(cherry picked from commit 49e59d32b88e4fad070f230b5efaa261b47f78db)
2009-01-02 11:02:42 -08:00
2f361186f9
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 cb912aca3a2834c4ad8e386c8a0d05c1bb31b0e7)
2008-12-31 12:45:34 -08:00
a2abaa9fd3
XQuartz: Make sure to reset the saved key state when deactivating X11.app
...
(cherry picked from commit 3eef78eb321f4f7dbca5a10c80666c621e28a1e0)
2008-12-31 12:45:13 -08:00
3986b683ad
XQuartz: Honor system key repeat rate
...
(cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e)
2008-12-31 12:44:43 -08:00
1a69d56afd
XQuartz: Better avoid stuck keys on context switches
...
(cherry picked from commit e9963f1a4f4f12f253eae9d4f01694b6cabe35ad)
2008-12-31 12:43:17 -08:00
f464b5a916
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 bc13dda345f716bf4de9bfe4e1d85969263b60c2)
2008-12-31 12:43:02 -08:00
3ead9aa260
XQuartz: Updated man page fullscreen_hotkeys fullscreen_menu
...
(cherry picked from commit 00f3a2e33c8e91da5f855821313a04ea97445656)
2008-12-31 12:42:48 -08:00
997e8c321b
XQuartz: Try harder to get the user's login environment
...
(cherry picked from commit 6bedaddd78aa04bd303df434a4c49bb87bd7deaa)
2008-12-28 22:17:31 -08:00
ae8dc47fd9
XQuartz: Reposition windows when we enter fullscreen to ensure our root window
...
(cherry picked from commit 7617d3659b5481ef85aecc1f936e7dd2662bdfbd)
2008-12-28 22:17:16 -08:00
895186e026
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 8121f30bd29591fc74fbc680fbbf20210271fa58)
2008-12-28 22:17:03 -08:00
a1b201bcb0
XQuartz: Use depth=24 instead of FatalError if we can't figure out our depth
...
(cherry picked from commit 80b65c5b78d125c4ad3620b87b121c9e666299c3)
2008-12-23 12:45:57 -08:00
ba9dc353a6
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 33f43a7f03023bfbab25a957cb81fc25b4afa4ca)
2008-12-21 21:36:02 -08:00
f0cdccd1e2
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 508aa95bc2cd3fdc3dff448ec090919bf807d153)
2008-12-21 21:35:46 -08:00
8f04a52373
XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
...
(cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
2008-12-21 21:35:33 -08:00
029d255a65
XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock
...
(cherry picked from commit 22f664ab95a0cae981e9cefad6f075d051583ca5)
2008-12-21 21:35:22 -08:00
b1f166f298
XQuartz: update quoting in case X11.app is moved to a directory with a space.
...
(cherry picked from commit cc805dc799efa37c8dcefa3db04d87e9b835ffbd)
2008-12-21 21:35:04 -08:00
2f47bda645
XQuartz: Changed X11.sh to allow use of a ~/.x11run as requested by users of alternate shells
...
(cherry picked from commit b62ed1f8eaf041a946bb591165bb18ee481dedbf)
2008-12-21 21:34:50 -08:00
22b2811e6a
XQuartz: Name the startup shell script X11 for better compatability
...
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
2008-12-21 21:33:17 -08:00
450739efa9
XQuartz: Updated menu item ordering for better HIG compliance
...
(cherry picked from commit 4c9bb241ce5fb856fab20ae96fa89bd2b71ef242)
2008-12-15 03:22:17 -08:00
aee27be278
XQuartz: Tiger fix, don't call Xplugin code in the Appkit thread if Xplugin isn't threadsafe.
...
(cherry picked from commit 748d9e5bd756513d42c4046f3b31e1fdc55bccb6)
2008-12-15 03:22:01 -08:00
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
119d9c46e8
XQuartz: Fix path to executable
...
(cherry picked from commit 7e9d3698e070a0c63dd2556651373c3aca58e2fe)
2008-12-10 15:08:33 -08:00
c46b564c47
XQuartz: fixed make dist
...
(cherry picked from commit 2d52367ab92429e58596d1a1ed3ef52a0a38a7aa)
2008-12-10 15:08:20 -08:00
23156a21d8
XQuartz: Make debugging output for invalid depths a bit more detailed
...
(cherry picked from commit 609fb166b7062c76f0561df12ffe893811f6ac8f)
2008-12-10 15:08:05 -08:00
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 f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
2008-12-10 15:07:52 -08:00
e5ce6e198f
XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
...
(cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac)
2008-12-10 15:07:35 -08:00
ecaaf0462d
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
...
Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
2008-12-10 15:07:26 -08:00
ea94995982
XQuartz: Removed some debug spew
...
(cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0)
2008-12-10 15:07:15 -08:00
ccd2c668c1
XQuartz: darwinPointer reports the actual pixel position now rather than a relative position
...
(cherry picked from commit a41e7f75decd340d064fdc0d2c4fe6c88d7dbc82)
2008-12-06 14:12:27 -08:00
7ebd0c7e8d
XQuartz: Corrected name/command labels in the customization widget
...
(cherry picked from commit a689c23f17eb445c36b97eb617ef4b8bd157985f)
2008-12-06 14:12:27 -08:00
fa4f2527a5
XQuartz: pbproxy: Simplify linking
...
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
2008-12-03 21:59:23 -08:00
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 755f53eb40c4329d8c82a31cb910c31fdd4ea12e)
2008-11-28 13:18:27 -08:00
3d527b91b4
XQuartz: Added option to enable/disable test extensions
...
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
(cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
2008-11-28 13:02:54 -08:00
71d3df7cc3
XQuartz: Avoid some warning messages being spewed to system.log by AppKit
...
(cherry picked from commit 780eff230ce41ad785e54d61a82c731269ae0446)
2008-11-28 13:02:52 -08:00
a9796c7bc4
XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
...
(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
2008-11-28 13:02:41 -08:00
ef4179f43a
XQuartz: Fix dead-acute on Greek keyboards
...
(cherry picked from commit 807f2ec35c5f95b56b3e2b5eac51aec300fe5cb6)
2008-11-28 13:02:25 -08:00
800f5c681b
XQuartz: Fix Czech keyboard dead-acute
...
(cherry picked from commit 771df2786bc60389489f0967e705c7c95bdda085)
2008-11-28 13:02:12 -08:00
ac57bb36d5
XQuartz: Fix an uninitialized keyboard_type on Tiger
...
(cherry picked from commit 27b1a5eb3482052253ebdce1a09aedf05ac1b099)
2008-11-28 13:01:59 -08:00
eb474adf98
XQuartz: Simplify the xquartz_resetenv_display path
...
(cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
2008-11-25 11:53:12 -08:00
94df1ab7f0
XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
...
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
2008-11-25 11:53:06 -08:00
0b314c50a2
XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
...
(cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51)
2008-11-25 11:52:59 -08:00
065d2afb0c
XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard
...
(cherry picked from commit 7a8c6665949d7804a97ef2539a74ec4aa682e1cc)
2008-11-25 00:54:52 -08:00
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 fbf4b0d33fa5dc618c3191a4e823232dfa33cd95)
2008-11-25 00:54:47 -08:00
40187f782b
XQuartz: Dead code removal
...
(cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385)
2008-11-25 00:54:42 -08:00
b55cad4569
XQuartz: Don't hardcode values of org.x.X11 for the preferences domain
...
(cherry picked from commit 3a500d9247cf34686ec17b4a88c34d51ecd38ecd)
2008-11-25 00:54:37 -08:00
d508a3dcca
XQuartz: More dead code removal
...
(cherry picked from commit dcb0f6a2e62823a671051874d14a33ce59505892)
2008-11-25 00:54:32 -08:00
41fbdf72f2
XQuartz: Disable some error spew on Tiger (where it wouldn't be an error)
...
(cherry picked from commit 73ec6d3dfe0086d352f4eca25f1df5ae1884bb18)
2008-11-25 00:54:27 -08:00
09c3f6e04c
XQuartz: Dead code removal
...
(cherry picked from commit 46c077d9b4a883fc809c32077ce40f33a70d268b)
2008-11-25 00:54:22 -08:00
ab12c75162
XQuartz: More Tiger cleanup: bootstrap_strerror
...
(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
2008-11-25 00:54:17 -08:00
8964b8d0ec
XQuartz: More 1.6 server API updates
2008-11-22 14:23:23 -08:00
ad0f232165
XQuartz: Fixed --disable-glx
2008-11-22 14:04:28 -08:00
8e2287c220
XQuartz: Updated some code to use newer server API
2008-11-22 13:57:45 -08:00
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 b772d64fce31d16b498c621096e39d5203994d6e)
2008-11-22 11:13:51 -08:00
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 17f6a261fca6d5856069dce28bb4838261afc6bc)
2008-11-22 11:13:46 -08:00
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
1a717779b6
XQuartz: GL: remove glcontextmodes.* from the Makefile.am. It has been replaced.
...
The new replacement is __GLXconfig.
(cherry picked from commit 3bed9b65c807a1aeb662b8042826cbb54280181d)
2008-11-21 20:10:57 -08:00
ca64b5949d
XQuartz: Don't use LS to find X11.app on Tiger.
...
(cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)
2008-11-21 11:55:49 -08:00
393325f908
XQuartz: spewCallStack is noop on Tiger now...
...
(cherry picked from commit 56c469a68b92c6cf003802f418ea00bd596a41c3)
2008-11-21 10:59:41 -08:00
5d47a5d652
XQuartz: pbproxy: Added some typedefs for types not available on Tiger
...
(cherry picked from commit 0947aa7911f1de44bfe16e505a757b659c5ab2a8)
2008-11-21 10:59:34 -08:00
b262788401
XQuartz: More Tiger ifdefs
...
(cherry picked from commit 803509072f2c039e5cd555c4ac14d672f0e698c5)
2008-11-21 10:59:26 -08:00
5107444443
XQuartz: Resurrect the old audio path for Tiger
...
(cherry picked from commit a61a8d9047e8765faf3892f4f2148c8553fd192c)
2008-11-21 10:59:17 -08:00
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 799715b8f3327c8da59ab45706e85af2d2c438e4)
2008-11-21 10:59:10 -08:00
c4ec71b405
XQuartz: pbproxy: nuke RCS Id, update header license/copyright
...
(cherry picked from commit 477c6968a88429bb9c10222a5836bdc936d10ab1)
2008-11-19 10:58:15 -08:00
42f330cf9e
XQuartz: pbproxy: Remove thread-main.m
...
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a2d10022fa92725d2d1837da4b3b89f)
2008-11-19 10:58:06 -08:00
03f7a66a1a
XQuartz: Don't use TIS on Tiger...
...
(cherry picked from commit be8ac84c15e7e76c581b9e75cda74139394aa4c7)
2008-11-15 19:52:52 -08:00
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 42944936326ef8732f622db9f75b79a92980550d)
2008-11-15 19:52:34 -08:00
bc4f804cd8
XQuartz: Actually add glcontextmodes.[hc]
...
(cherry picked from commit 763195d338345e3637d112279bdbe002b6e7791a)
2008-11-14 15:13:59 -08:00
aedafbea0e
fix compilation on systems that don't have
...
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2f3a84f7e5164b918737b3975517c12)
2008-11-14 15:11:42 -08:00
b078936571
XQuartz: Initial work on readding GLX to the 1.5 server
...
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
2008-11-14 15:10:32 -08:00
1d7049f8fd
Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
...
(cherry picked from commit 7dff93ec1ac92aeaf3b70d5cfe787fa4a28c0dba)
2008-11-14 11:10:24 -08:00
3c12483264
XQuartz: Made X11Application.m a little more tidy.
...
(cherry picked from commit 3520386261b838196a8918e8bee16bdccbc9781d)
2008-11-14 11:10:15 -08:00
5bad5d2abe
XQuartz: Fixed XBell() when not using system alert.
...
(cherry picked from commit aa0e9ab1c7a226cdcb3c5e62be159355a290faf8)
2008-11-13 11:34:32 -08:00
0fca8588a2
XQuartz: Added more debugging to handoff spew
...
(cherry picked from commit acefa7e3c8706ffedc052effd50b36ce10e72c22)
2008-11-13 11:34:27 -08:00
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 ed181382ddeb77019577d39b9c06b1cd839e18e4)
2008-11-13 11:34:21 -08:00
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 373b8a5f32509722e06d8776109e6c3f06645ee0)
2008-11-13 01:19:43 -08:00
1523476afa
XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
...
(cherry picked from commit 54d20f6d33c347bcb37a0a8287c2d92fed2b9092)
2008-11-13 01:19:35 -08:00
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 d1d398db762fe7d5720f9b5fafa2bbe8372fceac)
2008-11-13 01:18:49 -08:00
f59352881f
XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
...
(cherry picked from commit 980df1b4ff7d4dab9dc1462dc086542265b1fb1b)
2008-11-06 14:49:54 -08:00
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 f527381eea6a8ae6cd791475b2060d21fcf8efb2)
2008-11-05 19:23:48 -08:00
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 1e5f63f15e13a40a6e69a1505934d10d6990b6a2)
2008-11-05 19:23:41 -08:00
39e82a9b12
XQuartz: Replace deprecated API usage thanks to Robery Murphy
...
(cherry picked from commit 71dd052412400362793f2f0c7c02bf4f4309738c)
2008-11-05 19:23:36 -08:00
b4db46320a
XQuartz: version string updated for 2.3.2_beta3
...
(cherry picked from commit 81bb4128570b44d779126a8dffcd3c5620747383)
2008-11-05 19:23:30 -08:00
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
f8af66ddb2
XQuartz: Add option to allow access to the menu in fullscreen mode
...
(cherry picked from commit 637a9f4bd1ff2b55c870a08ead4940df0f9818e5)
2008-10-31 20:05:39 -07:00
c5086badf0
XQuartz: LP64 related casting fixes from Bob Murphy
...
(cherry picked from commit ea71710aaa7166ab510abe70f2dc47942de0ead7)
2008-10-31 19:03:38 -07:00
ecd55bc859
XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
...
(cherry picked from commit c883a78ef0c2e7e29437881db85d3815a89ab874)
2008-10-31 15:50:06 -07:00
9f49f5172d
XQuartz: Silence pointer debug spam
...
(cherry picked from commit 9ca099e928653b5a0fb745186e17bfcc3d74ccc0)
2008-10-31 15:49:52 -07:00
93298c7f8f
XQuartz: Don't map the menu bar to the screen area.
...
(cherry picked from commit 1115917ada127a1cd6a8b61efe7fd134e2ea85fd)
2008-10-31 15:49:44 -07:00
31907986a6
XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
...
(cherry picked from commit 5fc73b1141eca8b678e54412ca33afa31a76d088)
2008-10-31 15:49:32 -07:00
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 d5c17f585a240be9f9135975738e62951cde3353)
2008-10-31 15:49:25 -07:00
5287602a41
XQuartz: if 0 out a block to avoid thread-unsafe lockups
...
(cherry picked from commit 60d7359a67900ad4601dbc73e07bcd8c803100a5)
2008-10-31 15:48:24 -07:00
93d7cd31c5
XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
...
(cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7)
2008-10-31 15:48:15 -07:00
f12d7ad164
XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
...
(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
2008-10-28 22:01:40 -07:00
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 5797d5b662817a3369a74a673f4a7c995cde75cf)
2008-10-28 22:01:34 -07:00
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 9be5998ede7427f14dd9597e117b3d6b427ba4e5)
2008-10-28 22:01:29 -07:00
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 8d048cfa956f4a0860250cc836a6748912b37ad8)
2008-10-28 22:01:22 -07:00
b742da0b71
XQuartz: pbproxy: fixed blocking
...
(cherry picked from commit bb330a1b1c480e89727fb75ff5aeb71f4afc5ee3)
2008-10-28 22:00:52 -07:00
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 3647215310f5a52126661b9ec473dcfeed25b40f)
2008-10-28 22:00:42 -07:00
e7c26964ee
XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
...
(cherry picked from commit fe35a3639081dc78ac6cc4123cde37770f6a39fd)
2008-10-28 22:00:36 -07:00
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 98a084ce9c455260ecdb5f8eecb67f33dbb53b69)
2008-10-28 22:00:29 -07:00
80b6768536
XQuartz: Do check_xinitrc() later to avoid possible deadlock.
...
(cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)
2008-10-23 19:22:36 -07:00
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 6bcbb9ba85d95d7df63811a482abc39c4d595366)
2008-10-23 19:22:28 -07:00
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 49b7a7c6f20ca85d4d624444eb83db2f91344591)
2008-10-23 19:22:16 -07:00
28d4f71193
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
...
(cherry picked from commit 6622efca216663c99d112c7a226bde691d1f3215)
2008-10-23 16:30:53 -07:00
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 bf561a06b2bf60395d26026ac7627d0cb254bc07)
2008-10-23 14:17:19 -07:00
75067d12e4
XQuartz: Added missing semicolons to Localizable.strings
...
(cherry picked from commit e9fe3f36d9529f00daeefa1379cdd6f01a88f410)
2008-10-23 14:17:10 -07:00
a003932dcc
XQuartz: Default dpi to 96 instead of 75
...
(cherry picked from commit 08a5a333d7fea68146cd9cf50682b811378ab3ce)
2008-10-23 14:17:04 -07:00
2d764e21f2
XQuartz: pbproxy: SIGHUP reloads preferences.
...
(cherry picked from commit cbc0935ef74ebd76ed3db16d6ab86043eeed42a3)
2008-10-23 14:16:57 -07:00
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 10090a132a0110fe24c8c886d9f53e6e947f8038)
2008-10-21 09:34:56 -07:00
2a9613980f
XQuartz: More fullscreen fixes
...
Start in rooted mode when enabled
Make the hotkey cmd-alt-a behave
(cherry picked from commit 22a54e46176c9cbdfaaa59ef33a6ae6a9c4969ef)
2008-10-21 09:34:49 -07:00
e4ea1494de
XQuartz: Cleaned up keyboard init and map reload.
...
(cherry picked from commit f78c9fc06cac2cc6ddfd6e9ba435dd26a57d1f51)
2008-10-21 09:34:40 -07:00
ebb2e1449c
XQuartz: Fixed follow-keyboard-layout
...
≈
(cherry picked from commit a9f9fbf512c9fd5a773fce402182486edc71d5ab)
2008-10-21 09:34:28 -07:00
f67cd31d2c
XQuartz: More progress towards fullscreen...
...
(cherry picked from commit 628cae86b4ad02c49d20df1e1afdcb7abcabb649)
(cherry picked from commit b47b7ab6d6d0a7f6cbf678a5755124d6b7516d3e)
2008-10-21 09:34:17 -07:00
d434ed4009
XQuartz: Fixed missing key-equiv for Hide-Others.
...
(cherry picked from commit 2c4b0f9615b646712609ebef3c0851c9a22e781b)
2008-10-21 09:32:20 -07:00
f935c11398
XQuartz: pbproxy: Fix 2 bugs with the preferences.
...
Add dump_prefs() for instrospection.
Make prefs_get_bool a little more clear.
In get_property don't assume that the Mac realloc(NULL, 0); returns
non-NULL. We shouldn't depend on implementation-defined behavior too
much.
Add more commentary in various spots.
Add TARGETS in the TARGETS response. I don't know why some X11 apps
do this, but it could be something that some weird toolkit/app tests
for.
In reload_preferences add preferences synchronization, so that xpbproxy
reloads the preferences, and picks up any changes.
Fix a typo/misspelling of the sync_clipboard_to_pasteboard preference.
(cherry picked from commit 165cbbb90c793d9335ea76f0274b1f60ad295903)
2008-10-21 09:32:03 -07:00
4d978af5c7
XQuartz: Fixed window levels.
...
(cherry picked from commit ef4d37c73f31048dd74efee2c63fa08b92608f87)
2008-10-21 09:31:56 -07:00
84ef8ed6fb
XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
...
(cherry picked from commit bcb83eea729a01026d99d1cfc2b77385b5b275fd)
2008-10-15 17:31:54 -07:00
d13c3cbd43
XQuartz: Some motion made towards supporting fullscreen.
...
(cherry picked from commit 99be3d68b64059caada739a373e5e01844c776e0)
2008-10-08 18:45:17 -07:00
dc166bf642
XQuartz: Fixed EXTRA_DIST for new GL files.
...
(cherry picked from commit a11c9052030b44045f037050a5825256b539ed50)
2008-10-08 18:45:13 -07:00
8033279294
XQuartz: GL: setVisualConfigs() copied the behavior of indirect.c which is wrong, with regard to the handling of xcalloc failure.
...
Use ErrorF for an error message after an xcalloc failure, and return instead of falling through to GlxSetVisualConfigs, or abort()ing at the test branch.
(cherry picked from commit 1056700971fd5c034396ed6dbea15e092f0c6332)
2008-10-08 18:45:09 -07:00
f1fec6f323
XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
...
(cherry picked from commit 97173d4eda142c73bb975cc05225b791778f85af)
2008-10-08 18:45:04 -07:00
52accec7db
XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
...
(cherry picked from commit 190a3d5e5de9915931928fb8e6da88bb9644cda4)
2008-10-08 18:44:28 -07:00
63abdf6115
XQuartz: GL: Add the new C code to the Makefile.am.
...
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
2008-10-08 18:44:24 -07:00
a8f5d422c9
XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
...
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
(cherry picked from commit fc86f9e4482043eca76d9d7a96e166be1aabf674)
2008-10-08 18:44:21 -07:00
2998e48be3
Xquartz: Fix parallel builds
...
(cherry picked from commit 1fe7298a3b9a2ed82c612292f9e547cf78f99ae5)
2008-10-08 18:44:17 -07:00
8a5b89e8e1
xalloc+memset(0) -> xcalloc
2008-10-06 15:36:51 -04:00
aacac3edac
XQuartz: Bumped bundle version to 2.3.2 for beta1
...
(cherry picked from commit 2021c4c4e726a6b8f27f19f16ed3d86e37dbe448)
2008-10-04 21:17:14 -07:00
ed3134918d
XQuartz: pbcopy: Re-enabled some code I commented out for testing
...
(cherry picked from commit 9b5d11409264080e394c8f18e06237122de80014)
2008-10-04 21:17:09 -07:00
b3a971d8b5
XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
...
(cherry picked from commit f7673bb4de3c1f71eb390a3279eed3589efc3df4)
2008-10-04 21:17:02 -07:00
fc35c7a2e2
XQuartz: GLX - enable_stereo defaults option should work now
...
(cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)
2008-10-04 21:16:54 -07:00
e6b1c1fada
const cleanup
2008-10-03 17:51:19 -04:00
7bb73a9513
XQuartz: pbproxy: Possibly fix a memory leak by using an [NSApp run] loop,
...
instead of calling CFRunLoopRun() directly. The leak wasn't reproducible on
this machine, but someone was able to produce a leak trace with Instruments
that indicates it was leaking in the CFRunLoopRun() path.
x-input.m: dequeue and ignore events when pbproxy_active is false.
x-selection.h: add an is_active method that is used by x-input.m to ignore
events.
x-selection.m: Handle nearly every preference, except for primary_on_grab,
which I don't really understand yet.
(cherry picked from commit 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
2008-10-03 11:14:49 -07:00
2a5ce41f03
XQuartz: Use "pointer" and "pen" for device names to please GDK.
...
(cherry picked from commit 00ca0f4d839abf47e9573a1552473e039cf787e6)
2008-10-03 11:14:43 -07:00
d3f597a986
XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
...
(cherry picked from commit 9a91d770a6411dd876187e64a8bda1f0745169ae)
2008-10-03 11:14:40 -07:00
1657dfb843
XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
...
(cherry picked from commit d79ccb45f68b65d65718b5b77efe2fae6eeda762)
2008-10-03 11:14:38 -07:00
88bb8c6f48
XQuartz: Removed resolved comment about localization.
...
(cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
2008-10-03 11:14:34 -07:00
b1d0b19661
XQuartz: pbproxy: Make the signal handler safer by using _exit, and only exit.
...
Remove some unnecesssary headers.
Remove some dead code that was never called or used in pbproxy.
Make use of an NSAutoreleasePool in x_init. It could potentially cause a leak
on a startup without this.
Start adding reload_preferences to the x_selection class, as well as event
handling for that.
(cherry picked from commit 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
2008-10-03 11:14:30 -07:00
ecd260143c
XQuartz: Added some localizable strings that were missing.
...
(cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
2008-10-03 11:14:28 -07:00
aae878b890
XQuartz: Actually send the pointer event from the pen even if it happes to actually have 0 pressure and 0 tilt.
...
(cherry picked from commit f41583761955cb9c92c43239bfaa8ae0e5d95e33)
2008-10-03 11:13:03 -07:00
b7ad86ff8a
Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
...
(cherry picked from commit c2012138a520560f8a2160518ea73fced410c3b7)
2008-10-03 11:12:57 -07:00
5446adebfb
XQuartz: Send AppleWMReloadPreferences where appropriate.
...
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
2008-10-03 11:12:49 -07:00
6020c3fbfe
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
...
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
eb8be3e90a
XQuartz: pbproxy: Fix another STRING bug.
...
Fix the usage of the NSString cStringUsingEncoding: - it doesn't NUL
terminate the string, which lead to a bus error. So, we use
lengthOfBytesUsingEncoding: to get the length in bytes instead of
strlen().
(cherry picked from commit 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
2008-09-26 12:31:33 -07:00
edfa3f8233
XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.
...
(cherry picked from commit 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
2008-09-26 12:31:29 -07:00
12a59c44cb
XQuartz: Fixed threading issue with TSM.
...
(cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
2008-09-26 12:31:21 -07:00
ee87c9b024
XQuartz: pbproxy: Removed stray SPI include.
...
(cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
2008-09-26 12:31:18 -07:00
591cc57627
XQuartz: pbproxy: Fix 3 paths that could leak memory.
...
2 of the paths leaked, when INCR transfers were done. Now we
are leak free according to the leaks program for all transfers
I have tried so far.
(cherry picked from commit aa98db576bc02f0765cb35d0282a894ba3778213)
2008-09-26 12:31:12 -07:00
586fbc91df
XQuartz: pbproxy: Fix NSObject memory leaks by properly using the
...
NSAutoreleasePool. Now the usage is consistent. In x_input_run()
we create a pool, and release it after processing the XEvents.
Add some getpid() output to main for debugging. It needs a bit more
testing before the next release.
Don't retain the NSPasteboard as the old code did. That may have
contributed to the leak, and it made it so that we needed the
NSAutoreleasePool created in main().
Remove the _known_types, and _pasteboard instance variables from
the x_selection class. They aren't needed anymore.
The leaks program now indicates 0 leaks after some usage. I want
to test further, but this seems much better, and my memory usage
graph indicates it's not growing.
(cherry picked from commit b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
2008-09-26 12:31:06 -07:00
238999cfc9
XQuartz: pbproxy: Add a comment to pbproxy.h about how the DB()
...
macro causes a leak (according to the leaks program).
Attempt to fix several other leaks with release method calls.
For some reason the process still grows more than it should...
I will need to use some better methods than leaks, and malloc_history
I suspect. Whatever is leaking, it's hard to find. I need to isolate
the cases more.
Add a missing image/jpeg branch.
Remove read_prop_32 - it's not used.
(cherry picked from commit 63a680354dcb545fef935ac97596dd35ceaed960)
2008-09-26 12:31:01 -07:00
af0d5e2ef7
XQuartz: 64bit crash fix ... don't pass pointers through xe.
...
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
2008-09-21 17:40:42 -07:00
852a0b0dde
XQuartz: pbproxy: Add an X error handler that returns 0.
...
Move the struct atom_list into the x-selection class, so that it's
no longer a global variable named atoms. This may ease pthread
integration and reduce the chances of symbols conflicting.
(cherry picked from commit c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
2008-09-21 17:40:42 -07:00
7fa6fc5ad0
XQuartz: pbproxy: Fix a bug that occured when a PICT format was available.
...
We may need another branch to convert a PICT to a PNG or JPEG. For now
TIFF works well in all of the test image copying apps when converted to
PNG or JPEG with an NSBitmapImageRep class.
(cherry picked from commit adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
2008-09-21 17:40:41 -07:00
f67490ceb5
XQuartz: pbproxy: Make the proxy handle copy request races, and PRIMARY
...
INCR transfers mixed with a CLIPBOARD change.
Fix a bug with some UTF-8 transfers. I can only guess that my UTF-8
tests before were inadequate. I can now copy/paste any characters between
uxterm and Textedit.app.
(cherry picked from commit 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
2008-09-21 17:40:41 -07:00
b666ffd781
XQuartz: "Disable" the text when syncing is disabled.
...
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
2008-09-21 17:40:41 -07:00
dba290ec23
XQuartz: Added a preferences UI for pbproxy options.
...
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
2008-09-21 17:40:35 -07:00
a928cae57b
XQuartz: pbproxy: Add a missing include of Xutil.h. Another header
...
seems to have done this before, but correctness matters.
(cherry picked from commit 1b4987e779d97b90669bac2405a4672085677f7c)
2008-09-21 17:40:16 -07:00
749bdf19b2
XQuartz: pbproxy: Add COMPOUND_TEXT handling. Do misc. cleanups with testing
...
to verify that the behavior didn't change.
main.m: XInternAtom compound_text, and atom_pair.
pbproxy.h: Add compound_text and atom_pair to the struct atom_list.
x-selection.m: Add an #include of Xutil.h. Refactor the reply struct
initialization to be done in a common place. Add send_reply: to simplify
the code a bit more. Add send_compound_text: which handles the
COMPOUND_TEXT type. Add the beginnings of a send_multiple:. Change
handle_image:extension: to handle_image:. The extension: message isn't
needed anymore.
(cherry picked from commit 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
2008-09-21 17:40:16 -07:00
00bfbee59f
XQuartz: pbproxy: pbproxy now responds to selection request events.
...
We can now copy and paste images to and from X11. Text copying and
pasting works as well.
The NSPasteboard can contain TIFF or PICT images, and pbproxy will
translate to an image/png or image/jpeg request, and list those in the
TARGETS.
I added a description of the basic design at the top of x-selection.m.
I removed the request_data x_selection class struct. It's not needed.
(cherry picked from commit 4a8daf884694c9c420c45d427f1f84e608e7e48f)
2008-09-21 17:40:16 -07:00
811e9f5e9e
XQuartz: pbproxy: Use an NSBitmapImageRep to convert an "image/png" selection
...
to a TIFFRepresentation for use with NSPasteboard.
This has been tested with the Gimp and works with some minor quartz-wm changes.
The Finder clipboard shows the image updates after an Edit -> Copy.
(cherry picked from commit 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
2008-09-21 17:40:16 -07:00
d8d555bac7
XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
...
(cherry picked from commit 1317c8ff94c4bd32617a5398e929f667bd87da58)
2008-09-21 17:40:15 -07:00
23ec8261b6
XQuartz: pbproxy: The greedy CLIPBOARD handling now works for text.
...
This change adds some [self own_clipboard] calls in the necessary places to get the proper greedy behavior.
UTF8_STRING and STRING properties seem to work well now with the test cases (PRIMARY, and CLIPBOARD). I can copy from several different X apps, and have the behavior be correct when pasting. I also verified that quartz-wm isn't doing the copying, by disabling the quartz-wm paths.
(cherry picked from commit 934669f732c28f07b9d934d8f8f0b63ccfebd900)
2008-09-21 17:40:15 -07:00
7c2eb3d41a
XQuartz: pbproxy: return the TARGETS list as a 32-bit list to fix a bug that was in the original.
...
Add TRACE() calls where appropriate to try to figure out why we are losing CLIPBOARD at times, after transferring PRIMARY to the NSPasteboard.
Use the new pbproxy_clipboard_to_pasteboard where appropriate.
(cherry picked from commit 40190675a6c1889cca3574e5d1a9c16ab74315a7)
2008-09-21 17:40:15 -07:00
81c836902d
Rename reclaim_clipboard to claim_clipboard.
...
Convert the puts usage to use DB().
Add the initial handle_image method.
Check for nil in the NSString instantiation in various places.
Add some commentary to enhance the clarity of why I did some things.
(cherry picked from commit 37361567b65241eab64e8b30cd9729d0e71a86d2)
2008-09-21 17:40:15 -07:00
85e23affea
Add an image_jpeg Atom.
...
(cherry picked from commit ea9dc27977c5eab666f2aa2d914e4e28d36758c7)
2008-09-21 17:40:15 -07:00
6b42f40ff9
Rename reclaim_clipboard to claim_clipboard.
...
(cherry picked from commit d333a8e2b5514b8b76a78c6a13a3f5149ea8de27)
2008-09-21 17:40:15 -07:00
2ab56981b1
Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
...
(cherry picked from commit 32b175ef62b68a971784e51e937e358cb10e20ac)
2008-09-21 17:40:14 -07:00
cbd32645f7
XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
...
(cherry picked from commit 21a2d0b8d03faf1c66ec0c5c11fbd2ab24547727)
2008-09-21 17:40:14 -07:00
5b397642cd
XQuartz: pbproxy: First round of updates to pbproxy from George.
...
(cherry picked from commit 5c8b956f8f3f17e8d577d97cb66424954be72684)
2008-09-21 17:40:14 -07:00
999f3362d5
XQuartz: Dead code removal
...
(cherry picked from commit 43184cd379c4fb7254391b8a362016cbf89b5529)
2008-09-12 15:26:18 -07:00
6548a55ebd
XQuartz: 256 color support
...
(cherry picked from commit 8dd6d5c825d457f26b41b79d02d57ed4a5ecf1f5)
2008-09-12 15:26:13 -07:00
bad7cd14c2
XQuartz: Dead code removal
...
(cherry picked from commit bf10fb0b1f776e72db7c76db11f764e26f9d62c4)
2008-09-12 15:26:07 -07:00
1119fe136f
XQuartz: Changed around fd handoff model to be more robust
...
(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
2008-09-12 15:26:01 -07:00
183233b27b
XQuartz: Don't warp the pointer on server start for XQuartz
...
(cherry picked from commit c0da576d4921c246a9ac747921b48ab9e718347f)
2008-09-12 15:25:44 -07:00
7a46dd30d3
XQuartz: Dead code removal
...
(cherry picked from commit 2e45344870f5d17181df6407da3448991036d783)
2008-09-12 15:22:46 -07:00
1c70e53f25
XQuartz: Fixed proximity logic errors for tablets.
...
(cherry picked from commit d942849f248c368b92ca73e145e8a5bc339112d7)
2008-09-12 15:22:39 -07:00
1669308be6
XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
...
(cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
(cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
2008-09-03 09:33:58 -07:00
46168b3b40
XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
...
(cherry picked from commit 6bca78760951cb5cb57ea66b7631a2dc230dc27a)
(cherry picked from commit fafcafd6de39cf6b5967793f03b30b49db36fec5)
2008-09-03 09:33:53 -07:00
7f5318131d
XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
...
(cherry picked from commit 2f1e163d5db6063e54fcaa045ea67c29ce3e46aa)
(cherry picked from commit 7542c00b96461c3474b8c23545171c4b6ddfd29d)
2008-09-03 09:33:45 -07:00
700e8bf33f
XQuartz: Updated man page
...
(cherry picked from commit 6932d0d19ea75c64ed38b82a246b68c6bbfb8cec)
(cherry picked from commit 8e3da36b6b0a261975808bc67b5caca733a1a23d)
2008-09-03 09:25:13 -07:00
7430bb9093
XQuartz: Removed dead code (unused option definitions)
...
(cherry picked from commit 3d74f77490105c0704c0b10dc7a6eb859bf6e985)
(cherry picked from commit c1e5ea9ba058f6a13f564165a3d6862335729630)
2008-09-03 09:25:07 -07:00
b3836e5bdd
XQuartz: Cleaned up our sleeping before adding the launchd socket.
...
(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
2008-09-03 09:24:59 -07:00
0cd6709db5
XQuartz: Fixed editing of Applications menu
...
(cherry picked from commit da647f1add4c1ae7854c0fbfbf972666ce5d12c8)
2008-08-30 16:25:06 -07:00
c4d290fc54
XQuartz: Fixed missing symbol in quartzKeyboard debugging
...
(cherry picked from commit 8ad55e484f0ba9073ce07a03de660cc546a7b668)
2008-08-30 14:21:17 -07:00
1885582444
XQuartz: Placate automake which doesn't like escaped newlines even in comments...
...
(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
2008-08-29 21:18:26 -07:00
8abcc12fdd
XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
...
(cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
2008-08-29 20:55:25 -07:00
aee19c7b55
XQuartz: xp_is_symbolic_hotkey_event catches the input menu, but not our mainMenu, so we still need to do that the old way.
...
(cherry picked from commit 25eccf12c89d73b8bce2c9be14841efb230acedc)
2008-08-29 20:53:10 -07:00
ebea78cdba
Prepare for array-index based devPrivates.
...
TODO: static indices can be made just an int; some indices
can be combined.
2008-08-28 18:05:40 -04:00
2db1afbf2e
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
...
(cherry picked from commit c8244177b0dbcb28d2f5509e6f2a3e8057889790)
2008-08-26 23:10:18 -07:00
319405fa4a
XQuartz: Fixed needed xplugin version. ><
...
(cherry picked from commit 01b3a99dff79e0d2b316e02658c19fa79d9144ae)
2008-08-26 23:10:17 -07:00
3350770bd6
XQuartz: Use new Xplugin API to determine if a keypress event corresponds to an OS-X hotkey that we should dispatch to Appkit.
...
(cherry picked from commit e7658e745f8a3eaf5cec9f54a8a1b7e5a7708e09)
2008-08-26 20:19:47 -07:00
7930ea9116
XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
...
(cherry picked from commit 54a882dcbdccef3f3eb4e6398e13c88185a8986c)
2008-08-26 20:19:44 -07:00
dc1171df5b
XQuartz: Fixed bogus args to debug ErrorF
...
(cherry picked from commit f0351c2b80f30ae31f041798b84139141fc3d5a5)
2008-08-26 20:19:41 -07:00
ac936525af
XQuartz: Cleaned up mouse event translation a bit more.
...
(cherry picked from commit c286f2a718fdaf6ad10249b59abb20731da8d904)
2008-08-26 20:19:38 -07:00
1b42f55000
Xquartz: Added missing ev_type for NSTabletPoint event.
...
(cherry picked from commit 07548f13947a212dcc020d52fe0ad679255121e2)
2008-08-26 20:19:35 -07:00
13a89f1920
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
...
(cherry picked from commit fcdc9f8b5abd724d75f53d48fdadbed9859e9e79)
2008-08-26 20:19:33 -07:00
64ef7ed072
Centralize declaration of ConnectionInfo.
2008-08-20 13:14:34 -04:00
f1f44940f1
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
...
(cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2)
(cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
2008-08-20 10:00:43 -07:00
6c5612c2e1
XQuartz: Added window_item_modifiers defaults item (and option to localization) to change the modifier keys used for the windows menu.
...
(cherry picked from commit e4110861d307a55d9032cb83cf024ec1f294e8d7)
(cherry picked from commit fcfc05482a88696cb713c7a2ddfcf935ae8378a6)
2008-08-20 10:00:37 -07:00
bdc277c9b3
XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
...
(cherry picked from commit 745bc8ab387d6794f47d8b9dca33b4c81f6dd39c)
(cherry picked from commit a28a2be52478a1557a363140f7bd70ececf144dc)
2008-08-20 10:00:32 -07:00
ed42108920
XQuartz: Added appkit_modifiers defaults option which users can set to 'rcommand' to get access to the input menu with right command
...
(cherry picked from commit 02af74d7a5a7225f408915254c40856159dc7f19)
(cherry picked from commit 2da32894dff8340f6ca7c980277fca7ec835a193)
2008-08-20 10:00:27 -07:00
be06961312
XQuartz: More input fixes
...
stuck-modifier fixes (capslock)
3button-emulation now doesn't send the modifier key with the click
Added other options to fake_button2 and fake_button3 defaults options:
({l,r}{control,alt,command,shift})
(cherry picked from commit 8fb6a1cf44c35a20dfb0c05c9824f94898f88da7)
(cherry picked from commit ae9c1b3cfb3874b4d1251681c24bda91c398bcab)
2008-08-20 10:00:20 -07:00
436b659091
XQuartz: Updated bundle version to 2.3.1
...
(cherry picked from commit eedecba0b882bb07931e8d9168589f5be7a08a69)
(cherry picked from commit 7d9d864461858b25c5eb5858fdf4b53771795f11)
2008-08-20 10:00:13 -07:00
8b9ed7dec2
XQuartz: Fixed a stuck modifier key bug.
...
(cherry picked from commit eeb6e5a9e98dcf045ec230f160d5992080dceba6)
2008-08-14 09:13:37 -07:00
1770c85374
XQuartz: Made 3-button mouse simulation a little more consistent.
...
(cherry picked from commit d207b037d2ae213369e5627a17d8831c9bc16ad8)
2008-08-14 09:13:35 -07:00
f51f77d25e
XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
...
(cherry picked from commit b287c481e1cbe77ff84d10a708505f148a0c8434)
2008-08-14 09:13:34 -07:00
0ce687634f
Eviscerate save-under support.
...
Use a compositing manager already. Plus I really wanted to use 'eviscerate'
in a commit message.
2008-08-13 17:28:08 -04:00
073116cc44
Remove commented out lines that make automake 1.9 puke.
2008-08-08 12:15:27 +02:00
666781cd9b
Removed rogue #include
...
(cherry picked from commit af238e99da45a4dd8d8cbb6564bb8d0a3d79d590)
2008-08-08 02:57:00 -07:00
4a0947bf06
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
...
(cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2)
2008-08-08 01:53:36 -07:00
5accc9b3ce
XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
...
(cherry picked from commit 5854e712e9ebc210d2f8de6f5d4fb650944f314a)
2008-08-08 01:21:08 -07:00
e72b1d21e4
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
2008-08-06 13:37:21 -07:00
26d31ad1c7
XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
...
(cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004)
2008-08-05 18:47:35 -07:00
0ef3243fb5
XQuartz: More fd handoff cleanup.
...
(cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c)
2008-08-05 18:47:35 -07:00
e7dd3dd8f3
XQuartz: Fixed some errors / typos in the preferences pane.
...
(cherry picked from commit e1e0c398bbb50394b164394e1f1870016489c25b)
2008-08-05 18:47:34 -07:00
6836f9aac8
XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
...
(cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa)
2008-08-05 18:47:34 -07:00
de4936d748
XQuartz: Fixed proper processing of tablet button presses
...
(cherry picked from commit ca0babafa4e9cf1b67ec460655bffe569ac9c3e9)
2008-08-05 12:55:02 -07:00
b70a8ba3dc
XQuartz: Nuke Sparkle.
...
(cherry picked from commit 4991f54a8d84a9a8df89a99dbfc09391195578f8)
2008-08-05 12:54:57 -07:00
30851efdd4
XQuartz: Fixed first-client-can't-connect bug
...
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
2008-08-05 12:54:51 -07:00
9757106bba
Remove all empty extension reset hooks, replace with NULL.
2008-07-24 15:46:08 -04:00
c3267106fb
XQuartz: Use CFEqual to compare keyboards
...
(cherry picked from commit 5538e43b9ae7d06d2f48842b065810ce74286eb6)
2008-07-11 10:13:36 -07:00
90dd2de845
XQuartz: Some fd handoff cleanup.
...
(cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518)
2008-07-11 10:13:32 -07:00
26d8030c38
XQuartz: Remove deprecated keyboard code.
...
(cherry picked from commit 69cfc1a21e12bb38a6130dea2e5f20f1e6a3ee7c)
2008-07-11 10:13:26 -07:00
e69b9f9ca4
XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
...
(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
2008-07-11 10:13:13 -07:00
8d2e2e1d85
Xquartz: Removed include directive for removed header
...
(cherry picked from commit e65a36d57f338410c5a5b02cb5ae1214a81d072d)
2008-07-11 10:13:06 -07:00
f8431a62d5
XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
...
(cherry picked from commit 4505bae5d7341e1241be50c25cb3d1b941701de4)
2008-06-10 10:52:04 -07:00
c180a52332
XQuartz: Removed code path for old startup
...
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
2008-06-10 10:51:58 -07:00
5170c169db
XQuartz: Fixed the "laggy" startup under the new model. This was caused by xinit blocking expecting SIGUSR1 and our stub never sending it.
...
(cherry picked from commit ee92aced10d0743c4658e53b58b5d9f5a094a415)
2008-06-10 01:46:01 -07:00
01ace5f3fd
XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
...
(cherry picked from commit d8cf5623faab952a0f1196c8fe10baa09d1fc089)
2008-06-10 01:46:00 -07:00
40855d8000
XQuartz: Removed async debugging sleep
...
(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
2008-06-04 12:24:15 -07:00
ee86b75119
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
...
(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
2008-06-04 12:24:12 -07:00
38da26cd36
XQuartz: Don't forget to destroy the mutex and cond after we're done with them
...
(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
2008-06-04 12:24:10 -07:00
ea40fcf434
XQuartz: Fork for trigger
...
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
2008-06-04 12:24:06 -07:00
2393dae6ff
XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
...
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
2008-06-04 12:24:04 -07:00
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
7082929ef7
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
...
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
2008-05-23 02:32:37 -07:00
225dddbaed
XQuartz: Move the launchd display grabbing into mach_startup
...
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
2008-05-23 02:31:41 -07:00
3a22190061
XQuartz: Fixed a few issues with fd passing... still not working =(
...
(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
2008-05-23 02:31:38 -07:00
c76fddeea2
Fix up paths for GL/glx -> glx renaming
2008-05-21 10:51:15 -07:00
77ff8fd507
Drop glcore GLX provider.
...
Obsoleted by the DRI swrast driver.
2008-05-21 12:15:18 -04:00
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
bb687465d0
XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
...
(cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
2008-05-19 02:47:18 -07:00
4b69d22bcb
XQuartz: Fixed dropped code in the !XKB blocks, disable XKB support until we figure out a solution for xkeyboard-config
...
(cherry picked from commit 2a72309c061f7060480d150791019ce232481462)
2008-05-19 02:47:17 -07:00
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5fbbaee9e46cdce24d03e5d1c66d58a)
2008-05-18 23:32:57 -07:00
738672858d
New XQuartz icon thanks to Simone Karin Lehmann
...
(cherry picked from commit c27e0c8f3c5108192362735db8a80bf3a9a1cc3a)
2008-05-18 23:32:56 -07:00
4be2104c80
XQuartz: More work towards Mach-IPC startup... started working on FD passing
...
(cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
2008-05-18 22:45:19 -07:00
5af5db5033
XQuartz: Ok, pass XQUARTZ_USE_XKB since it breaks worse without it... but we have issues when we have the keyboard configs installed... need to figure out what to do there...
...
(cherry picked from commit 301262b07024ad960f22d99a1267fe137f5c3fce)
2008-05-17 14:56:57 -07:00
2408303d79
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
2008-05-17 14:56:53 -07:00
01612fe612
XQuartz: Disable xkb since it doesn't work after getting xkeyboard-config installed
...
Need to setup configs for the quartz keyboard
(cherry picked from commit c28fecc621b1803a4d4536afbc724d141de9e6ee)
2008-05-17 14:56:34 -07:00
1d09deaa6e
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
...
(cherry picked from commit 5626b0949b1a6bdd2fa3ec2ef53a688084349b87)
2008-05-17 14:56:30 -07:00
adc62f62b9
Xquartz: Xquartz stub now can send Mach IPC to start the server.
...
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
2008-05-17 14:56:26 -07:00
cbb4e80eb7
XQuartz: More work on the Mach-IPC startup path
...
(cherry picked from commit 49cd0b185fd6c99b07357a74734b6a4023faca84)
2008-05-14 01:16:04 -07:00
3b57c59bb0
Xquartz: More work on the new Mach startup
...
(cherry picked from commit 6237acf75d3310d7d4f262556b677557c2907284)
2008-05-14 01:16:01 -07:00
e435acc84c
Added missing to EXTRA_DIST
...
(cherry picked from commit e39613f4633ed992bc276b70833a703560e528f9)
2008-05-14 01:15:58 -07:00
f7d6d20ad6
XQuartz: Cleaned up the about box.
...
(cherry picked from commit 0279a5970694937e949ba533330ea48961c4edba)
2008-05-14 01:15:56 -07:00
b37e1f1f5c
Don't need the fink-friendly printf in the DDX anymore.
...
(cherry picked from commit fe2279440450c795d67ba5a2234b0797d0bfe39c)
2008-05-14 01:15:54 -07:00
f9fae16456
XQuartz: Added some version checking protection so we don't trigger an infinite exec loop with new /usr/X11/bin/Xquartz and older X11.app
...
(cherry picked from commit 78032815aeb10c22ff45b49702e9c9df82ab471c)
2008-05-12 10:42:20 -07:00
ac4e33a9cd
XQuartz: More startup work... listen if we're the actual server
...
(cherry picked from commit 3b0afb47c3d8ad922cb2315ed8034f4d77d4a249)
2008-05-12 10:42:16 -07:00
a7800d9355
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
...
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
2008-05-12 10:42:12 -07:00
315f089056
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
2008-05-08 19:58:24 -07:00
a07c5ad172
XQuartz: Set bundle version to 2.3.0
...
(cherry picked from commit 8a0524b30e1e860f3ae35741c116fc8da28aef79)
2008-05-08 19:58:15 -07:00
05f23ed3ea
XQuartz: Fixed some issue in our bundle creation
...
(cherry picked from commit 330ffad5477e32c5ab9ed338bc628bd5ae9f4c98)
2008-05-08 19:58:09 -07:00
a85d3ac87c
XQuartz: Fixed typo
...
(cherry picked from commit 56b7988d2662caa4d31094695b414080e4470ed4)
2008-05-06 03:04:13 -07:00
077ced6384
XQuartz: Added uncommitted files
...
(cherry picked from commit e414ec462cfc63f8eb7f504f526f5a2c73f51e69)
2008-05-06 03:04:09 -07:00
80e502c5d1
Fixed up dist
...
(cherry picked from commit f225222ba2bf4f03425107f258d60b73c88efaec)
2008-05-06 03:04:04 -07:00
7295e54433
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
...
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
2008-05-06 02:49:48 -07:00
d41d677ab4
Xquartz: experimental embedding of Sparkle.framework
...
(cherry picked from commit b7a1a640cef8c69442859cbf89034ad362a19684)
2008-05-06 02:49:41 -07:00
f4a68f3701
XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
...
(cherry picked from commit 8d9eab3a2ec5955cc2698fdcb1fa6ed12b2aadb7)
2008-05-02 17:42:41 -07:00
96fa7da3b8
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
...
(cherry picked from commit ff10c37bdd09656cf2f7ee9577f5552caa1ffdb8)
2008-05-02 17:42:36 -07:00
3344569529
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
2008-05-02 11:00:14 +09:30
a338007be6
XQuartz: Adjust the screen origin offset properly for multimonitor setups
...
(cherry picked from commit f2020b9836bacd0593ac0b4c8541e32714ab02a9)
2008-05-01 18:04:18 -07:00
ec0419b505
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
...
(cherry picked from commit 1fcf74a436f2e19cceb3f285b89859025d94c040)
2008-04-30 17:33:11 -07:00
b71b51c982
xquartz: created darwinTablet, to represent tablet events
...
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
2008-04-29 23:59:34 -07:00
519581b0ba
xquartz: remove unused params from DarwinEQInit
...
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
2008-04-29 23:59:31 -07:00
d70487a4c0
XQuartz: Fix to tablet-event handling code; we now scale
...
more conservatively (to match Linux's Wacom driver) and
we now receive all tablet-related events.
(cherry picked from commit 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
2008-04-29 23:59:26 -07:00
d5ab89f4f1
XQuartz: Unset CFProcessPath... blech
...
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
2008-04-28 15:55:01 -07:00
0c2312b21b
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
...
(cherry picked from commit 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
2008-04-28 15:42:12 -07:00
c3dc4bdbb0
XQuartz: Disabled DPMS extension
...
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
2008-04-28 15:42:02 -07:00
07382a70c7
XQuartz: Added thread debugging to xprFrame.c
...
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
2008-04-28 15:40:22 -07:00
e973430608
XQuartz: More startup / threading house cleaning.
...
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-28 11:49:19 -07:00
4b46fc931e
XQuartz: Updated Localizable.strings
...
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
2008-04-28 11:49:18 -07:00
4017ebe5bf
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
...
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
2008-04-28 11:49:16 -07:00
0bd28315af
Xquartz: Added missing to EXTRA_DIST
...
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
2008-04-26 23:19:33 -07:00
ef1c520537
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
2008-04-26 19:21:05 -07:00
b114d4e861
XQuartz: Don't subtract the titlebar off of the pointer_y
...
(cherry picked from commit 00a9567acce2b27a649cbebd4790e3043688a7d8)
2008-04-26 17:05:34 -07:00
b9ca789635
XQuartz: Added some pseudoramiX debug traces
...
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
2008-04-25 18:04:22 -07:00
e251c9e75a
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
2008-04-25 16:49:35 +09:30
0209e46249
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
...
(cherry picked from commit 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
2008-04-24 23:50:23 -07:00
b65dbd350b
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
2008-04-24 23:50:21 -07:00
d09c520b32
Moved Apple GL bits into our DDX subtree
...
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
2008-04-23 10:22:34 -07:00
b05b416c62
XQuartz: No need to include indirect.c a second time
...
(cherry picked from commit 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
2008-04-23 10:17:13 -07:00
4e3a8af575
xquartz: clean up linker line for main binary
...
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
2008-04-23 10:16:55 -07:00
76381092e8
XQuartz: Make sure QuartzAudioInit() gets run.
...
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
2008-04-23 02:22:28 -07:00
a8b8700c73
XQuartz: Fixed cmd-tab to bring all windows forward.
...
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
2008-04-21 23:45:00 -07:00
590688131d
XQuartz: Fixed quit dialog to be more conforming with HIG.
...
(cherry picked from commit 14c6b837bb03bd0956f90882f550847f13d0ca09)
2008-04-21 19:08:30 -07:00
570b0dca26
Fix for pointer-offset issue when using a multi-display environment on X11.app.
...
(cherry picked from commit 9a7e14286ced55c5e2a4512e2629e03836443009)
2008-04-21 17:55:19 -07:00
14396fdeba
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
2008-04-20 01:24:54 -07:00
d13828797f
XQuartz: Cleaned up some casting to get rid of compiler warnings
...
(cherry picked from commit 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
2008-04-20 01:24:51 -07:00
ed9dabb47c
Last of the spam... I promise...
...
(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
2008-04-18 20:31:06 -07:00
49f2bb4681
XQuartz: More sanitization of the namespace
...
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
2008-04-18 20:25:38 -07:00
c2f0d020b5
XQuartz: Removed unneccessary include
...
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
2008-04-18 20:12:05 -07:00
5183fea6d3
XQuartz: Handled sanitization of namespace better
...
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
2008-04-18 20:07:55 -07:00
edd3fb784b
random flailing
...
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
2008-04-18 20:07:41 -07:00
c14f5dc237
XQuartz: Forgot to commit xprEvent.[hc] ...
...
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
2008-04-17 20:31:24 -07:00
22bb7608a0
Added XKB support for Xquartz
...
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
2008-04-17 17:25:55 -07:00
652479dba3
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
2008-04-17 15:50:11 -07:00
2a1ba20af9
XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
...
(cherry picked from commit 7b087c965bce9f440ab5233d6383aa4a7de969b8)
2008-04-17 15:24:35 -07:00
55f80d7545
XQuartz: A little more debugging output from threadSafety
...
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
2008-04-17 15:24:33 -07:00
0d61f6fca1
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
2008-04-17 13:21:13 -07:00
dbd4c03156
XQuartz: Added framework for asserting which thread we're in.
...
(cherry picked from commit 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
2008-04-17 13:21:02 -07:00
a3d40f0549
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
2008-04-17 11:57:45 -07:00
6d11712c2a
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
...
(cherry picked from commit 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
2008-04-17 11:07:20 -07:00
dcf4f917cc
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
2008-04-17 11:03:31 -07:00
582397cd02
oops, missed a spot
...
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
2008-04-17 10:42:08 -07:00
0bd1c369cc
formatting cleanup
...
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
2008-04-17 10:42:00 -07:00
700e14c226
delete debugging spew
...
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
2008-04-17 10:41:55 -07:00
a440eebf25
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
2008-04-17 10:41:50 -07:00
612e901ef6
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
...
(cherry picked from commit ab662c736e0654e2b4347091f0d9e87f26034216)
2008-04-17 10:41:46 -07:00
5bdfbfbedc
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
...
(cherry picked from commit a8a090b853e811b9843a5732572cbbe542224f32)
2008-04-17 10:41:42 -07:00
58e42683c9
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
...
(cherry picked from commit cab54466a61281cfafc12825017c23d720cd75f4)
2008-04-17 10:41:38 -07:00
cd3470a0cf
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
...
so give it one
(cherry picked from commit a494ff04b2a14470eaf5a23c7cf6dbdea182c6d1)
2008-04-17 10:41:30 -07:00
8716d081fd
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8c10c3a9ea59d8e79275a30d2ea82b4)
2008-04-16 23:14:06 -07:00
2ffdb0eb64
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
2008-04-16 21:54:00 -07:00
757a1bf3a3
Xquartz: Don't need to link against rlAccel since we don't use it
...
(cherry picked from commit 180ec128adef11a9a90cea1189dc31ac5de8359f)
2008-04-16 21:53:03 -07:00
9e7ced94a5
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca8230707b276763c0ec20e586203144c9)
2008-04-15 12:06:07 -07:00
b1f3f42840
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
...
(cherry picked from commit 55d9973b053f25bb95b26e00351dc5531caf5b04)
2008-04-11 17:50:04 -07:00
a7e3ad1c6b
Remove NDEBUG (assert() disable) define from the X Server.
...
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
1f8188656a
add missing dix-config include
...
(cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9)
2008-04-08 21:25:15 -07:00
3f51f493b6
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
2008-04-08 17:03:18 -07:00
2e42b67b82
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9fc4ebdb88f42961052fc8456082165f)
2008-04-02 18:05:55 -07:00
c737d04c75
The AppKit thread should not be calling directly into the X server
...
functions to change state when the keyboard is reloaded; instead,
pass it as an event.
(cherry picked from commit 7e653f806ff5508aace059312156f319a9ed4479)
2008-04-02 17:48:24 -07:00
15b0084f1a
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68f459d90417558da1ed00729b749950)
2008-04-02 17:48:15 -07:00
e9e2d88436
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377efc930e25017636e5112093a3a6549c7)
2008-04-02 17:48:01 -07:00
c1be4e3379
shovelling code around ...
...
(cherry picked from commit 2143182ba49195bbb2e9163ea6872fd68e7a4a85)
2008-04-02 17:47:59 -07:00
985c631b2e
just a bit of juggling headers around -- we're preparing
...
to call our Xquartz-specific event handlers directly
as mieqHandlers
(cherry picked from commit 4aedba5aa727e22316e8ca456f7218bea9ee0313)
2008-04-02 17:47:57 -07:00
89f1d880e8
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202eeaffae480048b91bf02140ee29f8a)
2008-04-02 17:47:52 -07:00
8944b77ec0
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051b996633291dddc061b696ff737f3fb)
2008-04-02 17:47:42 -07:00
aa6d12e93e
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4baf0ad0aae55c8209bc60ac93c5b58)
2008-04-02 17:46:59 -07:00
6c5962e447
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423598d596fd7f2ed4290d4b860bd5d5f)
2008-04-02 17:45:28 -07:00
c6f0d5d1e5
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60ca227c0d96d4613075d97d6b762366a)
2008-04-02 17:45:23 -07:00
5b6c273eaa
add prototype for DarwinEventHandler
...
(cherry picked from commit 9a03ae33c4f9de830f15eabf3b994882ead7c000)
2008-04-02 17:45:20 -07:00
3713be8b47
add logging of current thread ID to DEBUG_LOG macro
...
(cherry picked from commit 5848510cc5a8091b30230ab920d904ca6b159480)
2008-04-02 17:45:17 -07:00
1400a51ae7
Begin to move all of our Xquartz DDX-specific event handlers
...
to miEQ, in preparation to remove the DDX-specific code entirely.
(cherry picked from commit 3f4447b95f73a82b3aa0f7b0d1640aba5fb0d1bc)
2008-04-02 17:45:09 -07:00
8746daa673
XQuartz: Fixed missing close-paren in preference pane text.
...
(cherry picked from commit ea37e151dc6032d2a1a33cef809f2a7d507aae35)
2008-04-02 17:33:22 -07:00
a4d0349411
Add code to track 5 valuators for pointing device, in preparation
...
for supporting tablet input in Xquartz.
(cherry picked from commit 22c8849ea819eb70a14b2e06330b11b22aa63ebc)
2008-03-31 16:44:23 -07:00
6648867d8b
add debug statements so we can see if/when our Xinput stubs are getting called.
...
(cherry picked from commit 6e160bbe15dd2c2b8685847c06831cb6aebc6f74)
2008-03-31 16:44:22 -07:00
19ff23ab0e
Remove calls to InitValuatorAxisStruct -- these are now handled in dix by
...
InitValuatorDeviceClass.
Add InitProximityClassDeviceStruct call to prepare for tablet support.
(cherry picked from commit 1bd980a5b114f5320360943214f8f9f23b29c1e3)
2008-03-31 16:44:21 -07:00
b8ea9f2a25
XQuartz: Fixed names of enums to be more consistent
...
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:03:20 -07:00
bd28839eb8
=?utf-8?q?XQuartz:=20Another=20Expos=C3=A9=20fix:=20F9=20doesn't=20raise=20all=20windows
...
=20(cherry=20picked=20from=20commit=20b9cffa20debae73737c674bf75ab65db1bd74556)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-28 17:03:19 -07:00
415e49b940
XQuartz: Sanity-check the removal of the 256-color option
...
Fixes the 'one-time-preferences' bug in 2.2.0_rc1
(cherry picked from commit 38cbd13490fc21724e8eef0ec7e1a20a9cc2e39d)
2008-03-27 19:22:07 -07:00
c1d37efe9a
xquartz: copy in new stubs from Xi/stubs.c to replace our old
...
Xinput stubs. Hey, it's a start.
(cherry picked from commit 566412b4aece24ae6af8c7c835986b685aa456a2)
2008-03-27 19:14:50 -07:00
c4a616a741
prevent "fake mouse clicks" from generating spurious extra events
...
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:39 -07:00
6385947396
XQuartz: Disable 256 color option and fullscreen option
...
(cherry picked from commit 7c1964338a33558d3f25e369dfca99e3ef9d10f9)
2008-03-21 19:37:49 -07:00
93daa3a3bf
Xquartz: Added separate preference tab for quartz-wm settings
...
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7cb0b0db3db948d26b4d5ec7747deb8)
2008-03-21 19:37:46 -07:00
c49e112683
XQuartz: Initial framework for dealing with spaces on OS-X
...
(cherry picked from commit 9831324998f9d1f05ff944c58c5bf60dcae17355)
2008-03-21 19:37:42 -07:00
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
2008-03-21 19:33:21 -07:00
87c64cfd69
=?utf-8?q?Apple:=20Xserver=20half=20of=20the=20Expos=C3=A9=20bug-fix=20(requires=20updated=20libXplugin=20from=20Apple...=20coming=20with=202.2)
...
=20(cherry=20picked=20from=20commit=2037be23e8c1d8e5c7a1157e9d66ef3f30a4c472c5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
2008-03-21 19:33:21 -07:00
ef60632e20
dix: Modify callers of property and selection API to use new interfaces.
2008-02-29 18:01:37 -05:00
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
6dc369028d
XQuartz: Quit now properly warns the user
...
(cherry picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)
2008-02-23 00:28:41 -08:00
5f5ec5db35
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
...
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)
2008-02-19 00:01:42 -08:00
b95059c207
Added Xquartz.plist to EXTRA_DIST
...
(cherry picked from commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)
2008-02-16 02:57:23 -08:00
d103820bb8
Fixed unescaped newline in EXTRA_DIST
...
(cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)
2008-02-16 01:01:33 -08:00
a7d936c4ac
XQuartz: Fixed EXTRA_DIST to include localization
...
(cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)
2008-02-16 01:01:29 -08:00
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
8a244c2bc0
XQuartz: Fixed layout of Applications->Customize menu
...
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d13c82633fdbe8120396bfbe1e7489a)
2008-02-11 12:10:59 -08:00
3570ca1cb7
XQuartz: Added option for setting quartz-wm click-through preference
...
(cherry picked from commit bf54c267cba97b2b3b9a621da0575776a388b2cb)
2008-02-10 18:30:52 -08:00
8004e160fa
XQuartz: Converted interface to nib 3.x format
...
(cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)
2008-02-10 18:30:48 -08:00
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)
2008-01-17 09:49:25 -08:00
180a5aba4d
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)
2008-01-12 21:34:09 -08:00
6fd4a5e2e4
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f21631444816fc12b8a534c2cf79e6ac6c2af7c9)
2008-01-12 12:02:01 -08:00
f72255639c
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18cebd3435d70f62855239484974c455a1)
2008-01-12 12:01:57 -08:00
ec24a6b5aa
XQuartz: Fixed switching into XQuartz via expose.
...
(cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)
2008-01-12 12:01:52 -08:00
7d226d6a25
XQuartz: Cleanup for strict-prototyping
...
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4beb7a427b00b18097f548876ad3c11d7)
2008-01-05 03:17:27 -08:00
11967dce11
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 23:10:10 -08:00
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d4239c7f3918332ef07752f1e211afb23)
2008-01-04 23:10:10 -08:00
e46d559739
XQuartz: Cleaned up color map configuration.
...
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27c053d22882f54337cfd09203aa5383)
2008-01-03 13:25:56 -08:00
beb29c605b
XQuartz: *REALLY* use CFStringCreateWithCString
...
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc6457aabead328472d16dc25789032940)
2007-12-21 02:09:15 -08:00
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)
2007-12-21 02:07:07 -08:00
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)
2007-12-21 01:58:03 -08:00
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
2007-12-21 01:24:43 -08:00
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)
2007-12-20 19:38:49 -08:00
603a8b73d4
XQuartz: Cleaned up command line arguments.
2007-12-20 18:29:57 -08:00
4cf3002b60
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)
2007-12-20 18:09:24 -08:00
1f74bef1ad
XQuartz: Don't fork to exec app_to_run.
...
Plus other housecleaning...
(cherry picked from commit ae302db472f127be082d05b418ede332fae8ccc5)
2007-12-20 17:38:39 -08:00
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)
2007-12-20 17:38:39 -08:00
42802a8e6b
Xquartz: General Cleanup
...
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)
2007-12-20 13:18:17 -08:00
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)
2007-12-16 01:14:55 -08:00
a3f7f7b60e
clarified debug message to indicate that we're sleeping
...
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf893f8f81bacd434b31408dfb38cb06)
2007-12-14 15:22:57 -08:00
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7953ef5b971682f0e28535da968acb1)
2007-12-14 15:22:49 -08:00
062d9234e2
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)
2007-12-14 15:22:44 -08:00
95c02adea8
Xquartz: Fixed cpprules include
2007-12-14 15:21:40 -08:00
86b2e59bfb
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13 16:29:40 -08:00
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13 16:29:09 -08:00
82e1aff9fb
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)
2007-12-13 16:28:35 -08:00
1a5910588a
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4)
2007-12-13 16:28:30 -08:00
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
eab0c4e490
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)
2007-12-10 21:03:37 -08:00
1ff945a8e4
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)
2007-12-10 21:03:30 -08:00
7d61893b49
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
2007-12-10 20:34:40 -08:00
8f2eff643b
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f35f774ff9638678d7e3f77c81f62976)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
Peter Hutterer
Jeremy Huddleston
George Staplin
Daniel Stone
Dan Nicholson
Peter Hutterer
Ben Byer
George Peter Staplin
George Staplin
Adam Jackson
Tomas Carnecky
Michel Dänzer
Peter Hutterer
Kristian Høgsberg
George Sapountzis
Ben Byer
Ben Byer
Eric Anholt
Jeremy Huddleston
Eamon Walsh
Jeremy Huddleston
Ben Byer