Commit Graph

5360 Commits

Author SHA1 Message Date
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
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
Jeremy Huddleston
144746223d XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c3)
2008-09-03 09:23:06 -07:00
Jeremy Huddleston
fafcafd6de XQuartz: Updated Tablet code to include ranges for valuators and added cursor and erasor
(cherry picked from commit 6bca787609)
2008-09-03 09:22:22 -07:00
Jeremy Huddleston
7542c00b96 XQuartz: Removed "Done" button from Applications Customization. Now properly save on exit.
(cherry picked from commit 2f1e163d5d)
2008-09-03 09:22:13 -07:00
Jeremy Huddleston
4d03fc22ab mieqProcessInputEvents: Check custom event handlers first.
(cherry picked from commit c9ac2f5753)
2008-09-03 09:22:01 -07:00
Jeremy Huddleston
8e3da36b6b XQuartz: Updated man page
(cherry picked from commit 6932d0d19e)
2008-09-03 09:19:49 -07:00
Jeremy Huddleston
c1e5ea9ba0 XQuartz: Removed dead code (unused option definitions)
(cherry picked from commit 3d74f77490)
2008-09-03 09:19:40 -07:00
Jeremy Huddleston
2cf74a76d5 XQuartz: Cleaned up our sleeping before adding the launchd socket.
(cherry picked from commit ebfe49dfca)
2008-09-03 09:19:30 -07:00
Daniel Drake
7f42ed6ca9 Don't try to destroy a NULL pixmap.
(cherry picked from commit 4e1f9f51a9)
2008-09-02 17:33:21 -04:00
Maarten Maathuis
48744d20b1 xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
2008-08-31 18:14:57 +02:00
Jeremy Huddleston
f6f79ac76f XQuartz: Fixed editing of Applications menu
(cherry picked from commit da647f1add)
2008-08-30 16:25:14 -07:00
Jeremy Huddleston
8ad55e484f XQuartz: Fixed missing symbol in quartzKeyboard debugging 2008-08-30 14:19:47 -07:00
Jeremy Huddleston
3739525d57 XQuartz: Don't even build with GLX support since swrast now depends on libdrm 2008-08-30 14:18:07 -07:00
Jeremy Huddleston
780613b7f7 XQuartz: Removed dead entry in Makefile.am 2008-08-29 22:26:46 -07:00
Jeremy Huddleston
c6d0ac7471 Removed dead glcontextmodes 2008-08-29 22:16:03 -07:00
Jeremy Huddleston
73db117012 XQuartz: Placate automake which doesn't like escaped newlines even in comments... 2008-08-29 21:16:19 -07:00
Jeremy Huddleston
4411b8b4de XQuartz: Disable GLX for now, since we don't have a working solution. 2008-08-29 21:01:24 -07:00
Jeremy Huddleston
24aef18e97 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:45:48 -07:00
Jeremy Huddleston
1ecfc492bc 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:45:05 -07:00
Jeremy Huddleston
c48b4ddeff Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-29 20:44:55 -07:00
Xavier Bestel
580e96d6d4 Cosmetic fix to EDID decoding.
(cherry picked from commit bb2cacd33e)
2008-08-29 14:48:40 -04:00
Fredrik Höglund
d0ef934305 Fix the tile offset in miPaintWindow for ParentRelative windows.
(cherry picked from commit 244a635fcd)
2008-08-29 14:39:05 -04:00
Daniel Drake
05472534cf Don't abort if swrast library is not present
GLX is enabled by default, but the current swrast behaviour causes X
to abort with fatal error if the swrast dri library dlopen fails.

Handle the case where the swrast library is not present, and do not
register the GLX extension unless at least one screen has a usable
GL provider.
(cherry picked from commit eff25430b4)
2008-08-29 14:38:43 -04:00
Adam Jackson
4652c51e92 Reimplement ShmPutImage.
There's no reason to not just dispatch this straight into the GC.  As a
bonus, if you do so, damage wraps correctly, and thus swcursor works.
The side effect is it's no longer possible to override ShmPutImage with
ShmRegisterFuncs().

Also remove the (broken) damage tracking for same from EXA, since it didn't
work right, and is now superfluous.

(cherry picked from commit ee7c684f21)
2008-08-29 14:36:43 -04:00