Commit Graph

3705 Commits

Author SHA1 Message Date
Eamon Walsh
2763056ab5 xace: add hooks + new access codes: core protocol window requests 2007-08-13 13:44:33 -04:00
Eamon Walsh
d744df32a1 xace: add hooks + new access codes: core protocol colormap requests 2007-08-06 12:23:21 -04:00
Eamon Walsh
acc9a42c92 Temporarily disable Security and SELinux extensions
while changes to XACE are being made.
2007-08-06 12:16:59 -04:00
Eamon Walsh
102df4f9ba xace: drop site-policy and declare-extension-security hooks, add 2 new hooks
for controlling access to screens and screen savers.
2007-08-06 09:16:30 -04:00
Eamon Walsh
375864cb74 security: drop support for XC-QUERY-SECURITY authorization method. 2007-08-03 13:23:34 -04:00
Eamon Walsh
d445d2f22b security: drop the "declare extension security" dix call. Use the
SecurityPolicy configuration file instead.
2007-08-03 10:56:18 -04:00
Eamon Walsh
e34fcd2bf4 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
2007-08-02 14:27:03 -04:00
Arkadiusz Miskiewicz
f3955c0a02 XFree86: xf1bpp: distclean generated files as well
Make sure we clean up after ourselves: not sure why distcheck didn't flag
this one.
2007-08-01 21:05:04 +03:00
Julien Cristau
a04c95f444 configure.ac: Fix argument quoting for argv[]
m4 quoting.  Yar boo sux.
2007-08-01 21:05:04 +03:00
Daniel Stone
99a88826e5 configure.ac: Actually use -lrt in monotonic clock test
If we need -lrt to use clock_gettime, then make sure we link with it.
2007-08-01 21:05:04 +03:00
Daniel Stone
1c80e04f87 configure.ac: Disable D-Bus config API support by default
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
2007-08-01 21:05:04 +03:00
Michel Dänzer
c466633673 GLX/DRI: Remove some unused variables. 2007-08-01 18:32:09 +02:00
Michel Dänzer
17cb4f64e3 GLX_EXT_texture_from_pixmap: Use client provided texture target when available.
This prevents situations where the server doesn't use the target the
client thinks it does, usually resulting in the texture being sampled as all
white.
2007-08-01 18:13:18 +02:00
Daniel Stone
a4197db950 GL: GLX: Make sure glxbyteorder.h is distributed 2007-08-01 14:04:51 +03:00
Daniel Stone
ad7421fc76 Bump version to 1.3.99.1 for development
This is not actually .1, just bumping for a different devel version.
2007-08-01 08:30:00 +03:00
Daniel Stone
43e71a5450 XFree86: xf1bpp: Fix previous build system commit
Amateur error.
2007-08-01 08:16:35 +03:00
Daniel Stone
6d6bc93b0a Build system: Add missing files
A couple of headers weren't added to the build.
2007-08-01 08:11:22 +03:00
Daniel Stone
505ec436af XFree86: Properly clean up after ourselves
CLEAN is not a useful variable.  CLEANFILES/DISTCLEANFILES, on the other hand,
are useful variables.
2007-08-01 08:11:08 +03:00
Daniel Stone
1ace9770fe Build system: Non-dtrace distcheck hacks
automake 1.10 really wants foo.c for foo.O, so give it some dummy files to
deal with if it really needs them.
2007-08-01 08:10:38 +03:00
Daniel Drake
cacbdf18ee Remove duplicated licenses
Some files had two copies of the same license.
2007-08-01 08:08:37 +03:00
Daniel Drake
bd49332e47 Add proper COPYING file
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).

There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.

Here is a description of the process I used:

tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2

cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim

egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
        | grep -v "\.in$" | xargs gvim

cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
diff -urNp xorg-server-1.1.1 xorg-server-1.3.0.0

git clone git://anongit.freedesktop.org/git/xorg/xserver
cd xserver
git diff xorg-server-1.3.0.0..

For each file, licenses have been aggregated as follows:

If 2 files have identical license text but different copyright notices,
the copyright notices are aggregated and the license text
is included only once.

