Commit Graph

169 Commits

Author SHA1 Message Date
Eamon Walsh b633d54b94 Merge branch 'master' into XACE-SELINUX
Conflicts:

	GL/glx/glxscreens.c
	hw/xnest/Screen.c
	render/glyph.c
	render/glyphstr.h
	render/render.c
2007-10-25 12:19:30 -04:00
Kristian Høgsberg 8e3c1dfc48 Introduce a new "GlxVisuals" option that controls which visuals are added.
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
2007-10-18 21:03:43 -04:00
Kristian Høgsberg 7d74690536 Simplify and clean up GLX visual initialization.
Instead of the fragile setup where we filter the modes common between the
DDX generated GLX visuals and the DRI driver generated fbconfigs, we now
just take the fbconfigs returned by the DRI driver to be our supported set.
2007-10-18 21:03:43 -04:00
Eamon Walsh baabae623b xselinux: Started reworking extension using new XACE hooks. 2007-10-17 13:54:56 -04:00
Eamon Walsh 3815284e89 registry: Register XF86DGA extension protocol names. 2007-10-15 17:57:59 -04:00
Eamon Walsh 2cd1b32b77 registry: Register XF86Misc extension protocol names. 2007-10-15 17:37:58 -04:00
Eamon Walsh 960677e876 registry: Register XF86VidMode extension protocol names. 2007-10-15 17:30:00 -04:00
Peter Hutterer 45ec6cd1fb xfree86: fix DGA to use the correct devices.
DGAStealXXXEvent modified to take in device argument.

The evdev driver only sends one valuator when only one axis changed. We need
to check for DGA either way (xf86PostMotionEventP), otherwise we lose purely
horizontal/vertical movements.

Note that DGA does not do XI events.
2007-10-02 13:19:07 +09:30
Eamon Walsh 4017d31902 devPrivates rework: since API is already broken, switch everything
over to new system.

Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04: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
Julien Cristau 13949f9972 Get rid of the type1 font module.
It is completely replaced by freetype these days.
2007-08-23 11:27:33 +02: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
Adam Jackson 4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Eamon Walsh 2a4aa63a23 Merge branch 'master' into XACE-SELINUX
Conflicts:

	include/miscstruct.h
