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
fa47910045
Clean up many #if 0.
2007-12-02 12:40:25 -05:00
5b0dfb73ca
devPrivates rework: put back a comment that was mistakenly removed
...
during merge conflict resolution.
2007-11-19 21:01:22 -05:00
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
f797c96845
Save pixmap allocation hints into the PixmapRec.
2007-11-15 12:21:25 -08:00
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
ca75261bee
cfb: Remove usage of alloca
...
Replace with xalloc/xfree.
2007-11-05 14:34:45 +00:00
f2e310132f
Add CreatePixmap allocation hints.
...
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
2007-11-04 16:11:28 -08:00
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
e4d11e58ce
Remove the PaintWindow optimization.
...
This was an attempt to avoid scratch gc creation and validation for paintwin
because that was expensive. This is not the case in current servers, and the
danger of failure to implement it correctly (as seen in all previous
implementations) is high enough to justify removing it. No performance
difference detected with x11perf -create -move -resize -circulate on Xvfb.
Leave the screen hooks for PaintWindow* in for now to avoid ABI change.
2007-09-13 00:08:53 +00:00
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
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
ae7f71a8b3
Implement core protocol backing store exclusively in terms of Composite.
...
Composite's automatic redirection is a more general mechanism than the
ad-hoc BS machinery, so it's much prettier to implement the one in terms
of the other. Composite now wraps ChangeWindowAttributes and activates
automatic redirection for windows with backing store requested. The old
backing store infrastructure is completely gutted: ABI-visible structures
retain the function pointers, but they never get called, and all the
open-coded conditionals throughout the DIX layer to implement BS are gone.
Note that this is still not a strictly complete implementation of backing
store, since Composite will throw the bits away on unmap and therefore
WhenMapped and Always hints are equivalent.
2007-08-25 15:08:20 -04:00
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
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
5ad562565a
devPrivates rework: properly free devPrivates on compatibility structures,
...
type pixmap. Requires ddx'es to call the free function from DestroyPixmap.
2007-04-05 14:18:05 -04:00
a7cd53deb9
remove PIXPRIV checks as this flag is always set.
2007-03-06 17:05:03 -05:00
2dfd1aab24
Always include compiler.h in cfbmskbits.h instead of checking #ifdef XFREE86
2007-01-17 14:39:28 -08:00
df979b75c8
StorePixels() macro could create invalid *x++=*x... code - fixed.
2006-10-17 17:06:44 +02:00
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
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
291e89d4f2
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
2006-04-30 19:16:14 +00:00
61a020265c
Bug #5549 : Fix build for sparc64. (Matthieu Herrb)
2006-03-20 18:43:18 +00:00
4335868476
Fix build with non GNU make.
2006-03-05 16:13:21 +00:00
1a4f20541a
Fix linux build without libc wrappers (From Fredrik Höglund)
2006-02-13 04:56:27 +00:00
d6337c8324
<sys/limits.h> -> <limits.h> so we can compile on non-BSD OS'es
2006-02-11 17:42:31 +00:00
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
7fc9bc44e0
Compile fix, again, stupid non-clean builds
2006-01-07 01:29:05 +00:00
7f46aba35e
Compile fix
2006-01-06 23:52:23 +00:00
13c9e0c094
Bug #5525 : Build a working Xprt. (Drew Parsons)
2006-01-06 23:06:15 +00:00
7c00afd0ec
Define XFree86Server only where it is required.
2005-12-02 06:02:45 +00:00
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
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
00bd8968b2
Bug #4257 : Move cfbcmap.c to cfb_common_sources.
2005-09-21 00:24:10 +00:00
c3d6799cee
Bug #594 : CAN-2005-2495: Fix exploitable integer overflow in pixmap
...
creation, where we could create a far smaller pixmap than we thought,
allowing changes to arbitrary chunks of memory. (Søren Sandmann
Pedersen)
2005-09-13 01:33:19 +00:00
825a95a1fa
Remove use of dix-config and xorg-config.h from public headers.
2005-08-24 11:18:35 +00:00
8f6664fcff
Add these files to the sdk:
...
cbf32.h cfb16.h cfbmap.h cfbunmap.h cfbunmap.h cfbmskbits.h xf86sbusBus.h
mifillarch.h mispans.h
2005-07-26 23:40:45 +00:00
0bb669638f
Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
2005-07-03 08:53:54 +00:00
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
826a6f029f
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
2005-07-02 18:59:44 +00:00
9b1debcdb6
Change all misc.h and os.h references to <X11/foo.h>.
2005-07-01 22:43:43 +00:00
a822df1cc1
Adding initial build system.
2005-07-01 20:49:35 +00:00
ded56b1a74
Adding initial build system.
2005-07-01 20:29:53 +00:00
07bd7df6a6
Bug #3069 : Drop the BuildLowMem hack, it doesn't compile and isn't useful.
2005-04-22 20:49:50 +00:00
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
504067819a
Bug #3025 : gcc4 build fix.
2005-04-14 17:51:51 +00:00
36dcc9bb1d
Fix build on stock Mac OS X: Out of the box, Mac OS X does not include
...
Freetype2, Expat, or PNG. Also global variables should be initalized in
the Xserver.
2005-03-17 01:12:07 +00:00
cbcdae5a3f
more static server build fixes
2005-01-17 17:17:45 +00:00
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
46472cbee6
xc/config/cf/sun.cf
...
xc/config/cf/sv4Lib.rules
xc/programs/Xserver/Imakefile
xc/programs/Xserver/hw/xfree86/os-support/sunos/find_deps.pl Make Solaris
builds work when using MakeDllModules (it's not the default yet, but at
least it works now if you turn it on) Also improve default compiler,
optimizer, & linker flags for Solaris builds using either Sun cc or gcc
xc/programs/Xserver/cfb/Imakefile.inc
xc/programs/Xserver/cfb/stipsparc.s
xc/programs/Xserver/cfb/stipsprc32.s Remove text relocation error when
building shared versions
2004-04-26 02:39:58 +00:00
Eamon Walsh
Adam Jackson
Aaron Plattner
Daniel Stone
Eric Anholt
Adam Jackson
Alan Coopersmith
Matthias Hopf
Adam Jackson
Adam Jackson
Matthieu Herrb
Benjamin Herrenschmidt
Eric Anholt
Kevin E Martin
Kristian Høgsberg
Søren Sandmann Pedersen
Torrey Lyons
Roland Mainz