Commit Graph

362 Commits

Author SHA1 Message Date
Jeremy Huddleston
f5201d47d0 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-15 17:31:44 -07:00
Adam Jackson
b595b65e54 Revert "Array-index based devPrivates implementation."
This reverts commit 8ef37c194f.
2008-10-09 14:53:29 -04:00
Jeremy Huddleston
42d1454507 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-10-08 18:43:55 -07:00
Eamon Walsh
8ef37c194f Array-index based devPrivates implementation.
Note: DevPrivateKey is now pointer-to-int, which means
each key now needs to point to some global storage of
size at least sizeof(int).

(cherry picked from commit b6ab114212)
2008-10-08 11:15:27 -04:00
Jeremy Huddleston
88033a66a5 XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c)
2008-10-03 11:09:26 -07:00
Jeremy Huddleston
0b2ab2327e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-14 09:12:52 -07:00
Alan Coopersmith
b61ee18b72 Make xstrcasestr prototype return value match the implementation
(cherry picked from 3b687ffe16 commit)
2008-08-06 16:12:59 -07:00
Daniel Stone
b5932f176c DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
(cherry picked from ad87c72edc commit)
2008-08-06 16:12:06 -07:00
Daniel Stone
ce10b41f1b dix: Actually build str(n)casecmp if we don't have it
Remember to add stuff to dix-config.h when you add new AC_DEFINES,
people ...
(cherry picked from 69b57dc651 commit)
2008-08-06 16:08:42 -07:00
Daniel Stone
5a5030af9b DIX: Add strncasecmp from FreeBSD, make strcasecmp args const
Add strncasecmp (as we're now using it) in case someone doesn't have it,
and also change strncasecmp args to be const, in accordance with
everything else.
(cherry picked from 11f9e35202 commit)
2008-08-06 16:05:32 -07:00
Jeremy Huddleston
dfcf7f0db7 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
(cherry picked from commit 672682ebf9)
2008-08-05 18:41:44 -07:00
Jeremy Huddleston
a20a7eb85e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-05 12:53:36 -07:00
Julien Cristau
5659f6d31b Export xkbfile.h in the SDK
It's needed by xkbsrv.h
(cherry picked from commit d8af9d9ab1)
2008-07-13 15:14:41 +02:00
Jeremy Huddleston
e5d4970d4d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-07-11 10:12:55 -07:00
Jeremy Huddleston
a0a4cbf1b5 Set machine dependent defaults for ppc64
(cherry picked from commit 0733ef2e8a)
2008-07-11 10:03:28 -07:00
Simon Thum
ccb373f2fb input: change dxremaind, dyremaind to floats for better acceleration #9156
X.Org Bug 9156 <http://bugs.freedesktop.org/show_bug.cgi?id=9156>

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>

(cherry picked from commit 0050165a67)
2008-07-01 09:46:34 -04:00
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07:00
Alan Coopersmith
2f8ad7f938 Check for strcasestr and workaround it on systems without it
(cherry picked from ed65e8b4f0 commit)
2008-06-23 19:41:10 -07:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
2008-06-13 16:45:08 -04:00
Jeremy Huddleston
33bfb761a7 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-10 01:45:40 -07:00
Julien Cristau
4e3cf7cd89 Add xkbstr.h and xkbsrv.h to sdk_HEADERS
(cherry picked from commit 150c2f55a5)
2008-06-09 17:31:10 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux
(cherry picked from commit ea4ec9e998)
2008-06-09 13:29:32 -04:00
Jeremy Huddleston
a6869b03f6 XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
(cherry picked from commit 1e1f4fb717)
2008-05-23 02:30:59 -07:00
Jeremy Huddleston
1f4d224f82 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d)
2008-05-17 14:55:31 -07:00
Jeremy Huddleston
1b4b73cefb Added missing HAVE_LAUNCHD to dix-config.h.in 2008-04-24 18:22:05 -07:00
Jeremy Huddleston
8cb23d6721 XQuartz: Handled sanitization of namespace better 2008-04-18 20:06:17 -07:00
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
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
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
Thomas Jaeger
a45586da2b XKB: Fix processInputProc wrapping
If input processing is frozen, only wrap realInputProc: don't smash
processInputProc as well.  When input processing is thawed, pIP will be
rewrapped correctly.

