- 10 Jul, 2012 40 commits
-
-
Extensions could previously declare initialisation dependencies on other extensions, which would then get nicely sorted by the loader. We only had one user for this, GLX, which had one pointless (Composite) and one possibly useful dependency (DBE). As DBE is now a built-in, it will always be sorted by GLX, so we no longer have any users for it. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
GLX was the only user of extension init order dependencies, using them to depend on Composite, which has always been built-in anyway, and DBE, which is now built-in. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Make sure we add static extensions before anything in a module. This is more or less a no-op at the moment, but will come in handy later when extension dependency sorting is removed. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Instead of keeping a tiny amount of code in an external module, just man up and build it into the core server. v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
DRI2DestroyDrawable() was still being _X_EXPORTed, but hasn't existed since 1da1f33f last year. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Ian Romanick <ian.d.romanick@intel.com> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
AM_CFLAGS will suffice, given we only have one target in this directory. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Rather than building the tiny amount of code required for XFree86-DRI as an external module, build it in if it's enabled at configure time. v2: Fix test/Makefile.am to only link libdri.la if DRI is set Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com> fixup for DRI1 move Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Now that libXextmodule.la is both empty and unused, we can just build the one libXext.la for everyone, rather than having Xorg be special and unique. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
extmod was originally a big pointless module. Now it's an empty, pointless module. This commit makes it unexist. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
As with DGA, move VidMode from being part of extmod to a built-in part of the server, if compiled as such. This is initialised from xf86ExtensionInit rather than miinitext because it's wholly dependent on the Xorg DDX. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
-
The DGA event base used to have to be passed through a function pointer, as the code was cleaved in two with half in a module, and half in the core server. Now that's not the case, just access DGAEventBase directly. v2: Deal with Alan's event initialization cleanups Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Rather than leave DGA languishing in extmod, move it to be a built-in extension. As it's quite specific to the Xorg DDX, just move it sideways to the rest of the DGA code in hw/xfree86/common, and initialise it from xf86ExtensionInit, rather than miinitext. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Acked-by:
Keith Packard <keithp@keithp.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Instead of letting it languish in extmod just because we want to configure bits of it from xf86, move XSELinux to the builtin part of Xext, and do its configuration from xf86ExtensionInit. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Xv used to call XvScreenInit and co. through function pointers, as XvScreenInit may have been sitting on the other side of a module boundary from xf86XvScreenInit. Why this was so is a mystery, but make it not so any more. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Acked-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
We no longer have anything in the tree that checks for XorgLoader. This was a fairly monumental hack: xvdi.h used to hide all its functions behind #ifndef XorgLoader, solely to avoid sdksyms.sh picking up its symbols, as it was previously a module rather than built-in. This is no longer the case, so we can remove the define. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Always build these extensions into the core server, rather than letting them languish in extmod. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Always build XRes support into the core server, rather than letting it languish in extmod. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Always build DPMS support into the core server, rather than letting it languish in extmod. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
If we've built MIT-SCREEN-SAVER support, then just build it into the main binary, rather than leaving it in extmod. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Rather than languishing in its own special module, move RECORD into the core server. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
If DBE support is compiled in the server, just man up and build it into the server, rather than having it as an external module. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
NULL sentinels are totally lame. v2: numExtensionModules isn't public, so keep using the provided sentinal - Keith Packard <keithp@keithp.com> Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Stéphane Marchesin <stephane.marchesin@gmail.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
When the array gets down to size zero (which it does in later patches), gcc complains that the index is out of bounds. Avoid this by using ARRAY_SIZE on extensionModules instead. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Stéphane Marchesin <stephane.marchesin@gmail.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
xf86ExtensionInit is called after configuration file parsing, so it can perform the two parts of extension initialisation currently done by extmod: enabling and disabling of extensions through an 'omit' option, and SELinux configuration. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
EXTERN_MODULE was used to specify that we shouldn't worry about modules lacking a ModuleData object. It was also completely unused. *shrug* Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to hold all our extension initialisation prototypes, rather than duplicating them everywhere. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Rather than making poor old miinitext.c do it, including making DMX have fake symbols just to keep it happy. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Stéphane Marchesin <stephane.marchesin@gmail.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Reorder static extension initialisation in miinitext for non-Xorg servers to match Xorg's order. Tested with Xephyr; checked that the extension list was identical before and after. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
INITARGS was a hardcoded define to void. Since knowing the function signature for your extensions is kinda useful, just replace it with a hardcoded void, but leave the define there for API compatibility. Signed-off-by:
Tomas Carnecky <tom@dbservice.com> Reviewed-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Huh, so I guess INITARGS used to be int argc, char *argv then. Either way, it's now void, so fix that ... Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
externsion.h required bits from Xfuncproto.h and dixstruct.h, but included neither; fix that. It also had _XFUNCPROTOBEGIN and _XFUNCPROTOEND wrappers, which is a bit pointless for a server-only library, as it's only needed for C++. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Does what it says on the box, replacing those from Xi/ and glx/. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Cyril Brulebois <kibi@debian.org> Reviewed-by:
Jamey Sharp <jamey@minilop.net> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
libxorgxkb.a contains a number of libraries which are used by XKB action code to call back into the DDX, e.g. for VT switching, termination, grab breaking, et al. Make sure libxkb.a comes first in the link order, so it can mark XkbDDX* as used in order for the linker to not discard them. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
If failing to disable a protocol specified by -nolisten failed, we'd throw a FatalError and bomb startup entirely. From poking at xtrans, it looks like the only way we can get a failure here is because we've specified a protocol name which doesn't exist, which probably doesn't constitute a security risk. And it makes it possible to start gdm even though you've built with --disable-tcp-transport. Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Signed-off-by:
Daniel Stone <daniel@fooishbar.org> Reviewed-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by:
Keith Packard <keithp@keithp.com>
-
Adds new function padding_for_int32() and uses existing pad_to_int32() depending on required results. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Keith Packard <keithp@keithp.com> Reviewed-by:
Peter Hutterer <peter.hutterer@who-t.net> Tested-by:
Daniel Stone <daniel@fooishbar.org>
-
ephyrGLXQueryServerString() carefully allocated a buffer padded to the word-aligned string length for sending to the client, copied the string to it, and then forgot to use it, potentially reading a few bytes of garbage past the end of the server_string buffer. Since WriteToClient already handles the necessary padding, just send it the actual length of the original server_string, and don't bother making a padded copy. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Keith Packard <keithp@keithp.com> Tested-by:
Daniel Stone <daniel@fooishbar.org>
-
Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Keith Packard <keithp@keithp.com> Tested-by:
Daniel Stone <daniel@fooishbar.org>
-
Clear them out when needed instead of leaving whatever values were present in previously sent messages. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Keith Packard <keithp@keithp.com> Tested-by:
Daniel Stone <daniel@fooishbar.org>
-
Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by:
Keith Packard <keithp@keithp.com> Tested-by:
Daniel Stone <daniel@fooishbar.org>
-