Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
ebe00df3
Commit
ebe00df3
authored
Mar 04, 2015
by
Mike Gabriel
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
imake cleanup: Drop all references to XdmxServer and BuildXdmx*.
parent
b1fc73ad
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
8 additions
and
355 deletions
+8
-355
rules
debian/rules
+0
-2
README
nx-X11/config/cf/README
+0
-1
X11.tmpl
nx-X11/config/cf/X11.tmpl
+5
-60
host.def
nx-X11/config/cf/host.def
+0
-7
xf86site.def
nx-X11/config/cf/xf86site.def
+0
-6
xorgsite.def
nx-X11/config/cf/xorgsite.def
+0
-6
Imakefile
nx-X11/include/extensions/Imakefile
+1
-4
dmxext.h
nx-X11/include/extensions/dmxext.h
+0
-190
dmxproto.h
nx-X11/include/extensions/dmxproto.h
+0
-0
Imakefile
nx-X11/lib/X11/Imakefile
+1
-1
Imakefile
nx-X11/programs/Xserver/Imakefile
+1
-53
Imakefile
nx-X11/programs/Xserver/Xext/Imakefile
+0
-5
dmx.c
nx-X11/programs/Xserver/Xext/dmx.c
+0
-0
Imakefile
nx-X11/programs/Xserver/hw/Imakefile
+0
-18
nx-libs.spec
nx-libs.spec
+0
-2
No files found.
debian/rules
View file @
ebe00df3
...
@@ -59,8 +59,6 @@ override_dh_install:
...
@@ -59,8 +59,6 @@ override_dh_install:
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86dga1str.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xf86mscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxext.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/dmxproto.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/bigreqstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/xcmiscstr.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h
rm -R debian/tmp/usr/include/$(DEB_BUILD_MULTIARCH)/nx/X11/extensions/XIproto.h
...
...
nx-X11/config/cf/README
View file @
ebe00df3
...
@@ -465,7 +465,6 @@ The following variables are used by some part of the tree:
...
@@ -465,7 +465,6 @@ The following variables are used by some part of the tree:
HtmlDir path used by Web server for HTML and RX docs
HtmlDir path used by Web server for HTML and RX docs
CgiBinDir path used by Web server for CGI programs
CgiBinDir path used by Web server for CGI programs
ProxyManager ICE network ID to contact a running proxymngr
ProxyManager ICE network ID to contact a running proxymngr
XdmxServer build Distributed Multihead X server
Make Variables
Make Variables
...
...
nx-X11/config/cf/X11.tmpl
View file @
ebe00df3
...
@@ -138,18 +138,8 @@ XORGRELSTRING = XorgManVersionString
...
@@ -138,18 +138,8 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildDocs
#ifndef BuildDocs
#define BuildDocs !BuildServersOnly
#define BuildDocs !BuildServersOnly
#endif
#endif
#ifndef BuildDmx
#define BuildDmx NO
#endif
#ifndef XdmxServer
#define XdmxServer BuildDmx
#endif
#ifndef BuildLibrariesForDmx
#define BuildLibrariesForDmx XdmxServer
#endif
#ifndef BuildLibraries
#ifndef BuildLibraries
#define BuildLibraries (!BuildServersOnly || BuildClients || \
#define BuildLibraries (!BuildServersOnly || BuildClients)
BuildLibrariesForDmx)
#endif
#endif
#ifndef BuildLibrariesForXServers
#ifndef BuildLibrariesForXServers
#define BuildLibrariesForXServers BuildServer
#define BuildLibrariesForXServers BuildServer
...
@@ -362,8 +352,7 @@ XORGRELSTRING = XorgManVersionString
...
@@ -362,8 +352,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildXInputExt NO
#define BuildXInputExt NO
#endif
#endif
#ifndef BuildXInputLib
#ifndef BuildXInputLib
#define BuildXInputLib (BuildXInputExt && \
#define BuildXInputLib (BuildXInputExt && !BuildServersOnly)
(!BuildServersOnly || BuildLibrariesForDmx))
#endif
#endif
#ifndef BuildEVI
#ifndef BuildEVI
#define BuildEVI YES
#define BuildEVI YES
...
@@ -385,8 +374,7 @@ XORGRELSTRING = XorgManVersionString
...
@@ -385,8 +374,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildFontLib (BuildLibraries || BuildServer)
#define BuildFontLib (BuildLibraries || BuildServer)
#else
#else
#define BuildFontLib (BuildLibraries || \
#define BuildFontLib (BuildLibraries || \
(BuildServer && !DoLoadableServer) || \
(BuildServer && !DoLoadableServer) || XprtServer)
XprtServer || XdmxServer)
#endif
#endif
#endif
#endif
#ifndef BuildFontCache
#ifndef BuildFontCache
...
@@ -419,7 +407,6 @@ XORGRELSTRING = XorgManVersionString
...
@@ -419,7 +407,6 @@ XORGRELSTRING = XorgManVersionString
#endif
#endif
#ifndef BuildXKBlib
#ifndef BuildXKBlib
#define BuildXKBlib (BuildXKB && (!BuildServersOnly || \
#define BuildXKBlib (BuildXKB && (!BuildServersOnly || \
XdmxServer || \
BuildXkbcomp ))
BuildXkbcomp ))
#endif
#endif
#ifndef BuildXKBuilib
#ifndef BuildXKBuilib
...
@@ -459,13 +446,6 @@ XORGRELSTRING = XorgManVersionString
...
@@ -459,13 +446,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXineramaLibrary
#ifndef BuildXineramaLibrary
#define BuildXineramaLibrary (BuildXinerama)
#define BuildXineramaLibrary (BuildXinerama)
#endif
#endif
#ifndef BuildDmxDevelTools
#define BuildDmxDevelTools NO
#endif
#ifndef BuildDmxLibrary
#define BuildDmxLibrary (BuildDmx && \
(!BuildServersOnly || BuildDmxDevelTools))
#endif
#ifndef BuildXCSecurity
#ifndef BuildXCSecurity
#define BuildXCSecurity YES
#define BuildXCSecurity YES
#endif
#endif
...
@@ -550,8 +530,7 @@ XORGRELSTRING = XorgManVersionString
...
@@ -550,8 +530,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildXResExt NO
#define BuildXResExt NO
#endif
#endif
#ifndef BuildXResLibrary
#ifndef BuildXResLibrary
#define BuildXResLibrary (BuildXResExt && \
#define BuildXResLibrary (BuildXResExt && !BuildServersOnly)
(!BuildServersOnly || BuildDmxDevelTools))
#endif
#endif
#ifndef BuildXvExt
#ifndef BuildXvExt
#define BuildXvExt NO
#define BuildXvExt NO
...
@@ -616,7 +595,7 @@ XORGRELSTRING = XorgManVersionString
...
@@ -616,7 +595,7 @@ XORGRELSTRING = XorgManVersionString
#define BuildRender YES
#define BuildRender YES
#endif
#endif
#ifndef BuildRenderLibrary
#ifndef BuildRenderLibrary
#define BuildRenderLibrary
(XdmxServer || !BuildServersOnly)
#define BuildRenderLibrary
!BuildServersOnly
#endif
#endif
#ifndef BuildXftLibrary
#ifndef BuildXftLibrary
#define BuildXftLibrary BuildRenderLibrary
#define BuildXftLibrary BuildRenderLibrary
...
@@ -2516,30 +2495,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
...
@@ -2516,30 +2495,6 @@ SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedX
ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir)
#endif
#endif
#if BuildDmxLibrary
#ifndef SharedLibDmx
#define SharedLibDmx NO
#endif
#ifndef NormalLibDmx
#define NormalLibDmx YES
#endif
#ifndef DebugLibDmx
#define DebugLibDmx NO
#endif
#ifndef ProfileLibDmx
#define ProfileLibDmx NO
#endif
#else /* BuildDmxLibrary */
#undef SharedLibDmx
#define SharedLibDmx NO
#undef NormalLibDmx
#define NormalLibDmx NO
#undef DebugLibDmx
#define DebugLibDmx NO
#undef ProfileLibDmx
#define ProfileLibDmx NO
#endif /* BuildDmxLibrary */
XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
#if SharedLibXxf86rush
#if SharedLibXxf86rush
#ifndef SharedXxf86rushRev
#ifndef SharedXxf86rushRev
...
@@ -2592,16 +2547,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
...
@@ -2592,16 +2547,6 @@ SharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),SOXRESREV,SharedXResRev)
ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
ProjectUnsharedLibReferences(XRES,NX_XRes,$(XRESLIBSRC),XBuildLibDir)
#endif
#endif
DMXLIBSRC = $(LIBSRC)/dmx
#if SharedLibDmx
#ifndef SharedDmxRev
#define SharedDmxRev 1.0
#endif
SharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),SODMXREV,SharedDmxRev)
#else
ProjectUnsharedLibReferences(DMX,NX_dmx,$(DMXLIBSRC),XBuildLibDir)
#endif
DPSLIBSRC = $(LIBSRC)/dps
DPSLIBSRC = $(LIBSRC)/dps
#if SharedLibDps
#if SharedLibDps
#ifndef SharedDpsRev
#ifndef SharedDpsRev
...
...
nx-X11/config/cf/host.def
View file @
ebe00df3
...
@@ -76,13 +76,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
...
@@ -76,13 +76,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define XorgServer NO
#define XorgServer NO
/*
/*
* To enable building Xdmx, uncomment this.
*
#define XdmxServer YES
*/
#define XdmxServer NO
/*
* To disable building Xprt, uncomment this.
* To disable building Xprt, uncomment this.
*
*
#define XprtServer NO
#define XprtServer NO
...
...
nx-X11/config/cf/xf86site.def
View file @
ebe00df3
...
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
...
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
*/
/*
/*
* To enable building Xdmx, uncomment this.
*
#define XdmxServer YES
*/
/*
* To disable building Xprt, uncomment this.
* To disable building Xprt, uncomment this.
*
*
#define XprtServer NO
#define XprtServer NO
...
...
nx-X11/config/cf/xorgsite.def
View file @
ebe00df3
...
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
...
@@ -45,12 +45,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
*/
/*
/*
* To enable building Xdmx, uncomment this.
*
#define XdmxServer YES
*/
/*
* To disable building Xprt, uncomment this.
* To disable building Xprt, uncomment this.
*
*
#define XprtServer NO
#define XprtServer NO
...
...
nx-X11/include/extensions/Imakefile
View file @
ebe00df3
...
@@ -64,9 +64,6 @@ XRESHEADERS = XRes.h XResproto.h
...
@@ -64,9 +64,6 @@ XRESHEADERS = XRes.h XResproto.h
#if BuildXevie || BuildXevieLibrary
#if BuildXevie || BuildXevieLibrary
XEVIEHEADERS = Xevie.h Xeviestr.h
XEVIEHEADERS = Xevie.h Xeviestr.h
#endif
#endif
#if BuildDmx || BuildDmxLibrary
XDMXHEADERS = dmxext.h dmxproto.h
#endif
EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
$(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
$(XF86VIDMODEHEADERS) $(XF86DGAHEADERS) $(XINERAMAHEADERS) \
...
@@ -74,7 +71,7 @@ EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
...
@@ -74,7 +71,7 @@ EXTRAHEADERS = $(SCREENSAVERHEADERS) $(XF86MISCHEADERS) $(XF86BIGFONTHEADERS) \
$(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
$(FONTCACHEHEADERS) $(RENDERHEADERS) $(RANDRHEADERS) \
$(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \
$(XFIXESHEADERS) $(DAMAGEHEADERS) $(COMPOSITEHEADERS) \
$(XEVIEHEADERS) \
$(XEVIEHEADERS) \
$(XTRAPHEADERS) $(XRESHEADERS)
$(XDMXHEADERS)
$(XTRAPHEADERS) $(XRESHEADERS)
...
...
nx-X11/include/extensions/dmxext.h
deleted
100644 → 0
View file @
b1fc73ad
/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation on the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software,
* and to permit persons to whom the Software is furnished to do so,
* subject to the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/*
* Authors:
* Rickard E. (Rik) Faith <faith@redhat.com>
*
*/
/** \file
* This file describes the interface to the client-side libdmx.a
* library. All DMX-aware client-side applications should include this
* file. */
#ifndef _DMXEXT_H_
#define _DMXEXT_H_
/* These values must be larger than LastExtensionError.
The values in dmxext.h and dmxproto.h *MUST* match. */
#define DmxBadXinerama 1001
#define DmxBadValue 1002
#define DmxBadReply 1003
#define DMXScreenWindowWidth (1L<<0)
#define DMXScreenWindowHeight (1L<<1)
#define DMXScreenWindowXoffset (1L<<2)
#define DMXScreenWindowYoffset (1L<<3)
#define DMXRootWindowWidth (1L<<4)
#define DMXRootWindowHeight (1L<<5)
#define DMXRootWindowXoffset (1L<<6)
#define DMXRootWindowYoffset (1L<<7)
#define DMXRootWindowXorigin (1L<<8)
#define DMXRootWindowYorigin (1L<<9)
#define DMXDesktopWidth (1L<<0)
#define DMXDesktopHeight (1L<<1)
#define DMXDesktopShiftX (1L<<2)
#define DMXDesktopShiftY (1L<<3)
#define DMXInputType (1L<<0)
#define DMXInputPhysicalScreen (1L<<1)
#define DMXInputSendsCore (1L<<2)
#ifndef _DMX_SERVER_
/** Client-library screen information structure, returned by
* #DMXGetScreenAttributes. */
typedef
struct
{
char
*
displayName
;
int
logicalScreen
;
unsigned
int
screenWindowWidth
;
/* displayName's coordinate system */
unsigned
int
screenWindowHeight
;
/* displayName's coordinate system */
int
screenWindowXoffset
;
/* displayName's coordinate system */
int
screenWindowYoffset
;
/* displayName's coordinate system */
unsigned
int
rootWindowWidth
;
/* screenWindow's coordinate system */
unsigned
int
rootWindowHeight
;
/* screenWindow's coordinate system */
int
rootWindowXoffset
;
/* screenWindow's coordinate system */
int
rootWindowYoffset
;
/* screenWindow's coordinate system */
int
rootWindowXorigin
;
/* global coordinate system */
int
rootWindowYorigin
;
/* global coordinate system */
}
DMXScreenAttributes
;
/** Client-library window information structure, returned by
* #DMXGetWindowAttributes. */
typedef
struct
{
int
screen
;
Window
window
;
XRectangle
pos
,
vis
;
}
DMXWindowAttributes
;
/** Client-library desktop information structure, returned by
* #DMXGetDesktopAttributes. */
typedef
struct
{
unsigned
int
width
;
/* global coordinate system */
unsigned
int
height
;
/* global coordinate system */
int
shiftX
;
/* global coordinate system */
int
shiftY
;
/* global coordinate system */
}
DMXDesktopAttributes
;
/** Enumeration for the #inputType field in the #DMXInputAttributes
* structure. */
typedef
enum
{
DMXLocalInputType
,
DMXConsoleInputType
,
DMXBackendInputType
}
DMXInputEnum
;
/** Client-library input information structure, returned by
* #DMXGetInputAttributes. */
typedef
struct
{
DMXInputEnum
inputType
;
int
physicalScreen
;
int
physicalId
;
Bool
isCore
;
Bool
sendsCore
;
const
char
*
name
;
Bool
detached
;
}
DMXInputAttributes
;
_XFUNCPROTOBEGIN
extern
Bool
DMXQueryExtension
(
Display
*
dpy
,
int
*
event_basep
,
int
*
error_basep
);
extern
Bool
DMXQueryVersion
(
Display
*
dpy
,
int
*
major_version
,
int
*
minor_version
,
int
*
patch_version
);
extern
Bool
DMXSync
(
Display
*
dpy
);
extern
Bool
DMXForceWindowCreation
(
Display
*
dpy
,
Window
window
);
extern
Bool
DMXGetScreenCount
(
Display
*
dpy
,
int
*
screen_count
);
extern
Bool
DMXGetScreenAttributes
(
Display
*
dpy
,
int
screen
,
DMXScreenAttributes
*
attr
);
extern
int
DMXChangeScreensAttributes
(
Display
*
dpy
,
int
screen_count
,
int
*
screens
,
int
mask_count
,
unsigned
int
*
masks
,
DMXScreenAttributes
*
attr
,
/* vector */
int
*
error_screen
);
extern
Bool
DMXAddScreen
(
Display
*
dpy
,
const
char
*
displayName
,
unsigned
int
mask
,
DMXScreenAttributes
*
attr
,
int
*
screen
);
extern
Bool
DMXRemoveScreen
(
Display
*
dpy
,
int
screen
);
/* Call DMXGetScreenWindowCount and allocate info to that size. Pass
* the size in available_count. This call can generate a large amount
* of wire traffic and should not be used called with available_count=0
* just to determine the screen_count value -- use DMXGetScreenCount
* instead. NOTE: Also see DMX protocol specification (DMXSpec.txt) for
* usage of DMXSync to flush pending commands. */
extern
Bool
DMXGetWindowAttributes
(
Display
*
dpy
,
Window
window
,
int
*
screen_count
,
int
available_count
,
DMXWindowAttributes
*
attr
);
extern
Bool
DMXGetDesktopAttributes
(
Display
*
dpy
,
DMXDesktopAttributes
*
attr
);
extern
int
DMXChangeDesktopAttributes
(
Display
*
dpy
,
unsigned
int
mask
,
DMXDesktopAttributes
*
attr
);
extern
Bool
DMXGetInputCount
(
Display
*
dpy
,
int
*
input_count
);
extern
Bool
DMXGetInputAttributes
(
Display
*
dpy
,
int
id
,
DMXInputAttributes
*
attr
);
extern
Bool
DMXAddInput
(
Display
*
dpy
,
unsigned
int
mask
,
DMXInputAttributes
*
attr
,
int
*
id
);
extern
Bool
DMXRemoveInput
(
Display
*
dpy
,
int
id
);
/* These are helper functions that call DMXAddInput. */
extern
Bool
DMXAddBackendInput
(
Display
*
dpy
,
int
screen
,
int
sendsCore
,
int
*
newId
);
extern
Bool
DMXAddConsoleInput
(
Display
*
dpy
,
const
char
*
name
,
int
sendsCore
,
int
*
newId
);
_XFUNCPROTOEND
#endif
#endif
nx-X11/include/extensions/dmxproto.h
deleted
100644 → 0
View file @
b1fc73ad
This diff is collapsed.
Click to expand it.
nx-X11/lib/X11/Imakefile
View file @
ebe00df3
...
@@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
...
@@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h
Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h
#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !
XdmxServer && !
NXAgentServer
#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !NXAgentServer
all::
all::
BuildIncludes($(HEADERS),IncSubdir,..)
BuildIncludes($(HEADERS),IncSubdir,..)
...
...
nx-X11/programs/Xserver/Imakefile
View file @
ebe00df3
...
@@ -542,9 +542,6 @@ XF86SERVER = XFree86
...
@@ -542,9 +542,6 @@ XF86SERVER = XFree86
#if defined(XorgServer) && XorgServer
#if defined(XorgServer) && XorgServer
XF86SERVER = Xorg
XF86SERVER = Xorg
#endif
#endif
#if XdmxServer
XDMX = Xdmx
#endif
#if defined(NXAgentServer) && NXAgentServer
#if defined(NXAgentServer) && NXAgentServer
NXAGENT = nxagent
NXAGENT = nxagent
#endif
#endif
...
@@ -554,7 +551,6 @@ NXWIN = NXWin
...
@@ -554,7 +551,6 @@ NXWIN = NXWin
#if (defined(XF86Server) && XF86Server) || \
#if (defined(XF86Server) && XF86Server) || \
(defined(XorgServer) && XorgServer) || \
(defined(XorgServer) && XorgServer) || \
(defined(NXAgentServer) && NXAgentServer) || \
(defined(NXAgentServer) && NXAgentServer) || \
(defined(XdmxServer) && XdmxServer) || \
(!MakeDllModules && defined(NXWinServer) && NXWinServer)
(!MakeDllModules && defined(NXWinServer) && NXWinServer)
MakeMutex($(XF86SERVER) $(NXAGENT) $(NXWIN))
MakeMutex($(XF86SERVER) $(NXAGENT) $(NXWIN))
#endif
#endif
...
@@ -1050,54 +1046,6 @@ Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)
...
@@ -1050,54 +1046,6 @@ Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)
#endif /* XnonServer */
#endif /* XnonServer */
#if defined(XdmxServer) && XdmxServer
XCOMM
XCOMM distribued multihead Server
XCOMM
#ifndef Win32Architecture
XDMXDDXDIR = hw/dmx
#else
XDMXDDXDIR = hw
#endif
FBDIR = fb
FBSUBDIR = fb
MIDAMAGEDIR = miext/damage
SHADOWDIR = miext/shadow
XDMXDIRS = $(STDDIRS) $(XDMXDDXDIR) $(SHADOWDIR) $(DEPDIRS) $(FBDIR) $(MIDAMAGEDIR)
#if BuildGlxExt
#if BuildXinerama
GLXPROXY_EXTRAOBJS = hw/dmx/panoramiX.o
#endif
GLXPROXYLIB = hw/dmx/glxProxy/LibraryTargetName(glxProxy)
#endif
#if !defined(LynxOSArchitecture) && \
!defined(Win32Architecture) && \
!defined(QNX4Architecture)
XDMXOBJS = hw/dmx/miinitext.o $(GLXPROXY_EXTRAOBJS)
#else
XDMXOBJS = hw/dmx/miinitext.o $(GLXPROXY_EXTRAOBJS) dix/main.o
#endif
XDMX = hw/dmx/LibraryTargetName(dmx) \
hw/dmx/input/LibraryTargetName(dmxinput) \
hw/dmx/config/LibraryTargetName(dmxconfig) \
$(GLXPROXYLIB)
XDMXLIBS = PreFbLibs $(XDMX) MiExtLibs FbPostFbLibs $(XDMX)
#if BuildRender
XDMXRENDERLIB = $(XRENDERLIB)
#endif
XDMXSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XILIB) $(XLIB) $(SYSLIBS) $(XMULIB) $(XDMXRENDERLIB)
#if HasParallelMake
MakeMutex($(XDMXDIRS) $(XDMXOBJS) $(XDMXLIBS) $(XDMXSYSLIBS))
#endif
#if ForceServerRemake
$(XDMXOBJS) $(XDMXLIBS) $(XDMXSYSLIBS):: $(XDMXDIRS)
@if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi
#endif
ServerTarget(Xdmx,$(XDMXDIRS),$(XDMXOBJS), \
$(LIBCWRAPPER) $(XDMXLIBS) $(LOADABLEEXTS),$(XDMXSYSLIBS))
#endif /* XdmxServer */
#if defined(NXWinServer) && NXWinServer
#if defined(NXWinServer) && NXWinServer
XCOMM
XCOMM
XCOMM X Server for MS Windows
XCOMM X Server for MS Windows
...
@@ -1372,7 +1320,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
...
@@ -1372,7 +1320,7 @@ MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) $(MIDAMAGEDIR)
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
$(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \
$(HPDDXDIR) $(XFREE86DDXDIR) $(DARWINDDXDIR) \
$(
XDMXDDXDIR) $(
NXAGENTDDXDIR) $(NXWINDDXDIR)
$(NXAGENTDDXDIR) $(NXWINDDXDIR)
SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \
SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \
$(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \
$(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \
$(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
$(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
...
...
nx-X11/programs/Xserver/Xext/Imakefile
View file @
ebe00df3
...
@@ -113,11 +113,6 @@ XF86BIGFOBJS = xf86bigfont.o
...
@@ -113,11 +113,6 @@ XF86BIGFOBJS = xf86bigfont.o
PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
#endif
#endif
#if XdmxServer
DMXSRCS = dmx.c
DMXOBJS = dmx.o
DMXINCLUDES = -I../hw/dmx
#endif
#if BuildDPMS
#if BuildDPMS
DPMSSRCS = dpms.c
DPMSSRCS = dpms.c
DPMSOBJS = dpms.o
DPMSOBJS = dpms.o
...
...
nx-X11/programs/Xserver/Xext/dmx.c
deleted
100644 → 0
View file @
b1fc73ad
This diff is collapsed.
Click to expand it.
nx-X11/programs/Xserver/hw/Imakefile
deleted
100644 → 0
View file @
b1fc73ad
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:20 cpqbld Exp $
XCOMM This is only used on NT where we do not know how to jump over this dir
#ifdef Win32Architecture
#define IHaveSubdirs
#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)"
#if XdmxServer
XDMXDIR = dmx
#endif
SUBDIRS= $(XDMXDIR)
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
nx-libs.spec
View file @
ebe00df3
...
@@ -952,7 +952,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
...
@@ -952,7 +952,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/Xevie.h
%{_includedir}/nx/X11/extensions/Xevie.h
%{_includedir}/nx/X11/extensions/Xinerama.h
%{_includedir}/nx/X11/extensions/Xinerama.h
%{_includedir}/nx/X11/extensions/Xrandr.h
%{_includedir}/nx/X11/extensions/Xrandr.h
%{_includedir}/nx/X11/extensions/dmxext.h
%{_includedir}/nx/X11/extensions/lbxbuf.h
%{_includedir}/nx/X11/extensions/lbxbuf.h
%{_includedir}/nx/X11/extensions/lbxbufstr.h
%{_includedir}/nx/X11/extensions/lbxbufstr.h
%{_includedir}/nx/X11/extensions/lbxdeltastr.h
%{_includedir}/nx/X11/extensions/lbxdeltastr.h
...
@@ -1017,7 +1016,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
...
@@ -1017,7 +1016,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/compositeproto.h
%{_includedir}/nx/X11/extensions/compositeproto.h
%{_includedir}/nx/X11/extensions/damageproto.h
%{_includedir}/nx/X11/extensions/damageproto.h
%{_includedir}/nx/X11/extensions/damagewire.h
%{_includedir}/nx/X11/extensions/damagewire.h
%{_includedir}/nx/X11/extensions/dmxproto.h
%{_includedir}/nx/X11/extensions/panoramiXproto.h
%{_includedir}/nx/X11/extensions/panoramiXproto.h
%{_includedir}/nx/X11/extensions/randr.h
%{_includedir}/nx/X11/extensions/randr.h
%{_includedir}/nx/X11/extensions/randrproto.h
%{_includedir}/nx/X11/extensions/randrproto.h
...
...
dimbor
@dimbor
mentioned in commit
d97b0ca9
·
Jan 26, 2018
mentioned in commit
d97b0ca9
mentioned in commit d97b0ca93ca5023ddffbb23f8c57a4622816019e
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment