Jeremy Huddleston
42f330cf9e
XQuartz: pbproxy: Remove thread-main.m
...
it got accidently added and isn't used.
(cherry picked from commit cb6ffce68a
)
2008-11-19 10:58:06 -08:00
Jeremy Huddleston
03f7a66a1a
XQuartz: Don't use TIS on Tiger...
...
(cherry picked from commit be8ac84c15
)
2008-11-15 19:52:52 -08:00
Jeremy Huddleston
e8112784e8
XQuartz: Integrated xpbproxy into the server.
...
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 4294493632
)
2008-11-15 19:52:34 -08:00
Jeremy Huddleston
bc4f804cd8
XQuartz: Actually add glcontextmodes.[hc]
...
(cherry picked from commit 763195d338
)
2008-11-14 15:13:59 -08:00
Ben Byer
aedafbea0e
fix compilation on systems that don't have
...
XP_EVENT_SPACE_CHANGED defined
(cherry picked from commit 6e833e41e2
)
2008-11-14 15:11:42 -08:00
Jeremy Huddleston
b078936571
XQuartz: Initial work on readding GLX to the 1.5 server
...
(cherry picked from commit a186cab6ae
)
2008-11-14 15:10:32 -08:00
Jeremy Huddleston
1d7049f8fd
Xquartz: Force sending mouse clicks to AppKit if we're over the menu bar
...
(cherry picked from commit 7dff93ec1a
)
2008-11-14 11:10:24 -08:00
Jeremy Huddleston
3c12483264
XQuartz: Made X11Application.m a little more tidy.
...
(cherry picked from commit 3520386261
)
2008-11-14 11:10:15 -08:00
Jeremy Huddleston
5bad5d2abe
XQuartz: Fixed XBell() when not using system alert.
...
(cherry picked from commit aa0e9ab1c7
)
2008-11-13 11:34:32 -08:00
Jeremy Huddleston
0fca8588a2
XQuartz: Added more debugging to handoff spew
...
(cherry picked from commit acefa7e3c8
)
2008-11-13 11:34:27 -08:00
George Staplin
47d3821870
XQuartz: GL: Handle the alpha differently when the alpha is equal to GLCAPS_COLOR_BUF_INVALID_VALUE.
...
This prevents visuals with odd sizes. The machine I use didn't have
this problem, but it shows up on some others.
(cherry picked from commit ed181382dd
)
2008-11-13 11:34:21 -08:00
George Staplin
33edd32702
XQuartz: Disable 2 calls to miSetVisualTypesAndMasks that seem to be unnecessary, and possibly wrong (with regard to masks and bits per RGB).
...
Use the settings queried from the system in xprScreen.c, rather than those 2 calls.
The 2 calls increased the total number of visuals a great deal (when using GLXEXT),
and not all of the visuals were usable with GLX. Some of the visuals aren't usable
with GLX still, such as DirectColor, but that seems to be acceptable based on my
understanding of the manual that states "a subset of visuals are made available
for OpenGL rendering."
(cherry picked from commit 373b8a5f32
)
2008-11-13 01:19:43 -08:00
Jeremy Huddleston
1523476afa
XQuartz: CFBundleShortVersionString needs to conform to X.Y.Z as well... sigh
...
(cherry picked from commit 54d20f6d33
)
2008-11-13 01:19:35 -08:00
George Staplin
1f301a0051
XQuartz: Restore the logic of AppleWMDoReorderWindow to the same as the 1.4 branch.
...
It was returning inverted values in comparison to the 1.4 branch. This resulted in
the windows not drawing due to a deep path of: RootlessReorderWindow ->
SCREENREC(pScreen)->imp->DoReorderWindow(winRec) - > xprDoReorderWindow ->
AppleWMDoReorderWindow.
(cherry picked from commit d1d398db76
)
2008-11-13 01:18:49 -08:00
Jeremy Huddleston
f59352881f
XQuartz: Make LS parse our version properly... it didn't like our CFBundleVersion
...
(cherry picked from commit 980df1b4ff
)
2008-11-06 14:49:54 -08:00
George Peter Staplin
13d06f5aaf
XQuartz: GL: Add capability detection for depth buffers, and multisampling.
...
GL/capabilities.c: Add handleDepthModes(), and extend
handleRendererDescription() for the various depth and multisampling flags.
Add initialization of the new config options to initConfig().
GL/capabilities.h: Add depth and multisample config members.
GL/visualConfigs.c: Add depth and multisampling support to the visual config
setup.
(cherry picked from commit f527381eea
)
2008-11-05 19:23:48 -08:00
George Peter Staplin
34bb06b292
XQuartz: GL: Work around problems with really deep visuals.
...
GL/capabilities.c: #if 0 (for now) any capabilities above 8 bits per channel,
because they introduce drawing problems.
GL/indirect.c: Comment out some visual setup code that shouldn't be running, and
actually seemed to cause some problems. The current visualConfigs.c code seems
to do a reasonable job of setting up visuals for XQuartz.
GL/visualConfigs.c: Make use of the proper visual .class. Eliminate depth 0.
It seems we really just want 24 for now, and 0 I think was a flaw in the original
code.
(cherry picked from commit 1e5f63f15e
)
2008-11-05 19:23:41 -08:00
Jeremy Huddleston
39e82a9b12
XQuartz: Replace deprecated API usage thanks to Robery Murphy
...
(cherry picked from commit 71dd052412
)
2008-11-05 19:23:36 -08:00
Jeremy Huddleston
b4db46320a
XQuartz: version string updated for 2.3.2_beta3
...
(cherry picked from commit 81bb412857
)
2008-11-05 19:23:30 -08:00
Daniel Stone
8c3753a0b7
A bit of whitespace cleanup in include directives.
...
It's #include <foo>, not # include <foo>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-04 16:01:07 +10:30
Jeremy Huddleston
f8af66ddb2
XQuartz: Add option to allow access to the menu in fullscreen mode
...
(cherry picked from commit 637a9f4bd1
)
2008-10-31 20:05:39 -07:00
Jeremy Huddleston
c5086badf0
XQuartz: LP64 related casting fixes from Bob Murphy
...
(cherry picked from commit ea71710aaa
)
2008-10-31 19:03:38 -07:00
Jeremy Huddleston
ecd55bc859
XQuartz: displayScreenBounds uses quartzEnableRootless rather than !quartzHasRoot
...
(cherry picked from commit c883a78ef0
)
2008-10-31 15:50:06 -07:00
Jeremy Huddleston
9f49f5172d
XQuartz: Silence pointer debug spam
...
(cherry picked from commit 9ca099e928
)
2008-10-31 15:49:52 -07:00
Jeremy Huddleston
93298c7f8f
XQuartz: Don't map the menu bar to the screen area.
...
(cherry picked from commit 1115917ada
)
2008-10-31 15:49:44 -07:00
Jeremy Huddleston
31907986a6
XQuartz: Fixed Xplugin thread safety issues, so rea-enable background window check
...
(cherry picked from commit 5fc73b1141
)
2008-10-31 15:49:32 -07:00
George Peter Staplin
227d782a1b
XQuartz: GL: Mark visuals that are slower than others, due to lack of acceleration.
...
This is used in libGL to determine a preferred visual. glxinfo -v will also
report "visualCaveat=Slow" for such visuals.
(cherry picked from commit d5c17f585a
)
2008-10-31 15:49:25 -07:00
Jeremy Huddleston
5287602a41
XQuartz: if 0 out a block to avoid thread-unsafe lockups
...
(cherry picked from commit 60d7359a67
)
2008-10-31 15:48:24 -07:00
Jeremy Huddleston
93d7cd31c5
XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
...
(cherry picked from commit 490756c7fb
)
2008-10-31 15:48:15 -07:00
Jeremy Huddleston
f12d7ad164
XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
...
(cherry picked from commit 183ca5d68b
)
2008-10-28 22:01:40 -07:00
George Peter Staplin
273df54685
XQuartz: pbproxy: Fix a bug that prevented nedit CLIPBOARD from being proxied.
...
It seems that we were calling copy_completed: too soon. Now we return instead
of falling through to the free_propdata, and copy_completed:.
(cherry picked from commit 5797d5b662
)
2008-10-28 22:01:34 -07:00
George Peter Staplin
313d87341a
XQuartz: pbproxy: Work around bugs in some apps that aren't ICCCM compliant.
...
Eterm ends up setting the type of the property to TARGETS, instead of ATOM.
That's why it wasn't working.
(cherry picked from commit 9be5998ede
)
2008-10-28 22:01:29 -07:00
George Peter Staplin
9007d3beea
XQuartz: pbproxy: Add code to handle PICT conversion to PNG and JPEG.
...
This may work, unfortunately I don't have test apps that fail.
The way it works is by using an NSImage class initWithPasteboard:
method, which we then get the TIFFRepresentation of, and convert
to PNG or JPEG.
The TIFFRepresentation uses NSTIFFCompressionNone; which should be
lossless.
(cherry picked from commit 8d048cfa95
)
2008-10-28 22:01:22 -07:00
Jeremy Huddleston
b742da0b71
XQuartz: pbproxy: fixed blocking
...
(cherry picked from commit bb330a1b1c
)
2008-10-28 22:00:52 -07:00
Jeremy Huddleston
c885110aed
Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while...
...
(cherry picked from commit 3647215310
)
2008-10-28 22:00:42 -07:00
George Peter Staplin
e7c26964ee
XQuartz: GL: Fix several error handling mistakes in handleRenderDescriptions, that were leftover before the final code evolved.
...
(cherry picked from commit fe35a36390
)
2008-10-28 22:00:36 -07:00
George Peter Staplin
21ea9d82aa
XQuartz: GL: Add feature detection of color sizes, and accum sizes.
...
This gives us a *lot* more visuals, and they should be more accurate.
Some of the visuals may have been wrong before. This may enable more
OpenGL programs to behave correctly.
I also suspect libGL needs a little work to handle some of these correctly.
(cherry picked from commit 98a084ce9c
)
2008-10-28 22:00:29 -07:00
Jeremy Huddleston
80b6768536
XQuartz: Do check_xinitrc() later to avoid possible deadlock.
...
(cherry picked from commit af95174a08
)
2008-10-23 19:22:36 -07:00
George Peter Staplin
d837d4e2af
XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
...
(cherry picked from commit 6bcbb9ba85
)
2008-10-23 19:22:28 -07:00
George Peter Staplin
6a2693b2f9
XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
...
We need to revisit the GL/indirect.c changes. I think indirect.c should
be using the same feature detection and GLX visual config code. The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f2
)
2008-10-23 19:22:16 -07:00
Jeremy Huddleston
28d4f71193
XQuartz: pbproxy: Fix compilation on case-sensitive file systems...
...
(cherry picked from commit 6622efca21
)
2008-10-23 16:30:53 -07:00
Jeremy Huddleston
3e999d35c2
XQuartz: Honor the Spaces preference for "When switching to an application, switch to a space with open windows for the application"
...
(cherry picked from commit bf561a06b2
)
2008-10-23 14:17:19 -07:00
Jeremy Huddleston
75067d12e4
XQuartz: Added missing semicolons to Localizable.strings
...
(cherry picked from commit e9fe3f36d9
)
2008-10-23 14:17:10 -07:00
Jeremy Huddleston
a003932dcc
XQuartz: Default dpi to 96 instead of 75
...
(cherry picked from commit 08a5a333d7
)
2008-10-23 14:17:04 -07:00
Jeremy Huddleston
2d764e21f2
XQuartz: pbproxy: SIGHUP reloads preferences.
...
(cherry picked from commit cbc0935ef7
)
2008-10-23 14:16:57 -07:00
Jeremy Huddleston
c837d182c4
XQuartz: Only send mouse events while in the background if we're over a visible window.
...
This "breaks" xeyes but gets rid of annoying tooltips.
(cherry picked from commit 10090a132a
)
2008-10-21 09:34:56 -07:00
Jeremy Huddleston
2a9613980f
XQuartz: More fullscreen fixes
...
Start in rooted mode when enabled
Make the hotkey cmd-alt-a behave
(cherry picked from commit 22a54e4617
)
2008-10-21 09:34:49 -07:00
Jeremy Huddleston
e4ea1494de
XQuartz: Cleaned up keyboard init and map reload.
...
(cherry picked from commit f78c9fc06c
)
2008-10-21 09:34:40 -07:00
Jeremy Huddleston
ebb2e1449c
XQuartz: Fixed follow-keyboard-layout
...
≈
(cherry picked from commit a9f9fbf512
)
2008-10-21 09:34:28 -07:00
Jeremy Huddleston
f67cd31d2c
XQuartz: More progress towards fullscreen...
...
(cherry picked from commit 628cae86b4
)
(cherry picked from commit b47b7ab6d6
)
2008-10-21 09:34:17 -07:00
Jeremy Huddleston
d434ed4009
XQuartz: Fixed missing key-equiv for Hide-Others.
...
(cherry picked from commit 2c4b0f9615
)
2008-10-21 09:32:20 -07:00
George Peter Staplin
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 165cbbb90c
)
2008-10-21 09:32:03 -07:00
Jeremy Huddleston
4d978af5c7
XQuartz: Fixed window levels.
...
(cherry picked from commit ef4d37c73f
)
2008-10-21 09:31:56 -07:00
Jeremy Huddleston
84ef8ed6fb
XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard
...
(cherry picked from commit bcb83eea72
)
2008-10-15 17:31:54 -07:00
Jeremy Huddleston
d13c3cbd43
XQuartz: Some motion made towards supporting fullscreen.
...
(cherry picked from commit 99be3d68b6
)
2008-10-08 18:45:17 -07:00
Jeremy Huddleston
dc166bf642
XQuartz: Fixed EXTRA_DIST for new GL files.
...
(cherry picked from commit a11c905203
)
2008-10-08 18:45:13 -07:00
George Staplin
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 1056700971
)
2008-10-08 18:45:09 -07:00
Jeremy Huddleston
f1fec6f323
XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
...
(cherry picked from commit 97173d4eda
)
2008-10-08 18:45:04 -07:00
George Staplin
52accec7db
XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
...
(cherry picked from commit 190a3d5e5d
)
2008-10-08 18:44:28 -07:00
George Staplin
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 eb3c014e17
)
2008-10-08 18:44:24 -07:00
George Staplin
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 fc86f9e448
)
2008-10-08 18:44:21 -07:00
Jeremy Huddleston
2998e48be3
Xquartz: Fix parallel builds
...
(cherry picked from commit 1fe7298a3b
)
2008-10-08 18:44:17 -07:00
Adam Jackson
8a5b89e8e1
xalloc+memset(0) -> xcalloc
2008-10-06 15:36:51 -04:00
Jeremy Huddleston
aacac3edac
XQuartz: Bumped bundle version to 2.3.2 for beta1
...
(cherry picked from commit 2021c4c4e7
)
2008-10-04 21:17:14 -07:00
Jeremy Huddleston
ed3134918d
XQuartz: pbcopy: Re-enabled some code I commented out for testing
...
(cherry picked from commit 9b5d114092
)
2008-10-04 21:17:09 -07:00
Jeremy Huddleston
b3a971d8b5
XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management.
...
(cherry picked from commit f7673bb4de
)
2008-10-04 21:17:02 -07:00
Jeremy Huddleston
fc35c7a2e2
XQuartz: GLX - enable_stereo defaults option should work now
...
(cherry picked from commit 3a6898f487
)
2008-10-04 21:16:54 -07:00
Adam Jackson
e6b1c1fada
const cleanup
2008-10-03 17:51:19 -04:00
George Peter Staplin
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 4d51ad851e
)
2008-10-03 11:14:49 -07:00
Jeremy Huddleston
2a5ce41f03
XQuartz: Use "pointer" and "pen" for device names to please GDK.
...
(cherry picked from commit 00ca0f4d83
)
2008-10-03 11:14:43 -07:00
Jeremy Huddleston
d3f597a986
XQuartz: Workaround for initial pressure/tilt being sent as 0 with motion during the proximity event
...
(cherry picked from commit 9a91d770a6
)
2008-10-03 11:14:40 -07:00
Jeremy Huddleston
1657dfb843
XQuartz: Using absolute ranges for pointer location to increase resolution and better support tablets.
...
(cherry picked from commit d79ccb45f6
)
2008-10-03 11:14:38 -07:00
Jeremy Huddleston
88bb8c6f48
XQuartz: Removed resolved comment about localization.
...
(cherry picked from commit 8ed5faf058
)
2008-10-03 11:14:34 -07:00
George Peter Staplin
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 602e8ba8f7
)
2008-10-03 11:14:30 -07:00
Jeremy Huddleston
ecd260143c
XQuartz: Added some localizable strings that were missing.
...
(cherry picked from commit 2c8205ea8b
)
2008-10-03 11:14:28 -07:00
Jeremy Huddleston
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 f415837619
)
2008-10-03 11:13:03 -07:00
Jeremy Huddleston
b7ad86ff8a
Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread.
...
(cherry picked from commit c2012138a5
)
2008-10-03 11:12:57 -07:00
Jeremy Huddleston
5446adebfb
XQuartz: Send AppleWMReloadPreferences where appropriate.
...
(cherry picked from commit 490cbe9888
)
2008-10-03 11:12:49 -07:00
Jeremy Huddleston
6020c3fbfe
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
...
(cherry picked from commit 8edc5fb38c
)
(cherry picked from commit 88033a66a5
)
2008-10-03 11:11:47 -07:00
George Peter Staplin
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 6333d619e7
)
2008-09-26 12:31:33 -07:00
George Peter Staplin
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 82a4dc5f0f
)
2008-09-26 12:31:29 -07:00
Jeremy Huddleston
12a59c44cb
XQuartz: Fixed threading issue with TSM.
...
(cherry picked from commit 93ab4e0071
)
2008-09-26 12:31:21 -07:00
Jeremy Huddleston
ee87c9b024
XQuartz: pbproxy: Removed stray SPI include.
...
(cherry picked from commit 2fb2bc77b8
)
2008-09-26 12:31:18 -07:00
George Peter Staplin
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 aa98db576b
)
2008-09-26 12:31:12 -07:00
George Peter Staplin
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 b245d84a72
)
2008-09-26 12:31:06 -07:00
George Peter Staplin
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 63a680354d
)
2008-09-26 12:31:01 -07:00
Jeremy Huddleston
af0d5e2ef7
XQuartz: 64bit crash fix ... don't pass pointers through xe.
...
(cherry picked from commit 5f1265b82e
)
2008-09-21 17:40:42 -07:00
George Peter Staplin
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 c1403c713c
)
2008-09-21 17:40:42 -07:00
George Peter Staplin
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 adf339d8f9
)
2008-09-21 17:40:41 -07:00
George Peter Staplin
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 7ca1532e8e
)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston
b666ffd781
XQuartz: "Disable" the text when syncing is disabled.
...
(cherry picked from commit 7713d7ab66
)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston
dba290ec23
XQuartz: Added a preferences UI for pbproxy options.
...
(cherry picked from commit d76cca5e1e
)
2008-09-21 17:40:35 -07:00
George Peter Staplin
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 1b4987e779
)
2008-09-21 17:40:16 -07:00
George Peter Staplin
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 1e9460abdf
)
2008-09-21 17:40:16 -07:00
George Peter Staplin
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 4a8daf8846
)
2008-09-21 17:40:16 -07:00
George Peter Staplin
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 12912adaee
)
2008-09-21 17:40:16 -07:00
Jeremy Huddleston
d8d555bac7
XQuartz: Don't enable 8bit visuals in the TrueColor server, since it's not working yet
...
(cherry picked from commit 1317c8ff94
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
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 934669f732
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
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 40190675a6
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
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 37361567b6
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
85e23affea
Add an image_jpeg Atom.
...
(cherry picked from commit ea9dc27977
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
6b42f40ff9
Rename reclaim_clipboard to claim_clipboard.
...
(cherry picked from commit d333a8e2b5
)
2008-09-21 17:40:15 -07:00
George Peter Staplin
2ab56981b1
Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
...
(cherry picked from commit 32b175ef62
)
2008-09-21 17:40:14 -07:00
Jeremy Huddleston
cbd32645f7
XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
...
(cherry picked from commit 21a2d0b8d0
)
2008-09-21 17:40:14 -07:00
Jeremy Huddleston
5b397642cd
XQuartz: pbproxy: First round of updates to pbproxy from George.
...
(cherry picked from commit 5c8b956f8f
)
2008-09-21 17:40:14 -07:00
Jeremy Huddleston
999f3362d5
XQuartz: Dead code removal
...
(cherry picked from commit 43184cd379
)
2008-09-12 15:26:18 -07:00
Jeremy Huddleston
6548a55ebd
XQuartz: 256 color support
...
(cherry picked from commit 8dd6d5c825
)
2008-09-12 15:26:13 -07:00
Jeremy Huddleston
bad7cd14c2
XQuartz: Dead code removal
...
(cherry picked from commit bf10fb0b1f
)
2008-09-12 15:26:07 -07:00
Jeremy Huddleston
1119fe136f
XQuartz: Changed around fd handoff model to be more robust
...
(cherry picked from commit 4fe605c2bc
)
2008-09-12 15:26:01 -07:00
Jeremy Huddleston
183233b27b
XQuartz: Don't warp the pointer on server start for XQuartz
...
(cherry picked from commit c0da576d49
)
2008-09-12 15:25:44 -07:00
Jeremy Huddleston
7a46dd30d3
XQuartz: Dead code removal
...
(cherry picked from commit 2e45344870
)
2008-09-12 15:22:46 -07:00
Jeremy Huddleston
1c70e53f25
XQuartz: Fixed proximity logic errors for tablets.
...
(cherry picked from commit d942849f24
)
2008-09-12 15:22:39 -07:00
Jeremy Huddleston
1669308be6
XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
...
(cherry picked from commit 1f842c71c3
)
(cherry picked from commit 144746223d
)
2008-09-03 09:33:58 -07:00
Jeremy Huddleston
46168b3b40
XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
...
(cherry picked from commit 6bca787609
)
(cherry picked from commit fafcafd6de
)
2008-09-03 09:33:53 -07:00
Jeremy Huddleston
7f5318131d
XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
...
(cherry picked from commit 2f1e163d5d
)
(cherry picked from commit 7542c00b96
)
2008-09-03 09:33:45 -07:00
Jeremy Huddleston
700e8bf33f
XQuartz: Updated man page
...
(cherry picked from commit 6932d0d19e
)
(cherry picked from commit 8e3da36b6b
)
2008-09-03 09:25:13 -07:00
Jeremy Huddleston
7430bb9093
XQuartz: Removed dead code (unused option definitions)
...
(cherry picked from commit 3d74f77490
)
(cherry picked from commit c1e5ea9ba0
)
2008-09-03 09:25:07 -07:00
Jeremy Huddleston
b3836e5bdd
XQuartz: Cleaned up our sleeping before adding the launchd socket.
...
(cherry picked from commit ebfe49dfca
)
(cherry picked from commit 2cf74a76d5
)
2008-09-03 09:24:59 -07:00
Jeremy Huddleston
0cd6709db5
XQuartz: Fixed editing of Applications menu
...
(cherry picked from commit da647f1add
)
2008-08-30 16:25:06 -07:00
Jeremy Huddleston
c4d290fc54
XQuartz: Fixed missing symbol in quartzKeyboard debugging
...
(cherry picked from commit 8ad55e484f
)
2008-08-30 14:21:17 -07:00
Jeremy Huddleston
1885582444
XQuartz: Placate automake which doesn't like escaped newlines even in comments...
...
(cherry picked from commit 73db117012
)
2008-08-29 21:18:26 -07:00
Jeremy Huddleston
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 aaf0f71db1
)
2008-08-29 20:55:25 -07:00
Jeremy Huddleston
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 25eccf12c8
)
2008-08-29 20:53:10 -07:00
Tomas Carnecky
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
Jeremy Huddleston
2db1afbf2e
XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.
...
(cherry picked from commit c8244177b0
)
2008-08-26 23:10:18 -07:00
Jeremy Huddleston
319405fa4a
XQuartz: Fixed needed xplugin version. ><
...
(cherry picked from commit 01b3a99dff
)
2008-08-26 23:10:17 -07:00
Jeremy Huddleston
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 e7658e745f
)
2008-08-26 20:19:47 -07:00
Jeremy Huddleston
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 54a882dcbd
)
2008-08-26 20:19:44 -07:00
Jeremy Huddleston
dc1171df5b
XQuartz: Fixed bogus args to debug ErrorF
...
(cherry picked from commit f0351c2b80
)
2008-08-26 20:19:41 -07:00
Jeremy Huddleston
ac936525af
XQuartz: Cleaned up mouse event translation a bit more.
...
(cherry picked from commit c286f2a718
)
2008-08-26 20:19:38 -07:00
Jeremy Huddleston
1b42f55000
Xquartz: Added missing ev_type for NSTabletPoint event.
...
(cherry picked from commit 07548f1394
)
2008-08-26 20:19:35 -07:00
Jeremy Huddleston
13a89f1920
XQuartz: Added more explanation to debug keylayout spew to cut down on report-spam.
...
(cherry picked from commit fcdc9f8b5a
)
2008-08-26 20:19:33 -07:00
Adam Jackson
64ef7ed072
Centralize declaration of ConnectionInfo.
2008-08-20 13:14:34 -04:00
Jeremy Huddleston
f1f44940f1
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
...
(cherry picked from commit 81187364e5
)
(cherry picked from commit f2ec79e4a1
)
2008-08-20 10:00:43 -07:00
Jeremy Huddleston
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 e4110861d3
)
(cherry picked from commit fcfc05482a
)
2008-08-20 10:00:37 -07:00
Jeremy Huddleston
bdc277c9b3
XQuartz: Just cleaned up formatting of event processing code... no "meat" changed...
...
(cherry picked from commit 745bc8ab38
)
(cherry picked from commit a28a2be524
)
2008-08-20 10:00:32 -07:00
Jeremy Huddleston
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 02af74d7a5
)
(cherry picked from commit 2da32894df
)
2008-08-20 10:00:27 -07:00
Jeremy Huddleston
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 8fb6a1cf44
)
(cherry picked from commit ae9c1b3cfb
)
2008-08-20 10:00:20 -07:00
Jeremy Huddleston
436b659091
XQuartz: Updated bundle version to 2.3.1
...
(cherry picked from commit eedecba0b8
)
(cherry picked from commit 7d9d864461
)
2008-08-20 10:00:13 -07:00
Jeremy Huddleston
8b9ed7dec2
XQuartz: Fixed a stuck modifier key bug.
...
(cherry picked from commit eeb6e5a9e9
)
2008-08-14 09:13:37 -07:00
Jeremy Huddleston
1770c85374
XQuartz: Made 3-button mouse simulation a little more consistent.
...
(cherry picked from commit d207b037d2
)
2008-08-14 09:13:35 -07:00
Jeremy Huddleston
f51f77d25e
XQuartz: Reverted "Control" text to be accurately "Command" in the input prefs.
...
(cherry picked from commit b287c481e1
)
2008-08-14 09:13:34 -07:00
Adam Jackson
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
Michel Dänzer
073116cc44
Remove commented out lines that make automake 1.9 puke.
2008-08-08 12:15:27 +02:00
Jeremy Huddleston
666781cd9b
Removed rogue #include
...
(cherry picked from commit af238e99da
)
2008-08-08 02:57:00 -07:00
Jeremy Huddleston
4a0947bf06
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
...
(cherry picked from commit 4545ba91e9
)
2008-08-08 01:53:36 -07:00
Jeremy Huddleston
5accc9b3ce
XQuartz: Re-added deprecated code fallback failsafe for keyboard layout on Leopard with some debugging spew.
...
(cherry picked from commit 5854e712e9
)
2008-08-08 01:21:08 -07:00
Jeremy Huddleston
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
Jeremy Huddleston
26d31ad1c7
XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
...
(cherry picked from commit a8f0d32216
)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston
0ef3243fb5
XQuartz: More fd handoff cleanup.
...
(cherry picked from commit 199d2dcb70
)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston
e7dd3dd8f3
XQuartz: Fixed some errors / typos in the preferences pane.
...
(cherry picked from commit e1e0c398bb
)
2008-08-05 18:47:34 -07:00
Jeremy Huddleston
6836f9aac8
XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
...
(cherry picked from commit d3157ca45c
)
2008-08-05 18:47:34 -07:00
Jeremy Huddleston
de4936d748
XQuartz: Fixed proper processing of tablet button presses
...
(cherry picked from commit ca0babafa4
)
2008-08-05 12:55:02 -07:00
Jeremy Huddleston
b70a8ba3dc
XQuartz: Nuke Sparkle.
...
(cherry picked from commit 4991f54a8d
)
2008-08-05 12:54:57 -07:00
Jeremy Huddleston
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 08f3fe153e
)
2008-08-05 12:54:51 -07:00
Adam Jackson
9757106bba
Remove all empty extension reset hooks, replace with NULL.
2008-07-24 15:46:08 -04:00
Jeremy Huddleston
c3267106fb
XQuartz: Use CFEqual to compare keyboards
...
(cherry picked from commit 5538e43b9a
)
2008-07-11 10:13:36 -07:00
Jeremy Huddleston
90dd2de845
XQuartz: Some fd handoff cleanup.
...
(cherry picked from commit 9c20a4804d
)
2008-07-11 10:13:32 -07:00
Jeremy Huddleston
26d8030c38
XQuartz: Remove deprecated keyboard code.
...
(cherry picked from commit 69cfc1a21e
)
2008-07-11 10:13:26 -07:00
Jeremy Huddleston
e69b9f9ca4
XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
...
(cherry picked from commit 49668e8a88
)
2008-07-11 10:13:13 -07:00
Jeremy Huddleston
8d2e2e1d85
Xquartz: Removed include directive for removed header
...
(cherry picked from commit e65a36d57f
)
2008-07-11 10:13:06 -07:00
Jeremy Huddleston
f8431a62d5
XQuartz: Under the new startup model, we no longer need to do the foreground/background dance.
...
(cherry picked from commit 4505bae5d7
)
2008-06-10 10:52:04 -07:00
Jeremy Huddleston
c180a52332
XQuartz: Removed code path for old startup
...
(cherry picked from commit a9ee6b0d00
)
2008-06-10 10:51:58 -07:00
Jeremy Huddleston
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 ee92aced10
)
2008-06-10 01:46:01 -07:00
Jeremy Huddleston
01ace5f3fd
XQuartz: Updated icon with more rsolutions and made it more dark-background friendly
...
(cherry picked from commit d8cf5623fa
)
2008-06-10 01:46:00 -07:00
Jeremy Huddleston
40855d8000
XQuartz: Removed async debugging sleep
...
(cherry picked from commit 7812a8bdf9
)
2008-06-04 12:24:15 -07:00
Jeremy Huddleston
ee86b75119
XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
...
(cherry picked from commit ff1c443cad
)
2008-06-04 12:24:12 -07:00
Jeremy Huddleston
38da26cd36
XQuartz: Don't forget to destroy the mutex and cond after we're done with them
...
(cherry picked from commit c3558bb8cd
)
2008-06-04 12:24:10 -07:00
Jeremy Huddleston
ea40fcf434
XQuartz: Fork for trigger
...
(cherry picked from commit dd0f8a0f59
)
2008-06-04 12:24:06 -07:00
Jeremy Huddleston
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 7f840e9dc1
)
2008-06-04 12:24:04 -07:00
Peter Hutterer
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
Jeremy Huddleston
7082929ef7
XQuartz: A 2 second delay for launchd socket connections should be sufficient.
...
(cherry picked from commit 2bb4251b3c
)
2008-05-23 02:32:37 -07:00
Jeremy Huddleston
225dddbaed
XQuartz: Move the launchd display grabbing into mach_startup
...
(cherry picked from commit c3866c98d2
)
2008-05-23 02:31:41 -07:00
Jeremy Huddleston
3a22190061
XQuartz: Fixed a few issues with fd passing... still not working =(
...
(cherry picked from commit 7dd3512715
)
2008-05-23 02:31:38 -07:00
Dan Nicholson
c76fddeea2
Fix up paths for GL/glx -> glx renaming
2008-05-21 10:51:15 -07:00
Kristian Høgsberg
77ff8fd507
Drop glcore GLX provider.
...
Obsoleted by the DRI swrast driver.
2008-05-21 12:15:18 -04:00
George Sapountzis
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
Peter Hutterer
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
Jeremy Huddleston
bb687465d0
XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
...
(cherry picked from commit cccee9cfc2
)
2008-05-19 02:47:18 -07:00
Jeremy Huddleston
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 2a72309c06
)
2008-05-19 02:47:17 -07:00
Jeremy Huddleston
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5
)
2008-05-18 23:32:57 -07:00
Jeremy Huddleston
738672858d
New XQuartz icon thanks to Simone Karin Lehmann
...
(cherry picked from commit c27e0c8f3c
)
2008-05-18 23:32:56 -07:00
Jeremy Huddleston
4be2104c80
XQuartz: More work towards Mach-IPC startup... started working on FD passing
...
(cherry picked from commit 27fbfeacfa
)
2008-05-18 22:45:19 -07:00
Jeremy Huddleston
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 301262b070
)
2008-05-17 14:56:57 -07:00
Jeremy Huddleston
2408303d79
XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
...
(cherry picked from commit 543c2cd68d
)
2008-05-17 14:56:53 -07:00
Jeremy Huddleston
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 c28fecc621
)
2008-05-17 14:56:34 -07:00
Jeremy Huddleston
1d09deaa6e
XQuartz: Made DarwinSendDDXEvent a little more robust to context switching diring server init.
...
(cherry picked from commit 5626b0949b
)
2008-05-17 14:56:30 -07:00
Jeremy Huddleston
adc62f62b9
Xquartz: Xquartz stub now can send Mach IPC to start the server.
...
(cherry picked from commit 55a3bca8ea
)
2008-05-17 14:56:26 -07:00
Jeremy Huddleston
cbb4e80eb7
XQuartz: More work on the Mach-IPC startup path
...
(cherry picked from commit 49cd0b185f
)
2008-05-14 01:16:04 -07:00
Jeremy Huddleston
3b57c59bb0
Xquartz: More work on the new Mach startup
...
(cherry picked from commit 6237acf75d
)
2008-05-14 01:16:01 -07:00
Jeremy Huddleston
e435acc84c
Added missing to EXTRA_DIST
...
(cherry picked from commit e39613f463
)
2008-05-14 01:15:58 -07:00
Jeremy Huddleston
f7d6d20ad6
XQuartz: Cleaned up the about box.
...
(cherry picked from commit 0279a59706
)
2008-05-14 01:15:56 -07:00
Jeremy Huddleston
b37e1f1f5c
Don't need the fink-friendly printf in the DDX anymore.
...
(cherry picked from commit fe22794404
)
2008-05-14 01:15:54 -07:00
Jeremy Huddleston
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 78032815ae
)
2008-05-12 10:42:20 -07:00
Jeremy Huddleston
ac4e33a9cd
XQuartz: More startup work... listen if we're the actual server
...
(cherry picked from commit 3b0afb47c3
)
2008-05-12 10:42:16 -07:00
Jeremy Huddleston
a7800d9355
XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
...
(cherry picked from commit 9b67fca9b7
)
2008-05-12 10:42:12 -07:00
Jeremy Huddleston
315f089056
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c
)
2008-05-08 19:58:24 -07:00
Jeremy Huddleston
a07c5ad172
XQuartz: Set bundle version to 2.3.0
...
(cherry picked from commit 8a0524b30e
)
2008-05-08 19:58:15 -07:00
Jeremy Huddleston
05f23ed3ea
XQuartz: Fixed some issue in our bundle creation
...
(cherry picked from commit 330ffad547
)
2008-05-08 19:58:09 -07:00
Jeremy Huddleston
a85d3ac87c
XQuartz: Fixed typo
...
(cherry picked from commit 56b7988d26
)
2008-05-06 03:04:13 -07:00
Jeremy Huddleston
077ced6384
XQuartz: Added uncommitted files
...
(cherry picked from commit e414ec462c
)
2008-05-06 03:04:09 -07:00
Jeremy Huddleston
80e502c5d1
Fixed up dist
...
(cherry picked from commit f225222ba2
)
2008-05-06 03:04:04 -07:00
Jeremy Huddleston
7295e54433
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
...
(cherry picked from commit 453a982e63
)
2008-05-06 02:49:48 -07:00
Ben Byer
d41d677ab4
Xquartz: experimental embedding of Sparkle.framework
...
(cherry picked from commit b7a1a640ce
)
2008-05-06 02:49:41 -07:00
Jeremy Huddleston
f4a68f3701
XQuartz: Fix mouse input offsets earlier since GetPointerEvents does not like negative (x,y) values
...
(cherry picked from commit 8d9eab3a2e
)
2008-05-02 17:42:41 -07:00
Jeremy Huddleston
96fa7da3b8
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
...
(cherry picked from commit ff10c37bdd
)
2008-05-02 17:42:36 -07:00
Peter Hutterer
3344569529
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
2008-05-02 11:00:14 +09:30
Jeremy Huddleston
a338007be6
XQuartz: Adjust the screen origin offset properly for multimonitor setups
...
(cherry picked from commit f2020b9836
)
2008-05-01 18:04:18 -07:00
Jeremy Huddleston
ec0419b505
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
...
(cherry picked from commit 1fcf74a436
)
2008-04-30 17:33:11 -07:00
Ben Byer
b71b51c982
xquartz: created darwinTablet, to represent tablet events
...
(cherry picked from commit 50641bce73
)
2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba
xquartz: remove unused params from DarwinEQInit
...
(cherry picked from commit 299a056737
)
2008-04-29 23:59:31 -07:00
Jeremy Huddleston
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 588683cecc
)
2008-04-29 23:59:26 -07:00
Jeremy Huddleston
d5ab89f4f1
XQuartz: Unset CFProcessPath... blech
...
(cherry picked from commit ce4fbfbc75
)
2008-04-28 15:55:01 -07:00
Jeremy Huddleston
0c2312b21b
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
...
(cherry picked from commit 22cf724376
)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0
XQuartz: Disabled DPMS extension
...
(cherry picked from commit 1448fed9b6
)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7
XQuartz: Added thread debugging to xprFrame.c
...
(cherry picked from commit 41542502b3
)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608
XQuartz: More startup / threading house cleaning.
...
(cherry picked from commit 72653c24c0
)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e
XQuartz: Updated Localizable.strings
...
(cherry picked from commit d8d9c866b9
)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
...
(cherry picked from commit 03e707987f
)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af
Xquartz: Added missing to EXTRA_DIST
...
(cherry picked from commit f4b963256f
)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e1
)
2008-04-26 19:21:05 -07:00
Jeremy Huddleston
b114d4e861
XQuartz: Don't subtract the titlebar off of the pointer_y
...
(cherry picked from commit 00a9567acc
)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635
XQuartz: Added some pseudoramiX debug traces
...
(cherry picked from commit 5bee1585a3
)
2008-04-25 18:04:22 -07:00
Peter Hutterer
e251c9e75a
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
2008-04-25 16:49:35 +09:30
Jeremy Huddleston
0209e46249
XQuartz: More multi-monitor work... reverted Ben's workaround (worked for side-by-side only) and added more debugging.
...
(cherry picked from commit 515b8b855a
)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19
)
(cherry picked from commit 9112f29043
)
2008-04-24 23:50:21 -07:00
Jeremy Huddleston
d09c520b32
Moved Apple GL bits into our DDX subtree
...
(cherry picked from commit c9356f3289
)
2008-04-23 10:22:34 -07:00
Jeremy Huddleston
b05b416c62
XQuartz: No need to include indirect.c a second time
...
(cherry picked from commit 41ed532525
)
2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575
xquartz: clean up linker line for main binary
...
(cherry picked from commit 821d7400f2
)
2008-04-23 10:16:55 -07:00
Jeremy Huddleston
76381092e8
XQuartz: Make sure QuartzAudioInit() gets run.
...
(cherry picked from commit bb3d034675
)
(cherry picked from commit 824b31c7f8
)
2008-04-23 02:22:28 -07:00
Jeremy Huddleston
a8b8700c73
XQuartz: Fixed cmd-tab to bring all windows forward.
...
(cherry picked from commit e48e2ce931
)
2008-04-21 23:45:00 -07:00
Jeremy Huddleston
590688131d
XQuartz: Fixed quit dialog to be more conforming with HIG.
...
(cherry picked from commit 14c6b837bb
)
2008-04-21 19:08:30 -07:00
Ben Byer
570b0dca26
Fix for pointer-offset issue when using a multi-display environment on X11.app.
...
(cherry picked from commit 9a7e14286c
)
2008-04-21 17:55:19 -07:00
Jeremy Huddleston
14396fdeba
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f
)
2008-04-20 01:24:54 -07:00
Jeremy Huddleston
d13828797f
XQuartz: Cleaned up some casting to get rid of compiler warnings
...
(cherry picked from commit 6f1c85b965
)
2008-04-20 01:24:51 -07:00
Jeremy Huddleston
ed9dabb47c
Last of the spam... I promise...
...
(cherry picked from commit 45ebee4f72
)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681
XQuartz: More sanitization of the namespace
...
(cherry picked from commit bc50d41f9d
)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5
XQuartz: Removed unneccessary include
...
(cherry picked from commit 45ff59e69e
)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3
XQuartz: Handled sanitization of namespace better
...
(cherry picked from commit 8cb23d6721
)
2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b
random flailing
...
(cherry picked from commit 7fb9b2dc61
)
2008-04-18 20:07:41 -07:00
Jeremy Huddleston
c14f5dc237
XQuartz: Forgot to commit xprEvent.[hc] ...
...
(cherry picked from commit 70e543baf2
)
2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0
Added XKB support for Xquartz
...
(cherry picked from commit 56dc121520
)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b
)
2008-04-17 15:50:11 -07:00
Jeremy Huddleston
2a1ba20af9
XQuartz: Use a mutex to ensure we only have one thread calling mieqEnqueue at a time.
...
(cherry picked from commit 7b087c965b
)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545
XQuartz: A little more debugging output from threadSafety
...
(cherry picked from commit f6fbdbf838
)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc56
)
2008-04-17 13:21:13 -07:00
Jeremy Huddleston
dbd4c03156
XQuartz: Added framework for asserting which thread we're in.
...
(cherry picked from commit 00beb98251
)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3
)
2008-04-17 11:57:45 -07:00
Jeremy Huddleston
6d11712c2a
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
...
(cherry picked from commit 1b4c37d8f9
)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb073209
)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02
oops, missed a spot
...
(cherry picked from commit 19872a6aeb
)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc
formatting cleanup
...
(cherry picked from commit 769acd2934
)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226
delete debugging spew
...
(cherry picked from commit f04f3af86a
)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432
)
2008-04-17 10:41:50 -07:00
Ben Byer
612e901ef6
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
...
(cherry picked from commit ab662c736e
)
2008-04-17 10:41:46 -07:00
Ben Byer
5bdfbfbedc
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
...
(cherry picked from commit a8a090b853
)
2008-04-17 10:41:42 -07:00
Ben Byer
58e42683c9
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
...
(cherry picked from commit cab54466a6
)
2008-04-17 10:41:38 -07:00
Ben Byer
cd3470a0cf
kludge: miEqEnqueue wants a device, even if we're passing custom messages,
...
so give it one
(cherry picked from commit a494ff04b2
)
2008-04-17 10:41:30 -07:00
Jeremy Huddleston
8716d081fd
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8
)
2008-04-16 23:14:06 -07:00
Jeremy Huddleston
2ffdb0eb64
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b
)
2008-04-16 21:54:00 -07:00
Jeremy Huddleston
757a1bf3a3
Xquartz: Don't need to link against rlAccel since we don't use it
...
(cherry picked from commit 180ec128ad
)
2008-04-16 21:53:03 -07:00
Jeremy Huddleston
9e7ced94a5
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca82
)
2008-04-15 12:06:07 -07:00
Jeremy Huddleston
b1f3f42840
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
...
(cherry picked from commit 55d9973b05
)
2008-04-11 17:50:04 -07:00
Eric Anholt
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
Ben Byer
1f8188656a
add missing dix-config include
...
(cherry picked from commit 126e9bc8c4
)
2008-04-08 21:25:15 -07:00
Jeremy Huddleston
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 df21312c8b
)
(cherry picked from commit 2d4194a8d1
)
2008-04-08 17:03:18 -07:00
Jeremy Huddleston
2e42b67b82
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9f
)
2008-04-02 18:05:55 -07:00
Ben Byer
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 7e653f806f
)
2008-04-02 17:48:24 -07:00
Ben Byer
15b0084f1a
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68
)
2008-04-02 17:48:15 -07:00
Ben Byer
e9e2d88436
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef
)
2008-04-02 17:48:01 -07:00
Ben Byer
c1be4e3379
shovelling code around ...
...
(cherry picked from commit 2143182ba4
)
2008-04-02 17:47:59 -07:00
Ben Byer
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 4aedba5aa7
)
2008-04-02 17:47:57 -07:00
Ben Byer
89f1d880e8
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202
)
2008-04-02 17:47:52 -07:00
Jeremy Huddleston
8944b77ec0
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051
)
2008-04-02 17:47:42 -07:00
Jeremy Huddleston
aa6d12e93e
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4
)
2008-04-02 17:46:59 -07:00
Ben Byer
6c5962e447
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423
)
2008-04-02 17:45:28 -07:00
Ben Byer
c6f0d5d1e5
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60c
)
2008-04-02 17:45:23 -07:00
Ben Byer
5b6c273eaa
add prototype for DarwinEventHandler
...
(cherry picked from commit 9a03ae33c4
)
2008-04-02 17:45:20 -07:00
Ben Byer
3713be8b47
add logging of current thread ID to DEBUG_LOG macro
...
(cherry picked from commit 5848510cc5
)
2008-04-02 17:45:17 -07:00
Ben Byer
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 3f4447b95f
)
2008-04-02 17:45:09 -07:00
Jeremy Huddleston
8746daa673
XQuartz: Fixed missing close-paren in preference pane text.
...
(cherry picked from commit ea37e151dc
)
2008-04-02 17:33:22 -07:00
Ben Byer
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
Ben Byer
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
Ben Byer
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
Jeremy Huddleston
b8ea9f2a25
XQuartz: Fixed names of enums to be more consistent
...
(cherry picked from commit c309a08806daf5d716a860c709e51eacad2c745a)
2008-03-28 17:03:20 -07:00
Jeremy Huddleston
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
Jeremy Huddleston
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 38cbd13490
)
2008-03-27 19:22:07 -07:00
Ben Byer
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
Ben Byer
c4a616a741
prevent "fake mouse clicks" from generating spurious extra events
...
(cherry picked from commit bd85a24969427e41389688663ead2d4dd41c9999)
2008-03-27 19:14:39 -07:00
Jeremy Huddleston
6385947396
XQuartz: Disable 256 color option and fullscreen option
...
(cherry picked from commit 7c1964338a
)
2008-03-21 19:37:49 -07:00
Jeremy Huddleston
93daa3a3bf
Xquartz: Added separate preference tab for quartz-wm settings
...
Added FFM and "Focus on new window" options
(cherry picked from commit 6841d078b7
)
2008-03-21 19:37:46 -07:00
Jeremy Huddleston
c49e112683
XQuartz: Initial framework for dealing with spaces on OS-X
...
(cherry picked from commit 9831324998
)
2008-03-21 19:37:42 -07:00
Jeremy Huddleston
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15
)
2008-03-21 19:33:21 -07:00
Jeremy Huddleston
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
Eamon Walsh
ef60632e20
dix: Modify callers of property and selection API to use new interfaces.
2008-02-29 18:01:37 -05:00
Eamon Walsh
27bcf40cda
XACE: Fix instances of DixUnknownAccess at hook callsites.
2008-02-28 16:43:43 -05:00
Jeremy Huddleston
6dc369028d
XQuartz: Quit now properly warns the user
...
(cherry picked from commit ed3d7b3959
)
2008-02-23 00:28:41 -08:00
Jeremy Huddleston
5f5ec5db35
XQuartz: unsetenv("DISPLAY") before startx if X11.app can't connect to it.
...
Also fix casting to silence warning.
(cherry picked from commit a5cbf78471
)
2008-02-19 00:01:42 -08:00
Jeremy Huddleston
b95059c207
Added Xquartz.plist to EXTRA_DIST
...
(cherry picked from commit 70f9495e0c
)
2008-02-16 02:57:23 -08:00
Jeremy Huddleston
d103820bb8
Fixed unescaped newline in EXTRA_DIST
...
(cherry picked from commit 567c172c4d
)
2008-02-16 01:01:33 -08:00