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
Jeremy Huddleston
a7d936c4ac
XQuartz: Fixed EXTRA_DIST to include localization
...
(cherry picked from commit 1b338c2a93
)
2008-02-16 01:01:29 -08:00
Adam Jackson
f3b3b37ec6
Use strerror instead of errno values in user strings.
2008-02-14 07:52:02 +11:00
Jeremy Huddleston
8a244c2bc0
XQuartz: Fixed layout of Applications->Customize menu
...
Now resizing it won't produce weir overlaps of the widgets. Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d
)
2008-02-11 12:10:59 -08:00
Jeremy Huddleston
3570ca1cb7
XQuartz: Added option for setting quartz-wm click-through preference
...
(cherry picked from commit bf54c267cb
)
2008-02-10 18:30:52 -08:00
Jeremy Huddleston
8004e160fa
XQuartz: Converted interface to nib 3.x format
...
(cherry picked from commit 656aaab957
)
2008-02-10 18:30:48 -08:00
Jeremy Huddleston
23f3f0e27d
XQuartz: Moved SetFrontProcess haco to set_front_process
...
So it is done by the other thread...
(cherry picked from commit 7429379eb1
)
2008-01-17 09:49:25 -08:00
Jeremy Huddleston
180a5aba4d
XQuartz: Fixed copy-paste error with login_shell commit
...
(cherry picked from commit 6deec3acc6
)
2008-01-12 21:34:09 -08:00
Jeremy Huddleston
6fd4a5e2e4
XQuartz: Corrected copyright X.org Project -> X.org Foundation
...
(cherry picked from commit f216314448
)
2008-01-12 12:02:01 -08:00
Jeremy Huddleston
f72255639c
XQuartz: added 'login_shell' option to defaults
...
so the user can choose something other than /bin/sh
(cherry picked from commit b549cf18ce
)
2008-01-12 12:01:57 -08:00
Jeremy Huddleston
ec24a6b5aa
XQuartz: Fixed switching into XQuartz via expose.
...
(cherry picked from commit 627ed60ce5
)
2008-01-12 12:01:52 -08:00
Jeremy Huddleston
7d226d6a25
XQuartz: Cleanup for strict-prototyping
...
Also fixed DarwinEQEnqueue to match changes to the callback
And also use dpmsstubs.c rather than copying the code into darwin.c
(cherry picked from commit 4c5c30a4be
)
2008-01-05 03:17:27 -08:00
Jeremy Huddleston
11967dce11
XQuartz: Fixed copyright in About box for 2008. Happy New Year!
2008-01-04 23:10:10 -08:00
Jeremy Huddleston
aca75f389e
XQuartz: Flush the debug log for easier debugging
...
Also cleaned up formatting in xpr's eventHandler
(cherry picked from commit 16861d6d42
)
2008-01-04 23:10:10 -08:00
Jeremy Huddleston
e46d559739
XQuartz: Cleaned up color map configuration.
...
8 bit color still doesn't work, but the -depth command line argument now works properly.
(cherry picked from commit 6765949c27
)
2008-01-03 13:25:56 -08:00
Jeremy Huddleston
beb29c605b
XQuartz: *REALLY* use CFStringCreateWithCString
...
I need sleep! Why am I making these stupid mistakes... sorry for pointless commit spam. ugg.
(cherry picked from commit b16351fc64
)
2007-12-21 02:09:15 -08:00
Jeremy Huddleston
5dd895efa3
XQuartz: Use CFStringCreateWithCString
...
(cherry picked from commit 79782b0e14
)
2007-12-21 02:07:07 -08:00
Jeremy Huddleston
2c24231fc2
XQuartz: Reduce code duplication in X11.app
...
(cherry picked from commit b81809cd91
)
2007-12-21 01:58:03 -08:00
Jeremy Huddleston
f3042a63be
XQuartz: Handle Pseudorami init in miinitext
...
(cherry picked from commit a585c94fed
)
2007-12-21 01:24:43 -08:00
Jeremy Huddleston
fa9680a730
XQuartz: Added localization.
...
(cherry picked from commit 7a5cc7bfbb
)
2007-12-20 19:38:49 -08:00
Jeremy Huddleston
603a8b73d4
XQuartz: Cleaned up command line arguments.
2007-12-20 18:29:57 -08:00
Jeremy Huddleston
4cf3002b60
XQuartz: Kill off server-main.c and launcher-main.c
...
Now using xinit
(cherry picked from commit 5d6ae3d299
)
2007-12-20 18:09:24 -08:00
Jeremy Huddleston
1f74bef1ad
XQuartz: Don't fork to exec app_to_run.
...
Plus other housecleaning...
(cherry picked from commit ae302db472
)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
2d15d439f8
Xquartz: Use X11ControllerMain()
...
(cherry picked from commit a9ac932543
)
2007-12-20 17:38:39 -08:00
Jeremy Huddleston
42802a8e6b
Xquartz: General Cleanup
...
General code cleanup, whitespace, dead code removal, added missing prototypes.
Made Xquartz come to foreground later in startup, so it doesn't appear for Xquartz -version
(cherry picked from commit 36922e8ff4
)
2007-12-20 13:18:17 -08:00
Jeremy Huddleston
bf20c4374a
Xquartz: Removed launchd plist and x11-exec. The relevant code is now in xinit.
...
(cherry picked from commit 767b4c9d9d
)
2007-12-16 01:14:55 -08:00
Ben Byer
a3f7f7b60e
clarified debug message to indicate that we're sleeping
...
(in case we get reports about slow launch times, this will
help clarify what's happening)
(cherry picked from commit 2eea3483cf
)
2007-12-14 15:22:57 -08:00
Ben Byer
e0e59b3bbc
we need to link against CoreServices, not ApplicationServices
...
(cherry picked from commit ba4d2096e7
)
2007-12-14 15:22:49 -08:00
Ben Byer
062d9234e2
fixed bug in x11-exec that prevent icon from showing up
...
(cherry picked from commit e1f4a0c20d
)
2007-12-14 15:22:44 -08:00
Jeremy Huddleston
95c02adea8
Xquartz: Fixed cpprules include
2007-12-14 15:21:40 -08:00
Eamon Walsh
86b2e59bfb
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
Eamon Walsh
1c1a4bc970
devPrivates rework: more cleanup from previous merge operation.
2007-12-13 19:51:40 -05:00
Jeremy Huddleston
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80
)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fe
)
2007-12-13 16:29:09 -08:00
Ben Byer
82e1aff9fb
Modified X11 plist to use x11-exec
...
(cherry picked from commit 7d9a11329e
)
2007-12-13 16:28:35 -08:00
Ben Byer
1a5910588a
created x11-exec wrapper, which uses LaunchServices to find
...
(and then exec) X11.app
(cherry picked from commit fc04c9759b
)
2007-12-13 16:28:30 -08:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Jeremy Huddleston
eab0c4e490
Xquartz: Pre-process Xquartz man page
...
(cherry picked from commit dec2633c41
)
2007-12-10 21:03:37 -08:00
Jeremy Huddleston
1ff945a8e4
Xquartz: Make Alt work with Xmodmap again
...
(cherry picked from commit 0e017177dc
)
2007-12-10 21:03:30 -08:00
Jeremy Huddleston
7d61893b49
Xquartz: Removed Xplugin.h from EXTRA_DIST
...
(cherry picked from commit a746383eca
)
2007-12-10 20:34:40 -08:00
Ben Byer
8f2eff643b
remove Xplugin.h, because we should use the one in /usr/include
...
(cherry picked from commit 3e881032f3
)
2007-12-09 12:03:22 -08:00
Jeremy Huddleston
7b573ed436
Xquartz: Added missing link to libconfig.a
...
(cherry picked from commit 14ec1cf1cb
)
2007-12-09 12:02:15 -08:00
Jeremy Huddleston
020b0e92b0
Xquartz Added quartzKeyboard.h to EXTRA_DIST
...
(cherry picked from commit 37c9781fdb
)
2007-12-08 11:49:55 -08:00
Ben Byer
5e016fa9b2
Added darwinEvents.h to EXTRA_DIST
...
(cherry picked from commit 45e5247564
)
2007-12-08 11:33:54 -08:00
Jeremy Huddleston
6bb5dacc17
Xquartz: Actually add quartzForeground.[hc]
...
Sorry for the commit spam... I'm tired and was overly quick to commit... forgot to include a neccessary file.
(cherry picked from commit e564b7aeaa
)
2007-12-08 01:42:03 -08:00
Jeremy Huddleston
02df036670
Xquartz: Actually, it should be org.x.X11 for case-sensitive FS
...
(cherry picked from commit c5ccb98d5d
)
2007-12-08 01:28:49 -08:00
Jeremy Huddleston
740cc54f08
Xquartz: Use org.x.X11 instead of com.apple.X11 for preferences
...
Fixed inconsistency so preferences get read from the correct source.
(cherry picked from commit a74c38bd9f
)
2007-12-08 01:25:13 -08:00
Jeremy Huddleston
41a0aeaae9
XQuartz: Fixed "Multiple Dock Icons"
...
BAM!
(cherry picked from commit d0dca8a885
)
(cherry picked from commit 0502955a2a
)
2007-12-08 00:35:14 -08:00
Jeremy Huddleston
a1b0346853
XQuartz: Cleaned up configure, X11.app path in launchd script
...
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc
)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston
c238ef06a2
Darwin: Dead coded removal
...
Kill off assert macro
(cherry picked from commit d6493abedb
)
2007-12-07 14:08:31 -08:00
Jeremy Huddleston
8a8239f2e2
Darwin: Renamed DarwinModeBlah to QuartzBlah
...
(cherry picked from commit 08ebf86d37
)
2007-12-05 21:26:16 -08:00
Jeremy Huddleston
bc65a24393
Darwin: Flattened quartz into darwin, renamed darwin xquartz
...
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbd
)
2007-12-05 20:32:40 -08:00