Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Eric Anholt
6da39c6790
Fix build on FreeBSD after Popen changes.
2007-09-12 13:23:13 +00:00
Adam Jackson
a5b8053606
Ignore - not just block - SIGALRM around Popen()/Pclose().
...
Because our "popen" implementation uses stdio, and because nobody's stdio
library is capable of surviving signals, we need to make absolutely sure
that we hide the SIGALRM from the smart scheduler. Otherwise, when you
open a menu in openoffice, and it recompiles XKB to deal with the
accelerators, and you popen xkbcomp because we suck, then the scheduler
will tell you you're taking forever doing something stupid, and the
wait() code will get confused, and input will hang and your CPU usage
slams to 100%. Down, not across.
2007-09-11 11:37:06 -04:00
Ben Byer
bf1641b94c
XDARWIN: Add launchd support
...
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
2007-09-05 20:34:25 -07:00
Eric Anholt
ca82d4bddf
Bug #7186 : Fix an excessive request size limitation that broke big-requests.
...
MAXBUFSIZE appears to be a leftover of some previous time. Instead, just
use maxBigRequestSize when bigreqs are available (limiting buffers to ~16MB).
When bigreqs are not available, needed won't be larger than the maximum
size of a non-bigreqs request (256kB).
2007-08-31 13:09:45 -07:00
Eamon Walsh
8554707326
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
2007-08-28 07:25:21 -04:00
Alan Coopersmith
23fbd5292d
Actually build Secure RPC authentication support (missed in modularization)
2007-08-17 15:29:47 -07:00
Eamon Walsh
b82557c9fb
xace: add hooks + new access codes: core protocol screensaver requests
2007-08-16 10:36:05 -04:00
Eamon Walsh
568ae737d1
xace: add hooks + new access codes: core protocol server requests
2007-08-16 10:33:58 -04:00
Eamon Walsh
3c9553ac2c
xace: rename hostlist security hook to "server" as this hook will be used
...
for other types of server access besides just the host list.
2007-08-15 14:14:25 -04:00
Eamon Walsh
375864cb74
security: drop support for XC-QUERY-SECURITY authorization method.
2007-08-03 13:23:34 -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
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
Adam Jackson
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
Adam Jackson
f7f3fe7fe7
Remove the remnants of OS/2 support.
...
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04:00
Alan Coopersmith
9725516b42
Split checks for dtrace & getpeerucred()
2007-06-26 18:55:36 -07:00
Eamon Walsh
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
Adam Jackson
dfbe32b5b8
Remove the old Kerberos 5 authentication code.
...
Before you complain, this code hasn't seen material change since at least
X11R6. It certainly does not build with any modern version of Kerberos.
Anybody wanting krb5 auth to their X server should probably be using
GSSAPI instead of internal krb5 API anyway.
2007-06-04 18:07:00 -04:00
Luo Jie
0b98845046
Fix os/utils.c compile with mingw.
2007-05-24 11:30:22 -07:00
Eamon Walsh
9cee4ec5e6
xace: change the semantics of the return value of XACE hooks to allow
...
arbitrary X status codes instead of just TRUE/FALSE.
The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however. There is more error propagation
work to do.
2007-04-17 16:01:56 -04:00
Stefan Huehner
1f6741db19
Bug #10560 : Code-Cleanup: function declarations () -> (void)
...
X.Org Bugzilla #10560 : <https://bugs.freedesktop.org/show_bug.cgi?id=10560 >
Patch #9511 <https://bugs.freedesktop.org/attachment.cgi?id=9511 >
2007-04-09 14:33:15 -07:00
Keith Packard
4c2e28b091
Add setrlimit call in -core option to make dumps occur.
...
Default core size limit for most environments is 0, which disables core
dumps. Add code in the -core option processing path to set the core limit to
the maximum value.
2007-04-09 12:28:53 -07:00
Tomas Janousek
8c7f56d92d
Bug #10296 : Fix timer rescheduling.
2007-03-28 14:46:30 -04:00
Eric Anholt
1af2ef0b25
Enable Composite by default now that it disables itself in the known bad cases.
2007-03-27 17:34:04 -07:00
Adam Jackson
4b5802ddbd
General DIX static and dead code cleanup.
2007-03-25 17:57:54 -04:00
Adam Jackson
9a0f25de7c
Static cleanups, dead code deletion.
2007-03-25 12:27:01 -04:00
Adam Jackson
021fc5cb2c
Static markup and dead code cull over xkb/.
...
The former <X11/extensions/XKBsrv.h> has been pulled into the server now as
include/xkbsrv.h, and the world updated to look for it in the new place,
since it made no sense to define server API in an extension header. Any
further work along this line will need to do similar things with XKBgeom.h
and friends.
2007-03-20 18:37:02 -04:00
Ben Byer
5e7f7436a7
merged in miext/rootless changes for XDarwin support
2007-02-16 04:12:26 -08:00
Daniel Stone
811675733e
os: fix client privates leak
...
Minor leak here. Oops.
2007-02-15 19:09:00 +02:00
Eric Anholt
7fccec91c4
Bug #9555 : Always define _GNU_SOURCE in glibc environments.
...
This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and
_XOPEN_SORUCE to get the C environment we want in different places. It also
fixes the build on linux due to RTLD_DEFAULT having not been defined.
2007-01-10 13:10:43 -08:00
Fredrik Höglund
3b5b7ef5c2
Move the code for resetting the DPMS mode in response to input events,
...
from WaitForSomething to mieqProcessInputEvents.
mieqProcessInputEvents already handles resetting the screen saver.
2007-01-03 21:05:35 +01:00
Daniel Stone
c1674660a7
os: test for userland, not kernel
...
It doesn't matter which kernel we're running on, the relevant part when
dealing with includes is what our userland is.
2006-12-24 06:28:52 +02:00
Eric Anholt
d442998e39
Only do the _POSIX_C_SOURCE hackery on linux where it's required.
...
On other OSes, the nasty hack was resulting in prototypes being hidden, so just
don't do it.
2006-12-19 10:56:08 -08:00
Eamon Walsh
6c46645cfc
Naming change: Security*Access -> Dix*Access
2006-12-14 14:45:42 -05:00
Eamon Walsh
f44f14fe56
Define calls away when not building XACE, allowing ifdef's to be removed.
2006-12-01 21:15:41 -05:00
Alan Coopersmith
8956f63a94
Tell automake to STFU about the *.O files
...
automake will not stop whining about the *.O files not being in normal library
name format, so just tell automake they are PROGRAMS so it builds them without
bitching.
2006-11-30 19:53:29 -08:00
Matthias Hopf
834e4b0798
Fix potential NULL pointer access in timer code.
...
https://bugzilla.novell.com/show_bug.cgi?id=223718
2006-11-28 18:58:18 +01:00
Alan Hourihane
33ff4cec5f
Issue CloseDownDevices() in os/log.c and remove from dix/main.c.
...
This ensures that all calls to FatalError() will shutdown the input devices.
2006-11-21 21:23:17 +00:00
Rich Coe
b5d09d4adb
CheckConnections: don't close down the server client (bug #7876 )
...
When an appgroup is shutting down, the list of clients can change, so make
sure we're not trying to shut the server down.
2006-11-08 18:10:14 +02:00
Daniel Stone
b6d7b537ed
os: fix sun extensions test
...
'else if' is not very valid, plus the logic is kind of broken, so just
move it outside the ifdef in the first place.
2006-11-08 15:29:16 +02:00
Daniel Stone
578899139f
RemoveGeneralSocket: don't touch EnabledDevices
...
RemoveGeneralSocket. Harmless, but.
2006-11-08 15:29:15 +02:00
Bernhard Rosenkraenzer
8deaaa312a
automake: avoid use of reserved _SOURCES keyword (bug #8866 )
...
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
2006-11-04 19:08:28 +02:00
Alan Coopersmith
49a26681b2
Add DTrace probe points for X server <-> client communications
...
See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 12:54:43 -08:00
Daniel Stone
4843d823f4
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:18:13 +02:00
Daniel Stone
be291a6d97
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:15:25 +02:00
Alan Coopersmith
a7b944f0d9
If getpeerucred() is available, include pid & zoneid in audit messages too
2006-11-01 16:17:49 -08:00
Alan Coopersmith
fbfb35189e
Bug #1997 : AUDIT messages should contain uid for local accesses
...
<https://bugs.freedesktop.org/show_bug.cgi?id=1997 >
2006-11-01 15:11:48 -08:00
Alan Coopersmith
a2434ec5f3
Make _POSIX_C_SOURCE hack work with Solaris headers
...
Solaris headers are very literal - if you ask for POSIX_C_SOURCE 199309L,
they limit to only the functions in that standard and no more, unless you
also specify __EXTENSIONS__ to allow functions beyond the standard base.
2006-10-31 15:57:59 -08:00
Daniel Stone
68f595ca6c
GetTimeInMillis: use correct units for clock_gettime
...
Make sure we're treating the nanoseconds as a long, not an int, so we
don't overflow.
2006-10-29 03:41:34 +03:00
Daniel Stone
51a06b3c44
WaitForSomething: only rewind when delta is more than 250ms
...
Only rewind time when we're more than (original delta + 250ms) away from
executing the timer.
When we're walking the timer list, use a goto to iterate all of them from
the start again, since timers may drop out of the list.
Don't bother trying to be smart in TimerSet, we'll pick it up in
WaitForSomething anyway.
2006-10-29 03:40:57 +03:00
Daniel Stone
8c0556e7cb
Merge branch 'master' into input-hotplug
2006-10-26 15:21:22 +03:00
Daniel Stone
004d00e668
GetTimeInMillis: simplify monotonic test
...
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test. Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.
The fallthrough to gettimeofday() is preserved.
2006-10-26 01:10:08 +03:00
Daniel Stone
cdc8a4b7b2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-26 00:28:30 +03:00
Daniel Stone
d285833290
GetTimeInMillis: spuport monotonic clock
...
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.
This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
2006-10-25 23:57:00 +03:00
Daniel Stone
d3e57faffe
WaitForSomething: allow time to rewind
...
If time rewinds dramatically, reset all the timers to fix their expiry.
2006-10-25 23:55:43 +03:00
Daniel Stone
335b503c5e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-13 18:10:45 +03:00
Alan Coopersmith
05541259bd
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-21 13:07:41 -07:00
Daniel Stone
0704bb298c
Merge branch 'master' into input-hotplug
2006-08-18 17:30:14 +03:00
Daniel Stone
1c2cb30cd8
Merge branch 'origin' into input-hotplug
2006-08-18 17:05:50 +03:00
Daniel Stone
19f673b778
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-08-18 17:05:41 +03:00
Daniel Stone
cb0a565d2b
dix: add whiteroot flag
...
Add a -wr option to use a white root window, and use a BackPixel rather
than BackPixmap for both white and black root windows.
2006-08-18 17:04:48 +03:00
Alan Hourihane
e1f4565be5
Fix bug #7302 , make Xn.hosts work from the
...
Microsoft Windows install directory on Xming.
(Colin Harrison)
2006-08-18 09:11:48 +01:00
Daniel Stone
d6433be3cc
Merge branch 'master' into input-hotplug
2006-08-12 21:50:52 +03:00
Daniel Stone
984babe86b
remove obsolete vendor defines
...
Remove random behaviour changes for SGI and MetroLink.
2006-08-12 21:43:38 +03:00
Alan Coopersmith
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
Daniel Stone
172d45b9b7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-10 14:14:54 +03:00
Adam Jackson
fcd4167e89
Remove the bc flag from the -help text, since it's gone.
2006-08-09 14:48:51 -04:00
Daniel Stone
3108981631
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-08 12:01:12 +03:00
Daniel Stone
12dbd8a02f
remove optional R3 backwards compatibility
...
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
2006-08-07 23:43:40 +03:00
Daniel Stone
7465010d59
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:05:41 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Daniel Stone
02a9531156
add basic D-BUS configuration mechanism
...
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
2006-07-21 15:19:49 -04:00
Daniel Stone
cd0874dda1
never define MEMBUG
...
Definining MEMBUG causes allocations to randomly fail.
2006-07-21 15:18:57 -04:00
Adam Jackson
985c34bf06
Remove the DDXTIME conditional, for being unused.
2006-07-20 17:33:13 -04:00
Daniel Stone
84683f19b4
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
...
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
2006-07-18 18:17:38 -04:00
Peter Breitenlohner
b3c869304c
Free small, one-time memory leak in xdmcp -from handling
...
Part of Patch #6046 <https://bugs.freedesktop.org/attachment.cgi?id=6046 >
2006-06-26 10:48:44 -07:00
Alan Coopersmith
90af38fa0c
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Alan Coopersmith
77c947b900
Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
...
(Since all use is inside the xserver module, might as well keep the header
in the Xserver module instead of in proto/XExt to allow easier synchronization
of updates.)
2006-06-21 16:18:41 -07:00
Greg Kroah-Hartman
40aafaf154
fix a number of compiler warnings in os/*
2006-06-21 14:36:09 -07:00
Alan Coopersmith
a46c06dab8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
Xext/appgroup.c
Xext/security.c
dix/devices.c
dix/dispatch.c
dix/dixutils.c
dix/events.c
dix/extension.c
dix/property.c
dix/window.c
os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57
Move Xserver API for security extension to securitysrv.h
2006-06-20 18:22:51 -07:00
Alan Coopersmith
88ede2cec7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-20 15:29:55 -07:00
Matthieu Herrb
2b58685402
Check setuid() return value. Bugzilla #7116 .
2006-06-20 21:07:53 +02:00
Eamon Walsh
37f0ae0245
Replace XC-SECURITY code with XACE security hooks
...
(cherry picked from 8526cd6395
commit)
2006-06-19 17:09:37 -07:00
Greg Kroah-Hartman
9fa73721f0
fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes
2006-06-08 10:27:28 -07:00
Greg Kroah-Hartman
494895e0fb
Properly define dispatchExceptionAtReset to fix compiler warnings
2006-06-08 09:43:44 -07:00
Daniel Stone
a9ed5a8790
Kill LBX, too.
2006-06-01 22:06:41 +00:00
Daniel Stone
a73e0f8cdf
Die XTESTEXT1, die!
2006-06-01 18:47:47 +00:00
Alan Coopersmith
724dbc2f8b
Use min() [defined in include/misc.h] instead of MIN() [not defined in any
...
Xorg header].
2006-05-02 01:30:37 +00:00
Fredrik Höglund
e1fc15a85f
Put the screensaver extension back in the Xext module.
...
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
2006-04-05 21:08:45 +00:00
Adam Jackson
3f87aeefb4
Coverity #82 : Dead variable elimination.
2006-04-03 02:12:11 +00:00
Adam Jackson
01ebd63301
Coverity #833 : Fix a rather nasty memory leak.
2006-04-03 01:43:33 +00:00
Fredrik Höglund
7ea30b507f
Move the screensaver extension from module to builtins.
...
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
static libs.
2006-03-31 18:49:38 +00:00
Adam Jackson
7deaaa797c
Big old pile of warning fixes.
2006-03-28 01:21:00 +00:00
Adam Jackson
a68c11bb1d
Mark everything in xf86sym.c as _X_EXPORT.
2006-03-25 19:52:05 +00:00
Fredrik Höglund
ae935832fa
Refactored the screensaver and DPMS timer code to use the screensaver timer
...
for both screensaver and DPMS. Removed the SetDPMSTimers() and
FreeDPMSTimers() functions.
2006-03-24 20:50:13 +00:00
Kristian Høgsberg
966d93ef6d
Make the server distcheck and tag 1.0.99.1 snapshot.
...
Bump CVS version to 1.0.99.1.
Distcheck fixes.
2006-03-21 22:54:38 +00:00
Keith Packard
d33c2e0d10
Add oscolor.h
2006-02-16 19:36:39 +00:00
Keith Packard
8987b2c1ef
Make more extensions optional in build (for kdrive). Fix kdrive build for
...
actual hardware. Fix kdrive pointer signed/unsigned types. Add
kdrive-required YX rotation functions. Replace rgb text file loading
with static rgb color table.
2006-02-16 07:17:31 +00:00
Adam Jackson
f105b8da11
Mark everything in dixsym.c as _X_EXPORT.
2006-02-15 20:44:13 +00:00