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
|
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 |
|