diff options
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Xext/shmint.h | 44 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/fb/Imakefile | 5 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/fb/fboverlay.c | 4 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miscrinit.c | 3 |
4 files changed, 54 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shmint.h b/nx-X11/programs/Xserver/Xext/shmint.h new file mode 100644 index 000000000..5135d1729 --- /dev/null +++ b/nx-X11/programs/Xserver/Xext/shmint.h @@ -0,0 +1,44 @@ +/* + * $Id$ + * + * Copyright © 2003 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _SHMINT_H_ +#define _SHMINT_H_ + +#define _XSHM_SERVER_ +#include <X11/extensions/shmstr.h> + +#include "screenint.h" +#include "pixmap.h" +#include "gc.h" + +void +ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); + +void +ShmSetPixmapFormat(ScreenPtr pScreen, int format); + +void +ShmRegisterFbFuncs(ScreenPtr pScreen); + +#endif /* _SHMINT_H_ */ diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index e1dadfdf3..5daa10c6f 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -6,6 +6,9 @@ NULL = FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT #endif +#if HasShm +SHM_DEFINES = ShmDefines +#endif #if BuildRender RENDERSRC = fbcompose.c @@ -116,6 +119,8 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif +SpecialCObjectRule(fboverlay,$(ICONFIGFILES),$(SHM_DEFINES)) + #ifdef LinkDirectory LinkSourceFile(fb24_32.c,LinkDirectory) LinkSourceFile(fballpriv.c,LinkDirectory) diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c index 71a7f30d2..e51f922f5 100644 --- a/nx-X11/programs/Xserver/fb/fboverlay.c +++ b/nx-X11/programs/Xserver/fb/fboverlay.c @@ -32,6 +32,10 @@ #include "fb.h" #include "fboverlay.h" +#ifdef MITSHM +#include "shmint.h" +#endif + int fbOverlayGeneration; int fbOverlayScreenPrivateIndex = -1; diff --git a/nx-X11/programs/Xserver/mi/miscrinit.c b/nx-X11/programs/Xserver/mi/miscrinit.c index ceb51ab4c..ac782cf7d 100644 --- a/nx-X11/programs/Xserver/mi/miscrinit.c +++ b/nx-X11/programs/Xserver/mi/miscrinit.c @@ -39,8 +39,7 @@ from The Open Group. #include "dix.h" #include "miline.h" #ifdef MITSHM -#define _XSHM_SERVER_ -#include <X11/extensions/XShm.h> +#include "shmint.h" #endif /* We use this structure to propogate some information from miScreenInit to |