Note that by identical I mean really identical, i.e.:
 'AUTHOR(S)' is not the same as 'AUTHORS'
 'KEITH PACKARD DISCLAIMS' is not the same as 'KEITH PACKARD AND COMPAQ
DISCLAIM'

Otherwise, licenses and accompanying copyright notices have been
stacked.

When going through the changes from 1.1.1 to 1.3.0.0 then HEAD, licenses
have been added and removed (so I have reflected this since the original
version of my COPYING file). It's slightly concerning to see that even
between 1.3.0.0 and HEAD, new license permutations are being added. I'd
suggest that a primary license be chosen and this would be indicated at
the top of this COPYING file.
2007-08-01 08:07:08 +03:00
Daniel Drake
51b735394f [PATCH] xserver: Add COPYING terms
I went through the entire xorg-server distribution and aggregated all
the licenses I could find (except the questionable GPL files, see my
last mail).

There are many many permutations on essentially the same license terms,
but I have been pedantic and treated slight differences as separate
licenses.

Here is a description of the process I used:

tar xvjf /usr/portage/distfiles/xorg-server-1.1.1.tar.bz2

cd xorg-server-1.1.1
find -name '*.c' -o -name '*.h' | xargs gvim

egrep -Rli "permission|copyright" * | grep -v "\.[ch]" \
	| grep -v "\.in$" | xargs gvim

