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