Commit Graph

5385 Commits

Author SHA1 Message Date
Jeremy Huddleston
cbc9389dd3 XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071)
2008-09-26 12:30:36 -07:00
Jeremy Huddleston
d5db51954f XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b8)
2008-09-26 12:30:29 -07:00
George Peter Staplin
37f023c59f 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:30:21 -07:00
George Peter Staplin
d1b39134cd 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:30:10 -07:00
George Peter Staplin
5d7506c52a 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:29:58 -07:00
Jeremy Huddleston
86fa42ed82 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-26 12:29:44 -07:00
Alan Hourihane
af8cef461c only build dri2 when DRI2 is enabled 2008-09-24 14:24:36 +01:00
Adam Jackson
97f688f2b4 xserver 1.5.1 2008-09-23 14:51:33 -04:00
Adam Jackson
68c575cb73 Move RELEASE_DATE below AC_INIT.
Doing it the other way around clobbers the setting, which means you get
a null release date string in the log.  Thanks autoconf!
2008-09-23 11:05:44 -04:00
Peter Harris
dba26368e5 Fix panoramiX request and reply swapping
Fix panoramiX request and reply swapping
 Set window and screen values in panoramix replies
 Prevent buffer overrun in ProcPanoramiXGetScreenSize
(cherry picked from commit 2b266eda6e)
2008-09-23 10:36:20 -04:00
Julien Cristau
ce6424853c exa: disable shared pixmaps
They got re-enabled in ee7c684f21
("Reimplement ShmPutImage.")
(cherry picked from commit b4762c0245)
2008-09-23 10:36:02 -04:00
Jeremy Huddleston
0a55ed3965 XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82e)
2008-09-21 17:40:08 -07:00
George Peter Staplin
98066a09e4 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:05 -07:00
George Peter Staplin
e1b5c9a339 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:03 -07:00
George Peter Staplin
8b66db54be 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:01 -07:00
Jeremy Huddleston
d5ba8a5ca1 XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66)
2008-09-21 17:39:58 -07:00
Jeremy Huddleston
a3095771ea XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1e)
2008-09-21 17:39:30 -07:00
George Peter Staplin
e58a1d1d27 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:38:01 -07:00
George Peter Staplin
f8f5d75303 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:37:59 -07:00
George Peter Staplin
9fdf04b675 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:37:56 -07:00
George Peter Staplin
dc7af1b000 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:37:54 -07:00
Jeremy Huddleston
f706f88e4f 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:37:51 -07:00
George Peter Staplin
a59c231559 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:37:49 -07:00
George Peter Staplin
8f663ab452 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:37:47 -07:00
George Peter Staplin
7c21789633 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:37:44 -07:00
George Peter Staplin
adbe6881c8 Add an image_jpeg Atom.
(cherry picked from commit ea9dc27977)
2008-09-21 17:37:42 -07:00
George Peter Staplin
61354ea80d Rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit d333a8e2b5)
2008-09-21 17:37:40 -07:00
George Peter Staplin
05db9d6022 Add image/jpeg type, and rename reclaim_clipboard to claim_clipboard.
(cherry picked from commit 32b175ef62)
2008-09-21 17:37:37 -07:00
Jeremy Huddleston
981fddf2bf XQuartz: pbproxy: Added global variables to customize how pbproxy behaves
(cherry picked from commit 21a2d0b8d0)
2008-09-21 17:37:35 -07:00
Jeremy Huddleston
290e343281 XQuartz: pbproxy: First round of updates to pbproxy from George.
(cherry picked from commit 5c8b956f8f)
2008-09-21 17:37:32 -07:00
Aaron Plattner
3787660295 Conditionalize Composite-based backing store on pScreen->backingStoreSupport. 2008-09-17 15:48:56 -07:00
Jeremy Huddleston
e7487cfc46 XQuartz: Dead code removal
(cherry picked from commit 43184cd379)
2008-09-12 15:20:19 -07:00
Jeremy Huddleston
3788d6d786 XQuartz: 256 color support
(cherry picked from commit 8dd6d5c825)
2008-09-12 15:20:10 -07:00
Jeremy Huddleston
b62362472c XQuartz: Dead code removal
(cherry picked from commit bf10fb0b1f)
2008-09-12 15:19:57 -07:00
Jeremy Huddleston
e55c989cb6 XQuartz: Changed around fd handoff model to be more robust
(cherry picked from commit 4fe605c2bc)
2008-09-12 15:19:49 -07:00
Jeremy Huddleston
df2de85c90 XQuartz: Don't warp the pointer on server start for XQuartz
(cherry picked from commit c0da576d49)
2008-09-12 15:19:39 -07:00
Jeremy Huddleston
519460e998 XQuartz: Make WarpPointer multithread safe in XQuartz.
(cherry picked from commit c1caeb52a4)
2008-09-12 15:19:29 -07:00
Jeremy Huddleston
5bde9444c8 XQuartz: Dead code removal
(cherry picked from commit 2e45344870)
2008-09-12 15:19:14 -07:00
Jeremy Huddleston
448427a231 XQuartz: Fixed proximity logic errors for tablets.
(cherry picked from commit d942849f24)
2008-09-12 15:19:05 -07:00
Jeremy Huddleston
85d340f9e8 XQuartz: Added locking into mieq to protect X from eating itself
(cherry picked from commit 4904e04ce6)
2008-09-12 15:18:51 -07:00
Jeremy Huddleston
d0b1976127 XQuartz: Remove decls of crashtracer strings that we don't use anymore in here
(cherry picked from commit 4a653c6bfd)
2008-09-12 15:16:46 -07:00
Jeremy Huddleston
dbd816dced XQuartz: Fixed a crash in RootlessNativeWindowMoved
(cherry picked from commit a16048cec0)
2008-09-12 15:16:36 -07:00
Jeremy Huddleston
d96f2c5978 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-12 15:16:16 -07:00
Adam Jackson
05fb2f9e12 xserver 1.5.0
Drinkin' island is inside each of us, my son.
2008-09-03 19:14:22 -04:00
Adam Jackson
f385303cd0 Fix strict-aliasing silliness in XAA.
(cherry picked from commit 613ce09550)
2008-09-03 18:58:43 -04:00
Adam Jackson
6cb7f595b9 Disable DRI2 by default. 2008-09-03 14:59:24 -04:00
Adam Jackson
ed2248f673 Disable XTrap build by default. 2008-09-03 14:58:43 -04:00
Julien Cristau
9bb4990c91 Xevie: swap replies as necessary
(cherry picked from commit b5cdcfa55c)
2008-09-03 13:05:45 -04:00
Thorvald Natvig
bcea1095da Xevie: always initialize rep.length (bug#17394)
The XEvIE extension doesn't clear the rep.length field for any reply but
the version check. Hence, if there is junk data in it and that is sent
to the client, it hangs.

X.Org bug#17394 (http://bugs.freedesktop.org/show_bug.cgi?id=17394)
(cherry picked from commit d3ae193f4a)
2008-09-03 13:05:44 -04:00
Julien Cristau
67ed1f23fe Add swapped dispatch for randr 1.2 requests
(cherry picked from commit 01264f1792)
2008-09-03 13:04:19 -04:00