This supersedes the previous workaround in 50e80c9.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
(cherry picked from commit 37b1258f0a)
2008-04-01 15:32:01 +03:00
Eamon Walsh
c26bccf417 XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
(cherry picked from commit b5f98fcea2)
2008-03-28 14:24:06 -04:00
Matthieu Herrb
727e22c830 test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
(cherry picked from commit db248ffb84)
2008-03-24 10:09:09 -04:00
Adam Jackson
2a47accff8 Fix distcheck. 2008-03-05 23:56:49 -05:00
Eamon Walsh
34bf308a9e dix: Refactoring of selection code to allow for polyinstantiation.
Introduces dixLookupSelection() API.
Removes NumCurrentSelections from API.
2008-02-29 18:01:37 -05:00
Eamon Walsh
d5715f7bea dix: Refactoring of property code to allow for polyinstantiation.
Introduces dixLookupProperty() API.
2008-02-29 18:01:37 -05:00
Eamon Walsh
f343265a28 XACE: Make the default window background state configurable per-window.
To recap: the original XC-SECURITY extension disallowed background "None" if
the window was untrusted.  XACE 1.0 preserved this check as a hook function.
XACE pre-2.0 removed the hook and first abolished background "None entirely,
then restored it as a global on/off switch in response to Bug #13683.
Now it's back to being per-window, via a flag instead of a hook function.
2008-02-20 15:59:40 -05:00
Eamon Walsh
7c2f0a8bef Remove COMPOSITE ifdefs around WindowRec bitfield as it has no ABI effect. 2008-02-20 15:59:39 -05:00
Daniel Stone
fbd7768946 XKB: Ditch XkbFileInfo
Sorry about the megacommit, but this touches on a lot of stuff.

Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec.  defined will be removed
pretty soon anyway.  Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.

All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
2008-02-17 22:52:08 +02:00
Daniel Stone
ab79110a84 XKB: Remove support for pre-built keymaps
Don't load prebuilt keymaps anymore.
2008-02-17 22:52:07 +02:00
Daniel Stone
1332343910 XKB: Remove usage of client-side types
Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
2008-02-17 22:52:07 +02:00
Daniel Stone
0f12a448dc XKB: Deprecate XKBSRV_NEED_FILE_FUNCS
There's no point in having the function definitions be conditional, so
whatever.
2008-02-17 22:52:07 +02:00
Daniel Stone
68bd7ac193 XKB: Move headers into the server tree
We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
2008-02-17 22:52:07 +02:00
Daniel Stone
e4eb7e5842 XKB: Delete xkberrs.c
Get rid of the XKB errors code to save a bunch of space.
2008-02-17 22:52:06 +02:00
Kristian Høgsberg
b71dc54352 Add DRI2 module. 2008-02-14 19:53:49 -05:00
Adam Jackson
238b816469 X.Org Group -> X.Org Foundation 2008-02-14 07:51:19 +11:00
Adam Jackson
7c0709a736 requestingClient is an xprintism, hide it for other servers. 2008-02-14 07:11:52 +11:00
Adam Jackson
eb8dc11d19 Remove some MAX* #defines that never get used. 2008-02-14 07:11:07 +11:00
Adam Jackson
aa5216e897 Rip out useless indirection in the callback list management. 2008-02-14 07:02:13 +11:00
Peter Hutterer
50e80c3987 include: never overwrite realInputProc with enqueueInputProc. Bug #13511
In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.

This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.

This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
(cherry picked from commit eace88989c)
2007-12-19 19:10:08 +10:30