andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,373 Commits 86 Branches 473 Tags 48 MiB
993ca5acbd
Commit Graph

309 Commits

Author SHA1 Message Date
Adam Tkac
726dcd9e4e Fix Xvfb input when building against current X sources. 2008-04-07 10:20:02 -04:00
Peter Hutterer
fd06e8f8c1 Merge branch 'master' into dcdc_rework 
Conflicts:

	Xext/xevie.c
	dix/dispatch.c
 2008-04-07 07:56:41 +09:30
Kristian Høgsberg
c40e0b51f0 Implement DRI2 direct rendering and update AIGLX to DRI interface changes. 
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.

Add protocol code to DRI2 module and load DRI2 extension by default.
 2008-03-31 16:50:58 -04:00
Eamon Walsh
b5f98fcea2 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.
 2008-03-28 14:14:23 -04:00
Kristian Høgsberg
cc05255191 Make WriteToClient take a const void * like any decent IO write function. 
Enough with the casting.  Doesn't break API or even ABI, but does make
a lot of silly casts superfluos.
 2008-03-11 00:56:17 -04:00
Alan Coopersmith
cf984dcc15 Make sure SIOGLIFCONF buffer is properly aligned for socket structures 2008-03-04 16:03:38 -08:00
Peter Hutterer
4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
 2008-03-04 18:11:10 +10:30
George Sapountzis
3d64290547 clean some "unused" warnings 2008-03-01 19:49:24 +02:00
Adam Jackson
ef77e4c441 Remove useless commentary from environment and argument processing. 2008-02-14 07:52:07 +11:00
Adam Jackson
f3b3b37ec6 Use strerror instead of errno values in user strings. 2008-02-14 07:52:02 +11:00
Peter Hutterer
0ac1755977 Merge branch 'master' into mpx 
Conflicts:

	Xext/sampleEVI.c
 2008-01-26 13:55:07 +10:30
Daniel Stone
b99a43dfe9 OS: IO: Zero out client buffers 
For alignment reasons, we can write out uninitialised bytes, so allocate
the whole thing with xcalloc.
 2008-01-17 18:43:05 +11:00
Peter Hutterer
38bf01bd1c Merge branch 'master' into mpx 2008-01-10 13:38:46 +10:30
Peter Hutterer
8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
 2008-01-03 17:04:54 +10:30
Daniel Stone
b2f6cd290c OS: Don't leak connection translation table on regeneration 2007-12-28 15:51:36 +02:00
Eamon Walsh
c8feb73f58 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
 2007-12-13 18:38:25 -05:00
Daniel Stone
85dd8efac1 WaitForSomething: Ignore EAGAIN 
If select ever returns EAGAIN, don't bother complaining.
 2007-12-05 19:36:59 +00:00
