Peter Hutterer
7dc40c8eca
xfree86: Don't free master devices.
...
The previous check works in the master-branch, but doesn't work with MPX. We
actually copy the SD's information into the MDs public.devicePrivate, so we
need to explicitly check whether a device is a MD before freeing the module.
2008-04-24 12:47:29 +09:30
Peter Hutterer
275cdc1c74
xfree86: pass correct value to mieqEnqueue (merge detritus I guess)
2008-04-23 16:16:15 +09:30
Peter Hutterer
8190ef8754
Merge branch 'master' into mpx
...
Conflicts:
Xext/EVI.c
Xext/appgroup.c
Xext/cup.c
Xext/mitmisc.c
Xext/sampleEVI.c
dix/window.c
2008-04-22 18:04:05 +09:30
Peter Hutterer
2ddbfd3457
xnest: re-enable XKB support. #10015
...
XKB was disabled in 08928afb05
, with the comment
"Disable XKB, as we can't yet use it". Seems like "yet" is over, running GNOME
and changing XKB settings seems to work in Xnest now.
X.Org Bug 10015 <https://bugs.freedesktop.org/show_bug.cgi?id=10015 >
2008-04-22 16:32:56 +09:30
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
Jordan Crouse
4fa89fbe18
xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
2008-04-21 12:09:00 -06:00
Julien Cristau
40c6be1408
Minor xorg.conf manpage fixups
...
Use __libmansuffix__ instead of __oslibmansuffix__ which isn't getting
replaced, and rewrap some text to get __xservername__ replaced in the
description of Option "Accel" (cpp doesn't like the preceding quote).
2008-04-20 20:36:44 +02:00
Jeremy Huddleston
4bcfed2f9c
Revert "Removed XWin DDX"
...
This reverts commit 6550078b09
.
Doctor, I'm starting to get a pulse...
2008-04-20 08:35:42 -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
6550078b09
Removed XWin DDX
2008-04-19 09:29:46 -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
Adam Jackson
a7503615a6
Death to TOG-CUP.
...
If you still care about 8bpp visuals that much, fix Composite to provide
synthetic visuals.
2008-04-18 19:56:41 -04:00
Eric Anholt
25827fde68
Nuke the MIT-SUNDRY-NONSTANDARD extension.
...
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
2008-04-18 16:37:08 -07:00
Adam Jackson
eafaf40fb3
Death to APPGROUP.
2008-04-18 18:50:05 -04:00
Adam Jackson
f6617b4127
Death to Extended Visual Information.
2008-04-18 18:28:01 -04: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
Drew Parsons
966ae1781f
Create dix/libXpdix.la for Xprint-specific build of libdix.la
...
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)
required because of commit 7c0709a736
,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.
Follows 571206832d
(providing -DXPRINT
to xprint subdirs).
Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
2008-04-18 01:20:36 +10:00
Drew Parsons
571206832d
Define XPRINT in XPRINT_CFLAGS (configure.ac)
...
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736
it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
2008-04-18 01:14:01 +10: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
Kristian Høgsberg
35982bc109
Make DRI2 a serverlayout/serverflags option.
...
Add xf86DRI2Enabled() to export the value of the setting.
2008-04-14 15:23:57 -04:00
Matt Turner
1fa4de80fc
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__.
2008-04-12 20:39:18 +02: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
Adam Jackson
0dab6fa358
So long, and thanks for all the cfb.
2008-04-11 09:47:51 -04:00