Commit Graph

3301 Commits

Author SHA1 Message Date
Adam Jackson 77d0b0ecfa Remove unused pciNumBuses 2008-10-03 17:51:20 -04:00
Adam Jackson 0ce61e21d6 Remove the Must_have_memory hack.
Also remove an astonishing amount of misunderstanding of how casts work.
2008-10-03 17:51:19 -04:00
Adam Jackson e6b1c1fada const cleanup 2008-10-03 17:51:19 -04:00
Adam Jackson fe616f9230 Drop the never-called SkippedRequestCallback list. 2008-10-03 17:51:19 -04:00
Adam Jackson 31136b9467 Unexport MakeClientGrab{Imp,P}ervious
xtrap used to use these, but it's gone now.  xtest still does but it's
linked statically.
2008-10-03 17:51:19 -04:00
Adam Jackson eaf3fdf970 Unexport xf86NoSharedResources 2008-10-03 17:51:19 -04:00
Adam Jackson d7d9edb506 Unexport xf86DeallocateResourcesForEntity 2008-10-03 17:51:19 -04:00
Adam Jackson 49673b4358 Unexport xf86SetEntityFuncs 2008-10-03 17:51:18 -04:00
Adam Jackson 949ef6b79a Unexport xf86ChkConflict
Also remove the unused internal ChkConflict()
2008-10-03 17:51:18 -04:00
Adam Jackson d7c0ba2e9e Remove unused server state change callbackery. 2008-10-03 17:51:18 -04:00
Adam Jackson 9ada146a16 xf86RegisterResources: Always print any failed registrations. 2008-10-03 17:51:18 -04:00
Adam Jackson a5d3fa90f3 Typo fix. 2008-10-03 17:51:18 -04:00
Adam Jackson cc33358585 Remove the old implementation of RemoveOverlaps 2008-10-03 17:51:18 -04:00
Adam Jackson 8fbf1185f5 Internalise some resource list API. 2008-10-03 17:51:17 -04:00
Adam Jackson 0ca4f3cee7 Unexport xf86EnterServerState 2008-10-03 17:51:17 -04:00
Adam Jackson c1df4fbede Unexport (and unimplement) xf86SetAccessFuncs.
Because, no.
2008-10-03 17:51:17 -04:00
Adam Jackson 44269e604e RAC: NO_SEPARATE_*_FROM_* are useless.
If anyone can come up with an example of a bus where:

- both i/o and memory resources are addressable
- access to them can be controlled
- but they can't be controlled independently

then by all means, reinstate this logic.
2008-10-03 17:51:17 -04:00
Adam Jackson 51fcb58f45 RAC: AccessEnable() and AccessDisable() are mandatory. 2008-10-03 17:51:17 -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 4d51ad851e64da83cbdfb0a4a22428418a7bcf75)
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 00ca0f4d839abf47e9573a1552473e039cf787e6)
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 9a91d770a6411dd876187e64a8bda1f0745169ae)
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 d79ccb45f68b65d65718b5b77efe2fae6eeda762)
2008-10-03 11:14:38 -07:00
Jeremy Huddleston 88bb8c6f48 XQuartz: Removed resolved comment about localization.
(cherry picked from commit 8ed5faf058ac7b0782a9cc13a2c58b80168358d2)
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 602e8ba8f7ee196696bc9e3cea6ecdf3200dcf5c)
2008-10-03 11:14:30 -07:00
Jeremy Huddleston ecd260143c XQuartz: Added some localizable strings that were missing.
(cherry picked from commit 2c8205ea8b709c5859412b466e83aec7a94acdcf)
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 f41583761955cb9c92c43239bfaa8ae0e5d95e33)
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 c2012138a520560f8a2160518ea73fced410c3b7)
2008-10-03 11:12:57 -07:00
Jeremy Huddleston 5446adebfb XQuartz: Send AppleWMReloadPreferences where appropriate.
(cherry picked from commit 490cbe9888e2c1080495b003c429fdb1659444e1)
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 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
Peter Hutterer 036d424827 xfree86: don't let DGA steal key events outside of [9,255]. 2008-10-03 15:27:07 +09:30
Adam Jackson 56a24cf894 xorg.conf.man: We don't look in root's ~ anymore, don't say we do. 2008-10-02 17:56:31 -04:00
Adam Jackson f836e1f11b Unifdef ISC 2008-10-02 17:03:54 -04: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 6333d619e747c3b6bd3ba7557e35c0e5f6daa40f)
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 82a4dc5f0f31a7911ee1cce5d1b162077befa811)
2008-09-26 12:31:29 -07:00
Jeremy Huddleston 12a59c44cb XQuartz: Fixed threading issue with TSM.
(cherry picked from commit 93ab4e0071670bb80bfa1170dd97ed9d6d51c67a)
2008-09-26 12:31:21 -07:00
Jeremy Huddleston ee87c9b024 XQuartz: pbproxy: Removed stray SPI include.
(cherry picked from commit 2fb2bc77b804d7b63002c1423cb0bfc658eeee45)
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 aa98db576bc02f0765cb35d0282a894ba3778213)
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 b245d84a72ee3929546cd11a6eba3c60fb4a4d95)
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 63a680354dcb545fef935ac97596dd35ceaed960)
2008-09-26 12:31:01 -07:00
Adam Jackson ad14239a35 Upgrade GLX Public License 1.0 to FreeB 2.0.
According to the press release:

    Previous SGI contributions to the free and open source community
    are now available under the new license. These contributions
    include the SGI® OpenGL® Sample Implementation, the GLX™ API and
    other GLX extensions.

    [...]

    "SGI has been one of the most ardent commercial supporters of free
    and open source software, so it was important to us that we continue
    to support the free software development community by releasing our
    earlier OpenGL-related contributions under this new license," said
    Steve Neuner, director of Linux, SGI. "This license ensures that all
    existing user communities will benefit, and their work can proceed
    unimpeded. Both Mesa and the X.org Project can continue to utilize
    this code in free software distributions of GNU/Linux. Now more than
    ever, software previously released by SGI under earlier GLX and SGI
    Free Software License B is free."

"The GLX API" is here read to include the original GLX source release
from:

http://www.sgi.com/products/software/opensource/glx/download.html
ftp://ftp.sgi.com/sgi/opengl/glx/glx1_2.1.tgz

which includes glxext.c as included in XFree86, from which our copies
in glx/ and hw/dmx/glxProxy/ are derived.
2008-09-22 11:26:49 -04:00
Jeremy Huddleston af0d5e2ef7 XQuartz: 64bit crash fix ... don't pass pointers through xe.
(cherry picked from commit 5f1265b82edead8f15f2affc79c2782519502fa2)
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 c1403c713ca80104ae3736bd2ed1eb6ffa5192b6)
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 adf339d8f948fc1e308dbcae38fcfce504b5b0ab)
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 7ca1532e8e6e2c733c9c508eee0de73d09ecb947)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston b666ffd781 XQuartz: "Disable" the text when syncing is disabled.
(cherry picked from commit 7713d7ab66e74b212a6c0d634a3ad82373e178db)
2008-09-21 17:40:41 -07:00
Jeremy Huddleston dba290ec23 XQuartz: Added a preferences UI for pbproxy options.
(cherry picked from commit d76cca5e1eae86450aa236e49a2024881d0bac01)
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 1b4987e779d97b90669bac2405a4672085677f7c)
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 1e9460abdf5bafe46215966bbef3e796cb1c33e0)
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 4a8daf884694c9c420c45d427f1f84e608e7e48f)
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 12912adaeea759d30f96d8ae51a84fd1659ea0ac)
2008-09-21 17:40:16 -07:00