Rich Coe
b7f3618f39 OS: Connection: Keep trying select while it gets interrupted (bug #9240) 
If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
 2007-12-05 19:36:37 +00:00
Rich Coe
d8b2cad377 OS: Connection: Don't shut down disappeared clients (bug #7876) 
If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
 2007-12-05 19:31:07 +00:00
Adam Jackson
1faba797cb Death to libcwrapper. 
This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
remove it entirely.
 2007-12-03 14:12:58 -05:00
Adam Jackson
fa47910045 Clean up many #if 0. 2007-12-02 12:40:25 -05:00
Eamon Walsh
2d17f47cc7 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
 2007-11-19 18:10:46 -05:00
Eamon Walsh
60be452c2e xace: restore the old SaveScreens function and introduce new API, since the 
old version is called from drivers...
 2007-11-19 16:59:34 -05:00
Adam Jackson
514ba4ca72 Bug #1612: Use a stronger PRNG. 
Currently just reads from /dev/urandom, and only on Linux.
 2007-11-16 19:53:11 -05:00
Adam Jackson
01cfba7522 Nuke the debugging allocator. 
This has never been hooked up in the modular build, and can not possibly
have built since before 6.7.  Clearly no one's using it.
 2007-11-15 14:27:03 -05:00
Adam Jackson
c3897ca709 Add -pogo option for init/teardown performance testing. 2007-11-14 14:46:41 -05:00
Eamon Walsh
1603130236 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/xace.c
	Xext/xace.h
 2007-11-14 13:35:50 -05:00
Eamon Walsh
8b5d21cc1d Rework of the XC-SECURITY extension. The gen-auth protocol has not changed, 
but the XC-QUERY-SECURITY-1 authorization method and the SecurityPolicy
configuration file have been removed.  The semantics of the trusted vs.
untrusted split have been changed.  This will be documented in a future
commit.
 2007-11-08 16:32:42 -05:00
Keith Packard
0e9ef65fa5 Don't frob timers unless SmartSchedule is running 2007-11-07 16:33:10 -08:00
Peter Hutterer
0b729051c0 Merge branch 'master' into mpx 
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
 2007-11-07 15:37:23 +10:30
Eamon Walsh
a52c9b2a59 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
 2007-11-05 19:08:36 -05:00
Daniel Stone
dda10c9066 Remove all traces of external RGB database (and Speedo) 
Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.
 2007-11-05 16:28:35 +00:00
Daniel Stone
2761c10331 OS: Remove usage of alloca 
Replace with heap allocations.
 2007-11-05 14:34:41 +00:00
Adam Jackson
f01e149d1a Move SIGUSR1 notification as late as possible. 
If we inherited a signal mask from the parent process that ignores SIGUSR1,
then we will send SIGUSR1 to the parent to indicate when we're ready to
accept connections.  Unfortunately, we send this notification way too
early, right after creating the sockets rather than just before entering
the main loop.

Move it to just before Dispatch() so we're not lying quite so much.
 2007-11-02 11:54:16 -04:00
Arjan van de Ven
2338d5c991 reduce wakeups from smart scheduler 
The smart scheduler itimer currently always fires after each request
(which in turn causes the CPU to wake out of idle, burning precious
power). Rather than doing this, just stop the timer before going into
the select() portion of the WaitFor loop. It's a cheap system call, and
it will only get called if there's no more commands batched up from the
active fd.

This change also allows some of the functions to be simplified;
setitimer() will only fail if it's passed invalid data, and we don't do
that... so make it void and remove all the conditional code that deals
with failure.

The change also allows us to remove a few variables that were used for
housekeeping between the signal handler and the main loop.

Signed-off-by: Keith Packard <keithp@koto.keithp.com>
 2007-10-30 11:18:56 -07:00
Eamon Walsh
c3f7b86255 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	os/access.c
 2007-10-17 15:00:54 -04:00
Ben Byer
3d4eb17b38 mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI 2007-10-14 18:07:03 -07:00
Dodji Seketeli
6307ee7709 GLX: allow skipping of visual init wrapping 
* GL/glx/glxvisuals.c: added boolean to disable
	  calling init_visuals(). This gives a chance to Xephyr
	  to take over visuals manipulation and avoid a crash at
	  server shutdown in __glXMesaScreenDestroy(), due to the fact
	  that mesa might sees more visual than what it has actually created in
	  init_visuals(). It might see more visuals because Xephyr can augment
	  the number of visuals, dynamically.
	* os/utils.c: the boolean is actually defined here.
 2007-10-02 16:55:17 +02:00
Alan Coopersmith
2d93e69690 Rework local client id finding code to be more uniform 2007-09-27 16:47:32 -07:00
Eamon Walsh
27612748e0 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/devices.c
 2007-09-26 07:47:29 -04:00
Ben Byer
abe0a51f3f So, like, checking return codes of system calls (signal, etc) is good. 
Also, only restore an old signal handler if one was actually set
(prevents the server from dying on OS X).
 2007-09-21 17:07:36 -07:00
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
Peter Hutterer
f367285fd5 Merge branch 'master' into mpx 
Conflicts:

	Xi/exevents.c
	dix/devices.c
	dix/getevents.c
	include/dix.h
	mi/mieq.c
 2007-08-12 15:31:10 +09:30
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
Peter Hutterer
1f97a76476 Merge branch 'master' into mpx 
Conflicts:

	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c
 2007-06-19 17:20:52 +09:30
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
Peter Hutterer
5e43910929 Add GenericEvent extension to Xext. 
This adds (unconditional) support for the GE extension. Anything from now on
that sends events in MPX will have to use the GE extension. No GE, no MPX
events. GE is not actually used yet from anywhere with this commit.

You will need to update x11proto, xextproto, libX11, libXext and xcb to the
matching xge branches. Things will _NOT_ work without the updated protocol
headers and libraries.
 2007-04-30 12:57:42 +09:30
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
Benjamin Herrenschmidt
2dc7b5e0d9 Move call to xf86WrapperInit() to OsVendorInit() in xf86Init.c and remove 
stubs in other DDX.
 2006-02-13 04:43:40 +00:00
Adam Jackson
53dbd00a75 Remove remaining #ifdef DPSEXT stanzas. 2006-01-08 23:43:54 +00:00
Adam Jackson
9d62d1e690 Bug #5218: Don't crash on unconfigured interfaces. (Andrei Barbu) 2006-01-07 00:45:17 +00:00
Adam Jackson
31d0fdde19 Remove a debugging printf 2005-12-28 10:46:56 +00:00
Adam Jackson
8fc4ea8620 Nuke unsupported NDBM routines. Shrink the hash table a bit, over 
25% of the buckets were going empty.
 2005-12-26 18:55:09 +00:00
Alan Coopersmith
9439297b7b Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make 
sure all optional sources are included in EXTRA_DIST, even if they
    aren't used on the platform the distballs are made on.
 2005-12-06 15:50:35 +00:00