Adam Jackson
3fcf4d3eb8
XC-MISC is built-in and mandatory.
2008-07-24 15:46:08 -04:00
Adam Jackson
f65c50c4e9
Bigreqs are built-in and mandatory.
2008-07-24 15:46:08 -04:00
Adam Jackson
d6228cb22a
Shape extension is built-in and mandatory.
2008-07-24 15:46:08 -04:00
Adam Jackson
0d785bd635
Unifdef hpux.
2008-07-23 13:43:09 -04:00
Adam Jackson
bd8bd2c700
Unifdef AIX.
2008-07-23 13:37:42 -04:00
Adam Jackson
856db05b58
Unifdef sgi.
2008-07-23 13:37:42 -04:00
James Cloos
ab6557fcd4
Optimize commit 331cc3f079
...
Reorder to minimize comparisons
2008-07-23 13:17:33 -04:00
Adam Jackson
0ff5bc4048
Unifdef QNX.
...
Again, hasn't worked since at least 7.0.
2008-07-23 10:44:34 -04:00
James Cloos
331cc3f079
Fix LookupColor
...
Using strncasecmp(3) with the lenght of the user-supplied colour name
will result in a false positive when the db key starts out with the
same string.
Eg, blue will also match BlueViolet (aka blue violet).
Since the shorter strings occur first in the database, avoid such
errors by treating a 0 result from strncasecmp(3) as a positive result
when the key’s length is longer than the supplied string’s.
2008-07-23 00:01:43 -04:00
Adam Jackson
0b45ba488d
Drop the FONTCACHE extension.
...
This appears to have been dead code since X-TT was merged.
2008-07-18 10:54:10 -04:00
Daniel Stone
16e40ecf43
Remove dead code, useless #defines, et al
2008-07-17 22:37:31 +03:00
Daniel Stone
711720650c
Everyone has urandom
...
If you don't have urandom, please just add a fallback to /dev/random,
rather than building our own random generator.
2008-07-17 21:39:46 +03:00
Daniel Stone
446fe9eecd
Dead code removal
...
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
2008-07-17 21:37:50 +03:00
Mathieu Bérard
47833eef35
Drop a bunch of #ifdef Lynx.
2008-07-17 11:59:24 -04:00
Adam Jackson
af2138bfce
Nuke some ancient code for commandline-challenged OSes.
...
This appears to have been dead code even in 6.7.
2008-07-17 10:39:29 -04:00
Jie Luo
5d11ae7a69
Fix color lookup.
...
OsStrCaseCmp returned inverted comparison sense from normal strcasecmp.
2008-07-17 10:22:29 -04:00
Daniel Stone
22e64108ec
XFree86: Remove XFree86-Misc extension
...
Its last remaining purpose in life has been destroyed by input
properties. Au revoir: it's been fun, by which I mean awful.
2008-07-16 06:25:26 +03:00
Daniel Stone
e6f35f28fb
OS/KDrive/XFree86: Sanitise colour initialisation
...
OsInitColors always just returned TRUE, so just remove calls to it and
insane special-case logic. Remove unused kcolor.c implementation, and
merge oscolor.h into oscolor.c since it was the only user. Remove
open-coded strncasecmp in oscolor.c.
Since we no longer need to call OsInitColors after reading the config
file, just call PostConfigInit() from one place, and move PM handling to
one place so we can install the signal handlers earlier.
2008-07-16 01:38:22 +03:00
Matthieu Herrb
219dd2d44a
sprintf() -> snprintf()
2008-06-19 16:42:10 +02:00
Eamon Walsh
0b00bbca5d
Fix "Warning: no previous prototype for `SecureRPCInit'".
2008-06-13 22:22:22 -04:00
Eamon Walsh
1c2f038d69
Fix multiple warnings in os/xdmauth.c.
2008-06-13 22:12:02 -04:00
Eamon Walsh
384ebe02b3
Fix "warning: label ‘done’ defined but not used".
2008-06-13 21:49:01 -04:00
Peter Hutterer
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
Jeremy Huddleston
5a388b27a0
XQuartz: Add the launchd fd to AllSockets as well
...
(cherry picked from commit 83f7252939
)
2008-05-23 02:32:32 -07:00
George Sapountzis
255142b61e
drop xprint remnants: InitGlobals
2008-05-21 18:13:09 +03:00
Peter Hutterer
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
Jeremy Huddleston
e997df8cd3
XQuartz: Cleaned up ListenOnOpenFD...
...
(cherry picked from commit 6fb587d3d5
)
2008-05-18 23:32:57 -07:00
Jeremy Huddleston
2408303d79
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:56:53 -07:00
Eric Anholt
7cabf81c86
Add necessary include for COMPILEDDISPLAYCLASS.
...
Fixes build after 07f69023b0
.
2008-05-15 13:24:27 -07:00
Adam Jackson
07f69023b0
Move defaultDisplayClass to xdmcp-only visibility.
2008-05-14 16:07:51 -04:00
Adam Jackson
2efe1abb6f
Remove global argc/argv variables.
...
Was only used in the logging code anymore, and uselessly so there.
2008-05-14 15:53:11 -04:00
Adam Jackson
6c27b91122
Restore compression of duplicate log file entries.
...
This undoes the workaround for bug #964 , which was an Xprintism.
2008-05-14 15:44:04 -04:00
Adam Jackson
1c8bd318fb
X n'est pas une print API.
2008-05-12 14:15:11 -04:00
Peter Hutterer
e251c9e75a
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
2008-04-25 16:49:35 +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
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
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