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 1fcf74a436f2e19cceb3f285b89859025d94c040)
2008-04-30 17:33:11 -07:00
Ben Byer
b71b51c982
xquartz: created darwinTablet, to represent tablet events
...
(cherry picked from commit 50641bce730ee03738fa0c4beb8125b34fda556f)
2008-04-29 23:59:34 -07:00
Ben Byer
519581b0ba
xquartz: remove unused params from DarwinEQInit
...
(cherry picked from commit 299a056737168ca1faefd675dce6d6ab13176be9)
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 588683cecca2cfc65a28de035cd6ee3d64ff59d2)
2008-04-29 23:59:26 -07:00
Jeremy Huddleston
d5ab89f4f1
XQuartz: Unset CFProcessPath... blech
...
(cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)
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 22cf72437601c07b8a6c744b4f2f1f4cd6713e60)
2008-04-28 15:42:12 -07:00
Jeremy Huddleston
c3dc4bdbb0
XQuartz: Disabled DPMS extension
...
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
2008-04-28 15:42:02 -07:00
Jeremy Huddleston
07382a70c7
XQuartz: Added thread debugging to xprFrame.c
...
(cherry picked from commit 41542502b321c697271c1752525b600872b6df96)
2008-04-28 15:40:22 -07:00
Jeremy Huddleston
e973430608
XQuartz: More startup / threading house cleaning.
...
(cherry picked from commit 72653c24c00dfba64ce35a3d400598bcd77defc1)
2008-04-28 11:49:19 -07:00
Jeremy Huddleston
4b46fc931e
XQuartz: Updated Localizable.strings
...
(cherry picked from commit d8d9c866b90fb24c93bd6e25fa90f8f2bf58ad34)
2008-04-28 11:49:18 -07:00
Jeremy Huddleston
4017ebe5bf
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
...
(cherry picked from commit 03e707987f7f32e47dd0355c6d16bfb9169a379b)
2008-04-28 11:49:16 -07:00
Jeremy Huddleston
0bd28315af
Xquartz: Added missing to EXTRA_DIST
...
(cherry picked from commit f4b963256feb03e9e6b5521bdefeb390e9a49688)
2008-04-26 23:19:33 -07:00
Jeremy Huddleston
ef1c520537
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e112b21ee0156d09a6cd5281642a1dcc)
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 00a9567acce2b27a649cbebd4790e3043688a7d8)
2008-04-26 17:05:34 -07:00
Jeremy Huddleston
b9ca789635
XQuartz: Added some pseudoramiX debug traces
...
(cherry picked from commit 5bee1585a399eab0a7b6fc80ad476d81b5d227d3)
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 515b8b855ac5d2d5aef881053f73b2ad07a6dd2e)
2008-04-24 23:50:23 -07:00
Jeremy Huddleston
b65dbd350b
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19b0ef0fc4ace9400a095ce2521456bc)
(cherry picked from commit 9112f290434c246d3e797551aaaf3a89d2006b23)
2008-04-24 23:50:21 -07:00
Jeremy Huddleston
d09c520b32
Moved Apple GL bits into our DDX subtree
...
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
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 41ed532525da85d1bd2c20af5ffa28ac6d1f4996)
2008-04-23 10:17:13 -07:00
Ben Byer
4e3a8af575
xquartz: clean up linker line for main binary
...
(cherry picked from commit 821d7400f2ff917497b2ee58ceef2b69c2d47ec7)
2008-04-23 10:16:55 -07:00
Jeremy Huddleston
76381092e8
XQuartz: Make sure QuartzAudioInit() gets run.
...
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0)
(cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
2008-04-23 02:22:28 -07:00
Jeremy Huddleston
a8b8700c73
XQuartz: Fixed cmd-tab to bring all windows forward.
...
(cherry picked from commit e48e2ce931228f4dfa36c39b8ec8c72a58025b1b)
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 14c6b837bb03bd0956f90882f550847f13d0ca09)
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 9a7e14286ced55c5e2a4512e2629e03836443009)
2008-04-21 17:55:19 -07:00
Jeremy Huddleston
14396fdeba
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
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 6f1c85b96550adf0bc34efb6ca649b87bcc1b18c)
2008-04-20 01:24:51 -07:00
Jeremy Huddleston
ed9dabb47c
Last of the spam... I promise...
...
(cherry picked from commit 45ebee4f729b148a75e925a4863b4eb850c88f8e)
2008-04-18 20:31:06 -07:00
Jeremy Huddleston
49f2bb4681
XQuartz: More sanitization of the namespace
...
(cherry picked from commit bc50d41f9d1aec04f0de0478cbd5036f1fe9b81e)
2008-04-18 20:25:38 -07:00
Jeremy Huddleston
c2f0d020b5
XQuartz: Removed unneccessary include
...
(cherry picked from commit 45ff59e69eddfcceafced31cf6e73e381d0f6914)
2008-04-18 20:12:05 -07:00
Jeremy Huddleston
5183fea6d3
XQuartz: Handled sanitization of namespace better
...
(cherry picked from commit 8cb23d672177da919257c885804cecd18cf9af88)
2008-04-18 20:07:55 -07:00
Ben Byer
edd3fb784b
random flailing
...
(cherry picked from commit 7fb9b2dc615a3bd1a3c087438af7a8b88265cfaa)
2008-04-18 20:07:41 -07:00
Jeremy Huddleston
c14f5dc237
XQuartz: Forgot to commit xprEvent.[hc] ...
...
(cherry picked from commit 70e543baf2508d636f01b2b7e8cb05172195b68c)
2008-04-17 20:31:24 -07:00
Ben Byer
22bb7608a0
Added XKB support for Xquartz
...
(cherry picked from commit 56dc1215202746590dbe8758411f47e8876e1317)
2008-04-17 17:25:55 -07:00
Jeremy Huddleston
652479dba3
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b58317120c2ac7877e227e2322e1de8)
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 7b087c965bce9f440ab5233d6383aa4a7de969b8)
2008-04-17 15:24:35 -07:00
Jeremy Huddleston
55f80d7545
XQuartz: A little more debugging output from threadSafety
...
(cherry picked from commit f6fbdbf838ab77c3a4635f0b2356b1bbb060ff5b)
2008-04-17 15:24:33 -07:00
Jeremy Huddleston
0d61f6fca1
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc562cfe58b116f5c36e4624018e79ff4a)
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 00beb982510e7a82d77e1f1d43e77c84d7bf74c2)
2008-04-17 13:21:02 -07:00
Jeremy Huddleston
a3d40f0549
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3e29086c5939683c38fa8fd7d2e6754)
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 1b4c37d8f9b517fbec5b94ed4e4a5e86a31472a5)
2008-04-17 11:07:20 -07:00
Jeremy Huddleston
dcf4f917cc
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb07320908b74facea0a97822bb19ed6f960a9)
2008-04-17 11:03:31 -07:00
Ben Byer
582397cd02
oops, missed a spot
...
(cherry picked from commit 19872a6aeb8ee9cb0e33e4b4ffd794c9dbefe0cf)
2008-04-17 10:42:08 -07:00
Ben Byer
0bd1c369cc
formatting cleanup
...
(cherry picked from commit 769acd29348abf9e5b0bebfca6ae695d345f3077)
2008-04-17 10:42:00 -07:00
Ben Byer
700e14c226
delete debugging spew
...
(cherry picked from commit f04f3af86a91d0cafbc86a0d71aeb0599d685f07)
2008-04-17 10:41:55 -07:00
Ben Byer
a440eebf25
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432ebd0545ad1dd0a7ad84ad3e47e8b61)
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 ab662c736e0654e2b4347091f0d9e87f26034216)
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 a8a090b853e811b9843a5732572cbbe542224f32)
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 cab54466a61281cfafc12825017c23d720cd75f4)
2008-04-17 10:41:38 -07:00