2007-05-22 14:50:26 -04:00
Adam Jackson a277f04ab0 Remove mfb and cfb from include paths where they're not needed. 2007-05-11 11:43:19 -04:00
Eamon Walsh cf962a849d Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac
2007-04-05 14:41:39 -04:00
Brian a240c039c4 Split the xserver/fb/fbcmap.c file into two files.
Now, fbcmap_mi.c contains the fb functions which just wrap mi functions.
Previously, these were in fbcmap.c and compiled when XFree86Server was defined.
Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry
about setting the XFree86Server symbol.
2007-04-03 09:28:21 -06:00
Eamon Walsh 728ad64d97 Merge branch 'master' into XACE-SELINUX 2007-03-27 13:16:40 -04:00
Dave Airlie d387a3ddf7 fix loading of GLcore after recent loading changes 2007-03-27 11:00:13 +10:00
Eamon Walsh 0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -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
Daniel Stone 0f75c47e0c xfree86 input: Re-enable DGA support
Re-enable DGA support for relative mouse motion.
2007-03-21 00:12:02 +02:00
Eamon Walsh 23fc429aad Merge branch 'master' into XACE-SELINUX 2007-03-05 12:18:54 -05:00
Eamon Walsh c16343ac2c Make mfb, cfb, and afb support configurable at build-time. 2007-02-27 14:14:47 -05:00
Eamon Walsh a7f4bbea87 Add SELinux extension to the module/extension loader. 2006-12-12 13:27:02 -05:00
Daniel Stone d17ec01e83 remove CID support (bug #5553)
Remove CID from all our fontpaths.
(cherry picked from 69820a10e33e4582c192360996e866007114639d commit)
2006-12-06 23:24:23 +02:00
Keith Packard 59511974db Merge branch 'master' into randr-1.2 2006-10-24 17:26:20 -07:00
Alan Coopersmith 4c34224630 Merge branch 'XACE-modular' 2006-10-06 18:01:13 -07:00
Keith Packard b4659faf9b Merge branch 'master' into randr-1.2 2006-10-04 14:46:04 -07:00
Keith Packard 2be1ac15ae Remove smashing of CFLAGS from server build.
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
2006-09-18 12:11:18 -07: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
Aaron Plattner e6ae1612be Add fbHasVisualTypes and fbSetVisualTypesAndMasks to wfbrename.h and include -DXFree86Server. 2006-07-27 18:24:59 -07:00
Aaron Plattner 7608a63ff7 Build infrastructure for libwfb.so.
Builds fb/* twice, defining FB_ACCESS_WRAPPER for libwfb.la.  Define a macro,
FBPREFIX(X) which expands to fbX for libfb.la and wfbX for libwfb.la.  Use the
macro on [w]fbModuleData so the new module loads.
2006-07-26 15:48:50 -07:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -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
Tilman Sauerbeck 63f13e01ee Bug #7097: do case-insensitive comparison for some hotkeys.
xkb's strcasecmp implementation has been moved to the dix so it's now
safe to just use strcasecmp().
2006-07-08 11:33:44 +02:00
Eamon Walsh 8d9ccc90a5 Add XACE extension
(partially cherry picked from 8d4f21ab53 commit)
2006-06-19 16:35:03 -07:00
Greg Kroah-Hartman 96c19a3ec1 put function prototype for ShapeExtensionInit() in proper place
based on FIXME in mi/miinitext.c
2006-06-09 09:51:28 -07:00
Adam Jackson 52fc7c8dc7 Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
    now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
    ifdefs surrounding a call to a function added in XFree86 4.1 (!).
    Miscellaneous static markings.
2006-06-05 03:00:24 +00:00
Adam Jackson 07c731a2bc Bug #5089: Die, libbitmap, die! 2006-06-01 19:37:53 +00:00
Daniel Stone a317bf4822 Make DBE support conditional. (Enrico Wiegelt) 2006-05-17 15:00:18 +00:00
Adam Jackson 49abff7995 Coverity #818: Avoid memory leak on error path. 2006-04-07 01:26:33 +00:00
Adam Jackson 4ae1263669 Remove cfb16, no longer used. 2006-04-06 18:59:11 +00:00
Daniel Stone 5be8a66d32 Fix remnants of previous busted _XkbStrCaseCmp commit. 2006-03-27 22:28:32 +00:00
Daniel Stone 7257590651 Move XFree86 DDX XKB actions into dixmods. 2006-03-27 21:15:06 +00:00
Adam Jackson 9509c6799e dead file removal 2006-03-20 19:32:18 +00:00
Matthieu Herrb eb63e50d95 Fix build when AIGLX is false. 2006-03-12 17:14:03 +00:00
Kristian Høgsberg c3342c8000 Merge accel_indirect branch to HEAD. 2006-03-12 00:11:34 +00:00
Matthieu Herrb 448997ebcd Only output SetClientVersion message if verbosity > 1, like other
extensions do
2006-03-05 16:43:10 +00:00
Eric Anholt c845e152f5 Bug #5871: Drop special build infrastructure left over from libcwrapper
times. (George Fufutos)
2006-02-16 05:46:08 +00:00
Eric Anholt 1bbd5e49b1 Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
2006-02-16 04:59:45 +00:00
Alan Hourihane bb8c36690a Bump shadow module version number to 1.1.0 from 1.0.0 2006-02-14 04:20:37 +00:00
Eric Anholt c3d1403672 Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
Eric Anholt 3d1667278f Remove leftover variables for cfb24 build, and finish commenting out Xglx
standalone stuff, which some versions of automake get whiny about.
2006-01-28 00:37:52 +00:00
Adam Jackson 14fdd81614 Remove xf8_32wid, it's dead code with no maintainer interest. Also remove
cfb24, since xf8_32wid was the only user.
2006-01-25 23:05:26 +00:00
Adam Jackson 7e3cb9a09a Remove unused layer module. 2005-12-25 22:25:15 +00:00
Eric Anholt 2af7e94eab Adjust the rules for auto-generating some source files, so that they work
on both GNU make and FreeBSD's make.
2005-12-22 13:54:08 +00:00
Alan Coopersmith 26f9c43056 Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
    and cfb24 only need to be built on sparc
2005-12-03 17:04:45 +00:00
Kevin E Martin 7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Adam Jackson d3b6653a28 Bug #4824: Build XTrap support by default, matching monolith. 2005-11-19 03:53:04 +00:00
Kevin E Martin 0e7e4c7064 Fix typo to enable DGA support.
EXTMODULE is required to build DGA support into extmod.
2005-11-10 04:59:21 +00:00
Ian Romanick 0b150a05e6 Whitespace change just to make sure I created the branch correctly. 2005-11-03 17:12:53 +00:00
Kevin E Martin a311bfa73a Fix support for enabling/disabling extensions loaded from modules. 2005-11-02 15:53:57 +00:00
Adam Jackson 15f56b203d Move xf86XTrapModule.c to dixmods, guess at a build system. 2005-10-20 18:52:51 +00:00
Kristian Høgsberg dc6ac8e46f Add DGA configure option and add various files that we should be dist'ing.
Simplify xf86DefModeSet.c rule a bit.
2005-10-05 21:38:40 +00:00
Ian Romanick 940158a6f2 Replace all uses of __glEvalComputeK (and the doubly redundant
EvalComputeK) with calls to one of __glMap[12][df]_size. This was
    tested with progs/samples/eval (from Mesa).
2005-09-28 03:37:22 +00:00
Daniel Stone 6b0cdc5dd9 Change use of dix-config.h to xorg-config.h. 2005-08-26 16:46:41 +00:00
Søren Sandmann Pedersen d2952de6e3 Wed Aug 24 15:39:07 2005 Søren Sandmann <sandmann@redhat.com>
Add GLX_{INC,LIBS} for xprint.
Add @DIX_FLAGS@ to AM_CFLAGS
2005-08-24 19:41:43 +00:00
Søren Sandmann Pedersen 81e708440c Wed Aug 24 15:29:50 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally include dix-config.h
Conditionally include dix-config.h
2005-08-24 19:35:51 +00:00
Daniel Stone 825a95a1fa Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
Daniel Stone abab3fd628 Make Xext linkage srcdir != builddir safe. 2005-08-20 18:09:21 +00:00
Daniel Stone bb1d99ee72 Build libxkbstubs.la to stub XKB DDX functions (e.g. VT switches), and
build libxorggxkb.la from within the Xorg DDX to replace the previous
    xf86VT.o, et al, hacks.
2005-08-20 18:07:59 +00:00
Søren Sandmann Pedersen ad7f2fc673 symlink.sh: Temporarily disable xkbdata, add type1mod.c
Tue Aug 16 12:09:09 2005 Søren Sandmann <sandmann@redhat.com>
Add ft and type1 modules.
2005-08-16 16:21:09 +00:00
Søren Sandmann Pedersen a6c8d0d71e Mon Aug 15 15:41:26 2005 Søren Sandmann <sandmann@redhat.com>
Link this module with libXext.la.
Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
    override the symbols in libxkb.a. Add a comment on how this situation
    might not be considered ideal.
2005-08-15 19:42:48 +00:00
Søren Sandmann Pedersen 46aede552a Mon Aug 15 14:56:57 2005 Søren Sandmann <sandmann@redhat.com>
Remove the xkb* files.
Add xkbVT.o and friends as the last things on the link line so they will
    override the symbols in libxkb.a. Add a comment on how this situation
    might not be considered ideal.
2005-08-15 18:59:16 +00:00
Daniel Stone e3509c940f Don't link libXext, as it is linked in to the server also. 2005-08-14 16:24:30 +00:00
Kevin E Martin 86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Daniel Stone 4f2e731aba objdir != srcdir fixes. 2005-07-17 07:34:31 +00:00
Adam Jackson d69e9872ae Typo fix, and re-add GLcore to the dixmods build 2005-07-16 16:29:30 +00:00
Kevin E Martin 5f81eb1d89 Fix the *-config.h includes so that it is possible to build modules without
having to use -include in the Makefile.
2005-07-16 03:49:59 +00:00
Kevin E Martin 0635acab08 Add record module building support Change module building to not use
-include Fix xnest, dmx and vfb builds to -DXFree86Server for fbcmap
    compilation
2005-07-16 03:46:01 +00:00
Adam Jackson 0e352a8b2b disable GLcore momentarily until a build system exists. --enable-glx should
work now.
2005-07-15 21:59:39 +00:00
Adam Jackson 64bf3a81a3 loadable extmod build system. 2005-07-14 02:53:31 +00:00
Adam Jackson 6c96e0c9e4 loader support for extmod 2005-07-14 01:36:58 +00:00
Adam Jackson db8aa17f15 updated comment for libbitmap 2005-07-13 22:19:36 +00:00
Adam Jackson 40ad7321f5 Generate useful loadable modules by actually linking in the blobs from the
DIX
2005-07-13 21:52:51 +00:00
Adam Jackson 2b8e4db9ac -lXfont isn't enough for libbitmap, you need to get the -L from pkg-config 2005-07-08 20:27:30 +00:00
Daniel Stone c1e69798ad Add explicit PSZ defines, remove unnecessary dix-config.h include.
Add -DXF86PM, forgotten from last commit.
2005-07-03 12:15:16 +00:00
Daniel Stone 0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone 826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone 9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone 7ecc2d526c Remove fbcmap.c hacks from the DIX. 2005-07-01 21:12:24 +00:00
Daniel Stone 6251f9c00a Minor build system tweaks. 2005-07-01 21:11:16 +00:00
Daniel Stone ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00
Søren Sandmann Pedersen 9743adbe94 Add Type1 subdirectory to lib/Xfonts, update build system accordingly. 2005-06-16 20:50:12 +00:00
Daniel Stone 292c4cff26 Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
Roland Mainz 2137bc6eb9 xc/programs/Xserver/afb/afbbres.c
xc/programs/Xserver/afb/afbbresd.c
xc/programs/Xserver/afb/afbclip.c
xc/programs/Xserver/afb/afbhrzvert.c
xc/programs/Xserver/afb/afbline.c
xc/programs/Xserver/afb/afbmodule.c
xc/programs/Xserver/afb/afbpixmap.c
xc/programs/Xserver/afb/afbpolypnt.c
xc/programs/Xserver/afb/afbpushpxl.c
xc/programs/Xserver/afb/afbtegblt.c
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/cfballpriv.c
xc/programs/Xserver/cfb/cfbbitblt.c
xc/programs/Xserver/cfb/cfbcppl.c
xc/programs/Xserver/cfb/cfbgc.c
xc/programs/Xserver/cfb/cfbglblt8.c
xc/programs/Xserver/cfb/cfbmap.h
xc/programs/Xserver/cfb/cfbpixmap.c
xc/programs/Xserver/cfb/cfbscrinit.c
xc/programs/Xserver/cfb/cfbtab.h
xc/programs/Xserver/cfb/cfbteblt8.c
xc/programs/Xserver/cfb/cfbunmap.h
xc/programs/Xserver/mfb/maskbits.c
xc/programs/Xserver/mfb/maskbits.h
xc/programs/Xserver/mfb/mergerop.h
xc/programs/Xserver/mfb/mfb.h
xc/programs/Xserver/mfb/mfbclip.c
xc/programs/Xserver/mfb/mfbfont.c
xc/programs/Xserver/mfb/mfbgc.c
xc/programs/Xserver/mfb/mfbmisc.c
xc/programs/Xserver/mfb/mfbpushpxl.c
//bugs.freedesktop.org/show_bug.cgi?id=1114) attachment #667
    (https://bugs.freedesktop.org/attachment.cgi?id=667): Convert afb and
    cfb{,16,24,32} to be dlloader-friendly. Patch by Adam Jackson
    <ajax@freedesktop.org>.
2005-01-14 08:37:30 +00:00