cd ..
tar xvjf /usr/portage/distfiles/xorg-server-1.3.0.0.tar.bz2
2007-08-01 08:04:16 +03:00
Arkadiusz Miskiewicz
7fa5838572 XFree86: xf1bpp: Fix parallel build
One of the constructs wasn't parallel-build safe: fix that.
2007-08-01 08:01:28 +03:00
Daniel Stone
18ab4d5594 Darwin: Remove missing file
Xserver.m is missing and still hasn't been added, so just remove it for now.
2007-08-01 07:27:53 +03:00
Daniel Stone
0bd6fe7401 Config: Add missing include 2007-08-01 07:27:30 +03:00
Daniel Stone
48b3034d13 Config: Add current FDI file
Add the FDI file we're using at the moment, until it gets into upstream HAL.
2007-08-01 07:01:51 +03:00
Daniel Stone
82b720cf3e Config: Fix merge detritus 2007-08-01 06:57:11 +03:00
Daniel Stone
6b055e5d97 Input: Fix stuck modifiers (bug #11683)
Disclaimer: It's 6:51am.  I'm trying to be as understandable as possible.

What was happening previously was this:
 * Press Alt
 * Extended event generated and processed: state is now Alt down once
 * Core event generated
   - keyboard switched: inherited state is Alt down once
   - event processed: Alt down twice
 * Release Alt
 * Extended event generated and processed: state is now null
 * Core event generated and processed: Alt down once

If we switch the order:
 * Press Alt
 * Core event generated:
  - keyboard switched: inherited state is null
  - event processed: Alt down once
 * Extended event generated and processed: state is now Alt down once
 * Release Alt
 * Core event generated and processed: state is now null
 * Extended event generated and processed: state is now null

When we carry over the previous state, it needs to be the _previous_ state
(state and modifiersPerKey), assuming that we're going to catch now-core
events for any of these.  For example, if Ctrl is held down as we pivot, we
need to carry Ctrl over with a count of one, for which an extended + core
release will then clear.  Carrying over the union of the previous state _and
the state resulting from the immediate action_ was what broke things.
2007-08-01 06:55:36 +03:00
Daniel Stone
0e0174d45e XFree86: Allow disabling of HAL
If NoAutoAddDevices is given as a server flag, then no devices will be added
from HAL events at all.  If NoAutoEnableDevices is given, then the devices will
be added (and the DevicePresenceNotify sent), but not enabled, thus leaving
policy up to the client.
2007-08-01 03:33:06 +03:00
Daniel Stone
cd8e99e56e Input: Don't enable devices when we open them
Thanks to Xi's braindead design, it's otherwise impossible to query input
devices without enabling them.  Hurrah.
2007-08-01 03:33:06 +03:00
Daniel Stone
0a31db14b7 Config: D-Bus core: Fix hook removal
Make sure we properly initialise the entire hook when adding it, and
bust out when we're done removing.
2007-08-01 03:33:05 +03:00
Daniel Stone
89f628394f XFree86: Input: Fix whitespace 2007-08-01 03:33:05 +03:00
Aaron Plattner
aec0d06469 Fix a crash when rotating the screen.
Remember output->crtc before setting a NULL mode because RRCrtcNotify now sets
output->crtc to NULL.  Use the saved crtc to set the new mode.
2007-07-31 16:33:37 -07:00
Daniel Stone
a93033b0bc XFree86: Module: Bump input version
config_info changes the size (and ordering) of DeviceIntRec, so bump the
input major.
2007-08-01 01:53:31 +03:00
Daniel Stone
1150969b82 Convert all my license statements to the standard form
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
    http://lists.freedesktop.org/archives/xorg/2007-July/026451.html

keithp's license on configure.ac changed with his verbal permission.
2007-08-01 01:53:31 +03:00
Daniel Stone
8658f5d923 Hotplug: Add HAL support
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL.  Requires an FDI which is not yet
in mainline HAL.
2007-08-01 01:53:31 +03:00
Daniel Stone
aa75b34817 Hotplug: D-Bus: Dispatch harder
Dispatch until we've got nothing left to dispatch, since apparently
dispatching will only ever fire a single message ...
2007-08-01 01:53:31 +03:00
Daniel Stone
4d238c5c67 Input: GetPointerEvents: Deny events from devices without valuators
For some reason, my keyboard has 25 mouse buttons, but zero valuators.  This
causes GPE to blow up spectacularly, trying to get (and set) co-ordinates from
devices without valuators.  For now, just prevent this from ever happening,
and whack a dirty great FIXME in.
2007-08-01 01:53:31 +03:00
Daniel Stone
7c9e8fd56e Input: Allow enabling and disabling of devices
Add DEVICE_ENABLE to KDrive and XFree86 to allow us to enable and disable
devices on the fly.
2007-08-01 01:53:31 +03:00
Daniel Stone
0afeb0241a DIX: Clean up null root cursor handling
Move the null root cursor handling out of main() and into CreateRootCursor.
2007-08-01 01:53:31 +03:00
Daniel Stone
62ec6d09b3 dix.h: Remove duplicate ffs() prototype. 2007-08-01 01:53:31 +03:00
Daniel Stone
4d3379d418 Fonts: Fix builtin fonts
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
2007-08-01 01:53:31 +03:00
Daniel Stone
9ac7e8a559 Hotplug: D-Bus: API version 2
Use uint32s instead of int32s where practical, and add an API version
request.  Also, try to return all devices added, not just the first,
and box device arguments.
2007-08-01 01:53:31 +03:00
Daniel Stone
1cdadc2f43 Hotplug: Separate D-Bus into core and hotplug API components
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
2007-08-01 01:53:31 +03:00
Daniel Stone
8bfa41e1bf gitignore: Add automake lex/yacc wrapper 2007-08-01 01:53:30 +03:00
Daniel Stone
06dd2748da configure.ac: Properly check XFree86 proto modules
Not sure why these are conditionals, anyway.  This one really needs
revisiting, but at least causes configure, rather than the compilation,
to bomb out.
2007-08-01 01:53:30 +03:00
Daniel Stone
fd10312b42 configure.ac: Fix KDrive VESA/fbdev conditionals
Make sure we actually respect anything explicitly given on the configure
line, instead of just stomping it with what we detect.
2007-08-01 01:53:30 +03:00
Nicolas Trangez
f37612c6f2 Hotplug: Remove unused function definition from hotplug.h
configDispatch hasn't been used in a long time.
2007-08-01 01:53:30 +03:00
Aaron Plattner
951c058e78 Don't fail compScreenInit if the driver added its own alternate visuals. 2007-07-31 14:23:58 -07:00
Dave Airlie
722d73a0ef Revert "Fix RandR 1.2 conversion of two colour to ARGB cursor on MSB first platforms."
This reverts commit 0f057ebb27.

This screws my cursor up just starting a bare X server on Intel,
I get the X more like <> than ><..
2007-07-31 10:34:56 +10:00