Jeremy Huddleston
5cef157d9d
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-18 17:23:23 -07:00
Ben Byer
7fb9b2dc61
random flailing
2008-04-18 17:17:01 -07:00
Jeremy Huddleston
a918657f89
XQuartz: Forgot to commit xprEvent.[hc] ...
...
(cherry picked from commit 70e543baf2
)
2008-04-17 20:31:18 -07:00
Ben Byer
2e2b95053e
Added XKB support for Xquartz
...
(cherry picked from commit 56dc121520
)
2008-04-17 17:25:59 -07:00
Jeremy Huddleston
d4859484a4
XQuartz: Moved some rootless-specific cruft into xpr
...
(cherry picked from commit 31625cc03b
)
2008-04-17 15:50:14 -07:00
Jeremy Huddleston
d9729fbe58
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:24 -07:00
Jeremy Huddleston
719d415a6c
XQuartz: A little more debugging output from threadSafety
...
(cherry picked from commit f6fbdbf838
)
2008-04-17 15:24:14 -07:00
Jeremy Huddleston
d9f456adfc
XQuartz: Fixed some missing prototypes
...
(cherry picked from commit 95056afc56
)
2008-04-17 13:20:56 -07:00
Jeremy Huddleston
e1a4eef65e
XQuartz: Added framework for asserting which thread we're in.
...
(cherry picked from commit 00beb98251
)
2008-04-17 13:20:49 -07:00
Jeremy Huddleston
e4218388fa
XQuartz: Include version info for CrashReporter
...
(cherry picked from commit b4992755c3
)
2008-04-17 11:57:47 -07:00
Jeremy Huddleston
20583a9a5a
XQuartz: Use strerror(errno)... cause I like text more than grepping header files
...
(cherry picked from commit 1b4c37d8f9
)
2008-04-17 11:07:18 -07:00
Jeremy Huddleston
dff2b65cc5
merged darwinKeyboard.[ch] into quartzKeyboard
...
(cherry picked from commit 57bb073209
)
2008-04-17 11:03:13 -07:00
Ben Byer
de858ca3b8
oops, missed a spot
...
(cherry picked from commit 19872a6aeb
)
2008-04-17 10:40:29 -07:00
Ben Byer
40939252d1
formatting cleanup
...
(cherry picked from commit 769acd2934
)
2008-04-17 10:40:16 -07:00
Ben Byer
f8cee2ebae
delete debugging spew
...
(cherry picked from commit f04f3af86a
)
2008-04-17 10:40:08 -07:00
Ben Byer
96459ad45d
add support for horizontal scrolling (buttons 6 and 7)
...
(cherry picked from commit f525a4a432
)
2008-04-17 10:40:02 -07:00
Ben Byer
3af6960f12
enable keyboard map debugging -- it's going to x11-debug.txt, anyway ... so no harm
...
(cherry picked from commit ab662c736e
)
2008-04-17 10:39:54 -07:00
Ben Byer
0e61265f38
darwinKeyboard: refactor slightly so that we're not cutting and pasting code from dix, kthx
...
(cherry picked from commit a8a090b853
)
2008-04-17 10:39:47 -07:00
Ben Byer
514b5dd7a7
hack to Xquartz to prevent xmodmap from wiping out our valid modmap, per daniels
...
(cherry picked from commit cab54466a6
)
2008-04-17 10:39:38 -07:00
Ben Byer
3438178115
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:39:30 -07:00
Jeremy Huddleston
c697c1dad3
XQuartz: Don't enable rootless accelerated functionality... crashy...
...
(cherry picked from commit cdb4c291d8
)
2008-04-16 23:14:01 -07:00
Jeremy Huddleston
01a931c313
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b
)
2008-04-16 21:52:54 -07:00
Jeremy Huddleston
11c71ae243
Xquartz: Don't need to link against rlAccel since we don't use it
...
(cherry picked from commit 180ec128ad
)
2008-04-16 21:51:22 -07:00
Jeremy Huddleston
793b828dc7
XQuartz: Removed a call to RootlessReorderWindow from the Carbon thread
...
(cherry picked from commit cb27d5ca82
)
2008-04-15 12:05:20 -07:00
Kristian Høgsberg
5a2b538c1b
Make DRI2 a serverlayout/serverflags option.
...
Add xf86DRI2Enabled() to export the value of the setting.
(cherry picked from commit 35982bc109
)
2008-04-15 11:48:33 +10:00
Matt Turner
db00d4a4dc
Check for __x86_64__ when we check for __amd64__
...
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
(cherry picked from commit 1fa4de80fc
)
2008-04-15 11:47:48 +10:00
Peter Hutterer
099d1bef22
dix: Call DeleteInputDeviceRequest from CloseDownDevices ( #14418 )
...
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.
This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.
X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418 >
(cherry picked from commit 6d22a9615a
)
2008-04-15 11:47:04 +10:00
Dave Airlie
566037a914
quirk: add quirk for ACR 640x350 default mode is wrong
...
RH #440186
(cherry picked from commit b19027fbae
)
2008-04-15 11:46:36 +10:00
Jeremy Huddleston
02bc287690
Xquartz: Added applicationShouldHandleReopen:hasVisibleWindows to handle dock icon clicking
...
(cherry picked from commit 55d9973b05
)
2008-04-11 17:50:01 -07:00
Jeremy Huddleston
12640de083
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-08 21:25:02 -07:00
Ben Byer
7078458432
add missing dix-config include
...
(cherry picked from commit 126e9bc8c4
)
2008-04-08 21:24:53 -07:00
Jeremy Huddleston
2d4194a8d1
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
)
2008-04-08 17:02:56 -07:00
Adam Jackson
9a908769e6
Fix PCI config space cycles from int10 emulator.
...
The top bit of 0xCF8 is an enable bit, not part of the domain. Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
(cherry picked from commit cc7c045bae
)
2008-04-07 10:32:07 -04:00
Dave Airlie
b2704de8a7
quirk: add quirk for ACER EDID
...
(cherry picked from commit f0915fb3c4
)
2008-04-07 10:31:46 -04:00
Hong Liu
8ccdaa288a
Bug #15160 : quirk Proview AY765C
...
prefer first detailed timing
(cherry picked from commit ebc56aca8b
)
2008-04-07 10:30:38 -04:00
Goneri Le Bouder
8059b57f9b
xfree86: don't crash in AutoConfig if the primary device is not pci
...
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823 ).
(cherry picked from commit 9500033b9e
)
2008-04-07 10:30:26 -04:00
Dave Airlie
a2fcdfd5f9
quirk: fix LPL monitors properly.
...
no point having a h cm fix when we really want to copy the sizes from the
other place.
RH BZ 435216
(cherry picked from commit c747030a49
)
2008-04-07 10:26:59 -04:00
Kristian Høgsberg
d1dd774910
Only autoload RECORD if it was enabled.
...
(cherry picked from commit 16a8ce7558
)
2008-04-04 11:47:08 -04:00
Jeremy Huddleston
6acb674a7a
XQuartz: Change reporting of space change to debug log rather than stderr
...
(cherry picked from commit ed15556a9f
)
2008-04-02 18:05:52 -07:00
Jeremy Huddleston
025909a605
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-02 17:44:10 -07:00
Ben Byer
c8b387349e
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:43:46 -07:00
Ben Byer
e8b6088c7b
formatting cleanup for X11Application.m (no code changes)
...
(cherry picked from commit eb083d3f68
)
2008-04-02 17:43:37 -07:00
Ben Byer
503600c7de
moved and renamed QuartzMessageServerThread to
...
DarwinSendDDXEvent to make more clear what it actually does.
(cherry picked from commit bee2b377ef
)
2008-04-02 17:42:52 -07:00
Ben Byer
d39f9a63d7
shovelling code around ...
...
(cherry picked from commit 2143182ba4
)
2008-04-02 17:42:31 -07:00
Ben Byer
9dcf5b4701
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:40:59 -07:00
Ben Byer
8c4a81ce8e
nuke DarwinEventQueue
...
(cherry picked from commit 1e0ec02202
)
2008-04-02 17:40:47 -07:00
Jeremy Huddleston
216fdc8514
continue with gutting darwinEvents.c
...
(cherry picked from commit c34fce7051
)
2008-04-02 17:40:34 -07:00
Jeremy Huddleston
8fc5cd57bb
turns out we weren't actually using these files. oops
...
(cherry picked from commit bfec44d7b4
)
2008-04-02 17:39:04 -07:00
Ben Byer
d34dbcbdb0
remove vestigal DarwinEQPointerPost etc
...
(cherry picked from commit a25704c423
)
2008-04-02 17:36:59 -07:00
Ben Byer
e301ec43da
gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)
...
(cherry picked from commit a9e081a60c
)
2008-04-02 17:36:50 -07:00