Jeremy Huddleston
e2431ff488
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c
)
2008-05-08 19:57:48 -07:00
Jeremy Huddleston
7ee9600e77
Updated .gitignore for new Xquartz layout
...
(cherry picked from commit cd4d2355e2
)
2008-05-08 19:57:30 -07:00
Jeremy Huddleston
d6cf35fc56
XQuartz: Set bundle version to 2.3.0
...
(cherry picked from commit 8a0524b30e
)
2008-05-08 19:57:17 -07:00
Jeremy Huddleston
561ece68ea
XQuartz: Fixed some issue in our bundle creation
...
(cherry picked from commit 330ffad547
)
2008-05-08 19:56:29 -07:00
Jeremy Huddleston
1f0706062e
Set CSRG_BASED on OSX
...
(cherry picked from commit ff085deba1
)
2008-05-08 19:56:19 -07:00
Jeremy Huddleston
50ce5f2083
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-05-08 19:55:25 -07:00
Adam Jackson
64948dc667
Bug #13104 : Remove broken XAA a1 glyph fast path.
...
(cherry picked from commit f17ba5d584
)
2008-05-08 16:12:01 -04:00
Adam Jackson
f2aa0000a2
Bug #13104 : Don't let XAA glyph pixmaps anywhere near video memory.
...
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code. Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.
Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
(cherry picked from commit 718652eaf9
)
2008-05-08 16:09:56 -04:00
Daniel Stone
f7a9d30f82
XKB: Actually explain keymap failures
...
When something went wrong building a keymap, try to explain to the user
what it actually was, instead of the dreaded 'Failed to load XKB keymap'
catch-all.
(cherry picked from commit cf20df39cc
)
2008-05-07 22:56:17 +03:00
Keith Packard
3e71527048
Empty the borderClip of manual redirect windows. (bug 15823)
...
Thanks to Owen Taylor for root-causing this one.
If a TreatAsTransparent window has any area in the borderClip, that will be
added to the totalClip region for use by other windows. That's wrong.
Instead, simply empty the borderClip for TreatAsTransparent windows right up
front.
(cherry picked from commit 6c1accce87
)
2008-05-06 13:03:58 -04:00
Jeremy Huddleston
4f0a975d02
XQuartz: Fixed typo
...
(cherry picked from commit 56b7988d26
)
2008-05-06 03:04:30 -07:00
Jeremy Huddleston
1764a6a651
XQuartz: Added uncommitted files
...
(cherry picked from commit e414ec462c
)
2008-05-06 03:04:27 -07:00
Jeremy Huddleston
5bac727e06
Fixed up dist
...
(cherry picked from commit f225222ba2
)
2008-05-06 03:04:23 -07:00
Jeremy Huddleston
89e8654ba4
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:31 -07:00
Ben Byer
62601cfc1f
Xquartz: experimental embedding of Sparkle.framework
...
(cherry picked from commit b7a1a640ce
)
2008-05-06 02:49:22 -07:00
Jeremy Huddleston
e524c73bcb
Rootless: mi doesn't let us resize root, so we need to do it ourselves...
...
(cherry picked from commit c1ec36e28c
)
2008-05-05 15:34:14 -07:00
Jeremy Huddleston
b8ed63740d
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:28 -07:00
Jeremy Huddleston
eb9187cb08
XQuartz: Avoid a possible crash at startup due to unfavorable context switching.
...
(cherry picked from commit ff10c37bdd
)
2008-05-02 17:42:19 -07:00
Jeremy Huddleston
f93f835588
XQuartz: Adjust the screen origin offset properly for multimonitor setups
...
(cherry picked from commit f2020b9836
)
2008-05-01 18:04:23 -07:00
Jeremy Huddleston
51925ed0db
XQuartz: Moved some relevant stuff from darwin.h to darwinEvents.h
...
(cherry picked from commit 1fcf74a436
)
2008-04-30 17:32:55 -07:00
Jeremy Huddleston
3a89ce6307
Dix: Cleaned up sanity checking in Get{Pointer,Keyboard}Events
...
XQuartz was crashing because the Appkit thread was trying to GetXXXEvents while the Xserver thread was exiting.
This adds some more sanity checks and avoids that crash
(cherry picked from commit 34ec4bd6ac
)
2008-04-30 17:32:50 -07:00
Jordan Crouse
fd0ec73bcb
xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
...
(cherry picked from commit 4fa89fbe18
)
2008-04-30 11:51:08 +03:00
Ben Byer
cc58f22037
xquartz: created darwinTablet, to represent tablet events
...
(cherry picked from commit 50641bce73
)
2008-04-29 23:59:02 -07:00
Ben Byer
1f2dc202bd
xquartz: remove unused params from DarwinEQInit
...
(cherry picked from commit 299a056737
)
2008-04-29 23:58:55 -07:00
Jeremy Huddleston
c6edfc2cab
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:58:47 -07:00
Jeremy Huddleston
dd876f2c59
XQuartz: Unset CFProcessPath... blech
...
(cherry picked from commit ce4fbfbc75
)
2008-04-28 15:55:06 -07:00
Jeremy Huddleston
2500818656
XQuartz: xprIsX11Window can be called from the Appkit thread (see X11Application.m)
...
(cherry picked from commit 22cf724376
)
2008-04-28 15:39:40 -07:00
Jeremy Huddleston
1448fed9b6
XQuartz: Disabled DPMS extension
2008-04-28 15:39:02 -07:00
Jeremy Huddleston
080a4eb9b6
XQuartz: Added thread debugging to xprFrame.c
...
(cherry picked from commit 41542502b3
)
2008-04-28 15:29:32 -07:00
Jeremy Huddleston
cf5a4210a4
XQuartz: More startup / threading house cleaning.
...
(cherry picked from commit 72653c24c0
)
2008-04-28 11:49:07 -07:00
Jeremy Huddleston
ab5abdc7af
XQuartz: Updated Localizable.strings
...
(cherry picked from commit d8d9c866b9
)
2008-04-28 11:48:59 -07:00
Jeremy Huddleston
1545be4b57
XQuartz: Added missing Xquartz.man.pre to EXTRA_DIST
...
(cherry picked from commit 03e707987f
)
2008-04-28 11:48:52 -07:00
Jeremy Huddleston
5ecd552e19
Xquartz: Added missing to EXTRA_DIST
...
(cherry picked from commit f4b963256f
)
2008-04-26 23:19:43 -07:00
Jeremy Huddleston
90c4fd7a49
XQuartz: Cleaned up startup and thread creation a tad.
...
(cherry picked from commit c861fe00e1
)
(cherry picked from commit ef1c520537
)
2008-04-26 19:21:18 -07:00
Jeremy Huddleston
4a811c665a
XQuartz: Don't subtract the titlebar off of the pointer_y
...
(cherry picked from commit 00a9567acc
)
2008-04-26 17:05:38 -07:00
Jeremy Huddleston
631e2986f1
XQuartz: Added some pseudoramiX debug traces
...
(cherry picked from commit 5bee1585a3
)
(cherry picked from commit 5c6aa1272e
)
2008-04-25 18:01:55 -07:00
Jeremy Huddleston
40514b3cc7
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:14 -07:00
Jeremy Huddleston
730e2a5ac3
XQuartz: Cleaned up multi-monitor support.
...
(cherry picked from commit c05abf0a19
)
(cherry picked from commit 9112f29043
)
2008-04-24 23:50:08 -07:00
Jeremy Huddleston
b9420202a8
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-24 19:54:45 -07:00
Jeremy Huddleston
bf0144f380
darwin gots /dev/urandom, too yo!
2008-04-24 19:39:27 -07:00
Alan Coopersmith
7c05b4c621
Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
...
X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247 >
(cherry picked from b1ae7c79db
commit)
2008-04-24 19:06:18 -07:00
Jeremy Huddleston
7ee34a69f3
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-24 18:26:09 -07:00
Jeremy Huddleston
1b4b73cefb
Added missing HAVE_LAUNCHD to dix-config.h.in
2008-04-24 18:22:05 -07:00
Jeremy Huddleston
c611335dee
XQuartz: Compile in missing glx source that we still need
2008-04-24 18:21:42 -07:00
Dave Airlie
947419bce2
glx: test for valid read and draw privates before using them
...
this should fix a bug where f-spot exiting blows up the X server
(cherry picked from commit ae982a27e4
)
2008-04-24 16:58:14 +10:00
Dave Airlie
d7db6dd1a1
GLcore: make googleearth not crash the server on sw-rendering.
...
I don't think this is the 100% correct answer as I get log spam saying
(EE) DoSwapInterval: cx = 0x98b8998, GLX screen = 0x96dd780
(EE) AIGLX: cx->pGlxScreen->swapInterval == NULL
but thats better than X exiting in my book.
(cherry picked from commit a368ab757e
)
2008-04-24 16:58:03 +10:00
Jeremy Huddleston
c9356f3289
Moved Apple GL bits into our DDX subtree
2008-04-23 10:13:50 -07:00
Jeremy Huddleston
41ed532525
XQuartz: No need to include indirect.c a second time
2008-04-23 09:59:48 -07:00
Ben Byer
85a5796b66
xquartz: build fixes for GLX/DRI2 fallout (note: not guaranteed)
2008-04-23 06:00:57 -07:00
Ben Byer
27545fd37f
glx / xquartz: we still need glxcontentmodes.[ch] kthx
2008-04-23 03:43:51 -07:00