Commit graph

50 commits

Author SHA1 Message Date
Jeremy Huddleston
49e59d32b8 XQuartz: pbproxy: Push dpy init and CFRunLoop hook setup into the pbproxy thread to avoid possible deadlock 2009-01-02 10:58:40 -08:00
Jeremy Huddleston
22f664ab95 XQuartz: pbproxy: Release display notification lock when not needed to avoid deadlock 2008-12-21 14:43:12 -08:00
Jeremy Huddleston
909cc5c4dc XQuartz: pbproxy: Simplify linking 2008-12-02 14:53:21 -08:00
Jeremy Huddleston
f1a52b5b5a XQuartz: Force X11Controller to reset a broken DISPLAY envvar. 2008-11-25 01:30:03 -08:00
Jeremy Huddleston
7a8c666594 XQuartz: Add fallback for xpbproxy's display for Tiger or no-launchd-Leopard 2008-11-25 00:51:01 -08:00
Jeremy Huddleston
3a500d9247 XQuartz: Don't hardcode values of org.x.X11 for the preferences domain 2008-11-25 00:15:53 -08:00
Jeremy Huddleston
0947aa7911 XQuartz: pbproxy: Added some typedefs for types not available on Tiger 2008-11-21 10:54:55 -08:00
Jeremy Huddleston
799715b8f3 XQuartz: pbproxy: Push the pbproxy Xevent processing into its own thread
and just have the AppKit thread wake it up.
2008-11-19 11:42:59 -08:00
Jeremy Huddleston
477c6968a8 XQuartz: pbproxy: nuke RCS Id, update header license/copyright 2008-11-16 17:57:46 -08:00
Jeremy Huddleston
cb6ffce68a XQuartz: pbproxy: Remove thread-main.m
it got accidently added and isn't used.
2008-11-16 10:42:03 -08:00
Jeremy Huddleston
4294493632 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).
2008-11-15 11:16:42 -08:00
George Peter Staplin
5797d5b662 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:.
2008-10-27 22:07:00 -06:00
George Peter Staplin
9be5998ede 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.
2008-10-27 20:44:02 -06:00
George Peter Staplin
8d048cfa95 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.
2008-10-27 16:34:24 -06:00
Jeremy Huddleston
bb330a1b1c XQuartz: pbproxy: fixed blocking 2008-10-26 13:17:49 -07:00
Jeremy Huddleston
3647215310 Xquartz: pbproxy: Some debugging about unhandled mime types... this will spam up quick, but will be useful for a while... 2008-10-26 10:22:12 -07:00
George Peter Staplin
6bcbb9ba85 XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build. 2008-10-23 17:56:46 -06:00
Jeremy Huddleston
6622efca21 XQuartz: pbproxy: Fix compilation on case-sensitive file systems... 2008-10-23 15:01:03 -07:00
Jeremy Huddleston
cbc0935ef7 XQuartz: pbproxy: SIGHUP reloads preferences. 2008-10-21 11:19:06 -07:00
George Peter Staplin
165cbbb90c 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.
2008-10-16 13:09:21 -06:00
Jeremy Huddleston
bcb83eea72 XQuartz: implemented primary-on-grab and fixed clipboard-to-pasteboard 2008-10-15 14:11:18 -07:00
Jeremy Huddleston
1fe7298a3b Xquartz: Fix parallel builds 2008-10-04 21:25:50 -07:00
Jeremy Huddleston
9b5d114092 XQuartz: pbcopy: Re-enabled some code I commented out for testing 2008-10-04 21:06:58 -07:00
Jeremy Huddleston
f7673bb4de XQuartz: xpbproxy: Support some of the preference toggles from X11.app, cleaned up CLIPBOARD_MANAGER atom management. 2008-10-04 18:54:15 -07:00
George Peter Staplin
4d51ad851e 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.
2008-10-01 00:03:29 -06:00
George Peter Staplin
602e8ba8f7 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.
2008-09-30 13:04:35 -06:00
Jeremy Huddleston
c2012138a5 Xquartz: xpbproxy: Split out app-specific stuff to app-main.m in prep for making this into a thread. 2008-09-27 15:30:10 -07:00
Jeremy Huddleston
8edc5fb38c XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread. 2008-09-26 16:20:22 -07:00
George Peter Staplin
6333d619e7 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().
2008-09-25 14:16:20 -06:00
George Peter Staplin
82a4dc5f0f XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly. 2008-09-25 12:31:58 -06:00
Jeremy Huddleston
2fb2bc77b8 XQuartz: pbproxy: Removed stray SPI include. 2008-09-24 18:57:36 -07:00
George Peter Staplin
aa98db576b 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.
2008-09-23 13:59:25 -06:00
George Peter Staplin
b245d84a72 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.
2008-09-23 12:39:32 -06:00
George Peter Staplin
63a680354d 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.
2008-09-22 17:43:40 -06:00
George Peter Staplin
c1403c713c 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.
2008-09-20 17:49:16 -06:00
George Peter Staplin
adf339d8f9 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.
2008-09-19 21:28:46 -06:00
George Peter Staplin
7ca1532e8e 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.
2008-09-19 14:37:50 -06:00
George Peter Staplin
1b4987e779 XQuartz: pbproxy: Add a missing include of Xutil.h. Another header
seems to have done this before, but correctness matters.
2008-09-19 00:18:44 -06:00
George Peter Staplin
1e9460abdf 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.
2008-09-19 00:02:48 -06:00
George Peter Staplin
4a8daf8846 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.
2008-09-18 13:10:41 -06:00
George Peter Staplin
12912adaee 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.
2008-09-17 12:04:20 -06:00
George Peter Staplin
934669f732 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.
2008-09-16 21:09:22 -06:00
George Peter Staplin
40190675a6 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.
2008-09-16 15:21:18 -06:00
George Peter Staplin
37361567b6 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.
2008-09-15 13:35:46 -06:00
George Peter Staplin
ea9dc27977 Add an image_jpeg Atom. 2008-09-15 13:31:19 -06:00
George Peter Staplin
d333a8e2b5 Rename reclaim_clipboard to claim_clipboard. 2008-09-15 13:28:50 -06:00
George Peter Staplin
32b175ef62 Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard. 2008-09-15 13:27:08 -06:00
Jeremy Huddleston
21a2d0b8d0 XQuartz: pbproxy: Added global variables to customize how pbproxy behaves 2008-09-15 09:33:55 -07:00
Jeremy Huddleston
5c8b956f8f XQuartz: pbproxy: First round of updates to pbproxy from George. 2008-09-14 09:23:17 -07:00
Jeremy Huddleston
1f842c71c3 XQuartz: Added pasteboard proxy code stripped out of quartz-wm. 2008-09-03 09:16:16 -07:00