summaryrefslogtreecommitdiff
path: root/xserver/hw/xnest
diff options
context:
space:
mode:
Diffstat (limited to 'xserver/hw/xnest')
-rw-r--r--xserver/hw/xnest/Init.c7
-rw-r--r--xserver/hw/xnest/Makefile.am6
-rw-r--r--xserver/hw/xnest/Makefile.in23
-rw-r--r--xserver/hw/xnest/Screen.c2
-rw-r--r--xserver/hw/xnest/man/Makefile.in56
-rw-r--r--xserver/hw/xnest/man/Xnest.man22
6 files changed, 66 insertions, 50 deletions
diff --git a/xserver/hw/xnest/Init.c b/xserver/hw/xnest/Init.c
index e8a700e88..b45685216 100644
--- a/xserver/hw/xnest/Init.c
+++ b/xserver/hw/xnest/Init.c
@@ -47,6 +47,13 @@ is" without express or implied warranty.
Bool xnestDoFullGeneration = True;
+#ifdef GLXEXT
+void
+GlxExtensionInit(void)
+{
+}
+#endif
+
void
InitOutput(ScreenInfo * screen_info, int argc, char *argv[])
{
diff --git a/xserver/hw/xnest/Makefile.am b/xserver/hw/xnest/Makefile.am
index eb550c0f7..c77da6412 100644
--- a/xserver/hw/xnest/Makefile.am
+++ b/xserver/hw/xnest/Makefile.am
@@ -45,7 +45,6 @@ SRCS = Args.c \
XNEST_LIBS = \
@XNEST_LIBS@ \
- $(top_builddir)/Xext/libXextdpmsstubs.la \
$(top_builddir)/Xi/libXistubs.la
Xnest_SOURCES = $(SRCS)
@@ -57,10 +56,5 @@ Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
EXTRA_DIST = icon \
screensaver
-# -UDPMSExtension for miinitext? can't put into
-# OS_DEFINES???
-# EXT_DEFINES???
-# ICONFIGFILES -- SpecialCObjectRule
-
relink:
$(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)
diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in
index 23e9c87c2..b120181ed 100644
--- a/xserver/hw/xnest/Makefile.in
+++ b/xserver/hw/xnest/Makefile.in
@@ -69,7 +69,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
- $(top_builddir)/include/kdrive-config.h \
+ $(top_builddir)/include/xwayland-config.h \
$(top_builddir)/include/version-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -83,8 +83,7 @@ am__objects_1 = Args.$(OBJEXT) Color.$(OBJEXT) Cursor.$(OBJEXT) \
miinitext.$(OBJEXT)
am_Xnest_OBJECTS = $(am__objects_1)
Xnest_OBJECTS = $(am_Xnest_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/Xext/libXextdpmsstubs.la \
- $(top_builddir)/Xi/libXistubs.la
+am__DEPENDENCIES_1 = $(top_builddir)/Xi/libXistubs.la
am__DEPENDENCIES_2 =
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -358,6 +357,7 @@ RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -376,15 +376,18 @@ SYSCONFDIR = @SYSCONFDIR@
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -392,6 +395,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
WINDRES = @WINDRES@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -420,7 +425,6 @@ XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
XNEST_LIBS = \
@XNEST_LIBS@ \
- $(top_builddir)/Xext/libXextdpmsstubs.la \
$(top_builddir)/Xi/libXistubs.la
XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
@@ -467,8 +471,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
abi_videodrv = @abi_videodrv@
@@ -1041,11 +1043,6 @@ uninstall-am: uninstall-binPROGRAMS
uninstall uninstall-am uninstall-binPROGRAMS
-# -UDPMSExtension for miinitext? can't put into
-# OS_DEFINES???
-# EXT_DEFINES???
-# ICONFIGFILES -- SpecialCObjectRule
-
relink:
$(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT)
diff --git a/xserver/hw/xnest/Screen.c b/xserver/hw/xnest/Screen.c
index 214b55015..30c6a4623 100644
--- a/xserver/hw/xnest/Screen.c
+++ b/xserver/hw/xnest/Screen.c
@@ -248,7 +248,7 @@ xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
pScreen->whitePixel = xnestWhitePixel;
pScreen->blackPixel = xnestBlackPixel;
/* GCperDepth */
- /* PixmapPerDepth */
+ /* defaultStipple */
pScreen->devPrivate = NULL;
/* WindowPrivateLen */
/* WindowPrivateSizes */
diff --git a/xserver/hw/xnest/man/Makefile.in b/xserver/hw/xnest/man/Makefile.in
index 6f92ab520..520a1ea52 100644
--- a/xserver/hw/xnest/man/Makefile.in
+++ b/xserver/hw/xnest/man/Makefile.in
@@ -68,7 +68,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
- $(top_builddir)/include/kdrive-config.h \
+ $(top_builddir)/include/xwayland-config.h \
$(top_builddir)/include/version-config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -263,22 +263,36 @@ MAIN_LIB = @MAIN_LIB@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
+# xorg-macros.m4 has these bracketed by double underscores, but meson
+# wants ats.
+
# Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS
# 's|/,|/, |g' will add a space to help font path formatting
-MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__logdir__|$(logdir)|g' -e \
- 's|__datadir__|$(datadir)|g' -e 's|__mandir__|$(mandir)|g' -e \
- 's|__sysconfdir__|$(sysconfdir)|g' -e \
- 's|__xconfigdir__|$(__XCONFIGDIR__)|g' -e \
- 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' -e \
- 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' -e \
- 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' -e \
- 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' -e \
- 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' -e \
- 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' -e \
- 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' -e \
- 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' -e \
- 's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' -e \
- 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' -e \
+MAN_SUBSTS = @MAN_SUBSTS@ -e 's|@vendorversion@|"$(PACKAGE_STRING)" \
+ "$(XORG_MAN_PAGE)"|' -e 's|@xorgversion@|"$(PACKAGE_STRING)" \
+ "$(XORG_MAN_PAGE)"|' -e 's|@xservername@|Xorg|g' -e \
+ 's|@xconfigfile@|xorg.conf|g' -e 's|@projectroot@|$(prefix)|g' \
+ -e 's|@apploaddir@|$(appdefaultdir)|g' -e \
+ 's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' -e \
+ 's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' -e \
+ 's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' -e \
+ 's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' -e \
+ 's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' -e \
+ 's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g' -e \
+ 's|[@]logdir[@]|$(logdir)|g' -e 's|[@]datadir[@]|$(datadir)|g' \
+ -e 's|[@]mandir[@]|$(mandir)|g' -e \
+ 's|[@]sysconfdir[@]|$(sysconfdir)|g' -e \
+ 's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' -e \
+ 's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' -e \
+ 's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' -e \
+ 's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' -e \
+ 's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' -e \
+ 's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' -e \
+ 's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' -e \
+ 's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' -e \
+ 's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' -e \
+ 's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' -e \
+ 's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' -e \
'\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g'
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -322,6 +336,7 @@ RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
SED = @SED@
SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -340,15 +355,18 @@ SYSCONFDIR = @SYSCONFDIR@
SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
UDEV_CFLAGS = @UDEV_CFLAGS@
UDEV_LIBS = @UDEV_LIBS@
UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -356,6 +374,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
WINDRES = @WINDRES@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
XDMCP_LIBS = @XDMCP_LIBS@
XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -427,8 +447,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
YACC = @YACC@
YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
abi_ansic = @abi_ansic@
abi_extension = @abi_extension@
abi_videodrv = @abi_videodrv@
diff --git a/xserver/hw/xnest/man/Xnest.man b/xserver/hw/xnest/man/Xnest.man
index 024d88e82..e287b8e9c 100644
--- a/xserver/hw/xnest/man/Xnest.man
+++ b/xserver/hw/xnest/man/Xnest.man
@@ -27,7 +27,7 @@
.\"
.\" $XFree86: xc/programs/Xserver/hw/xnest/Xnest.man,v 1.6 2001/01/27 18:21:00 dawes Exp $
.\"
-.TH Xnest __appmansuffix__ __xorgversion__
+.TH Xnest @appmansuffix@ @xorgversion@
.SH NAME
Xnest \- a nested X server
.SH SYNOPSIS
@@ -52,7 +52,7 @@ appears to be a conventional server.
.B Xnest
supports all standard options of the sample server implementation.
For more details, please see
-.BR Xserver (__appmansuffix__).
+.BR Xserver (@appmansuffix@).
The following additional arguments are supported as well.
.TP
.BI "\-display " string
@@ -113,7 +113,7 @@ The class of the default visual of the nested server need not be the same as the
class of the default visual of the real server, but it must be supported by the
real server.
Use
-.BR xdpyinfo (__appmansuffix__)
+.BR xdpyinfo (@appmansuffix@)
to obtain a list of supported visual classes on the real server before starting
.BR Xnest .
If the user chooses a static class, all the colors in the default color map will
@@ -127,7 +127,7 @@ The depth of the default visual of the nested server need not be the same as the
depth of the default visual of the real server, but it must be supported by the
real server.
Use
-.BR xdpyinfo (__appmansuffix__)
+.BR xdpyinfo (@appmansuffix@)
to obtain a list of supported visual depths on the real server before starting
.BR Xnest .
.TP
@@ -149,7 +149,7 @@ This option specifies the geometry parameters for the top-level
.B Xnest
window.
See \(lqGEOMETRY SPECIFICATIONS\(rq in
-.BR X (__miscmansuffix__)
+.BR X (@miscmansuffix@)
for a discusson of this option's syntax.
This window corresponds to the root window of the nested server.
The width
@@ -200,7 +200,7 @@ specification.
For example,
.B xterm \-display :1.1
will open an
-.BR xterm (__appmansuffix__)
+.BR xterm (@appmansuffix@)
client in the nested server with the display number
.B :1
on the second screen.
@@ -249,7 +249,7 @@ as the root window instead of creating a window.
Starting up
.B Xnest
is just as simple as starting up
-.BR xclock (__appmansuffix__)
+.BR xclock (@appmansuffix@)
from a terminal emulator.
If a user wishes to run
.B Xnest
@@ -385,7 +385,7 @@ file system which makes the two font paths mutually incompatible.
Thus, if there is a font in the local font path of the nested server, there is
no guarantee that this font exists in the remote font path of the real server.
The
-.BR xlsfonts (__appmansuffix__)
+.BR xlsfonts (@appmansuffix@)
client, if run on the nested server, will list fonts in the local font path and,
if run on the real server, will list fonts in the remote font path.
Before a font can be successfully opened by the nested server, it has to exist
@@ -423,6 +423,6 @@ Probably has some memory leaks.
.SH AUTHOR
Davor Matic, MIT X Consortium
.SH "SEE ALSO"
-.BR Xserver (__appmansuffix__),
-.BR xdpyinfo (__appmansuffix__),
-.BR X (__miscmansuffix__)
+.BR Xserver (@appmansuffix@),
+.BR xdpyinfo (@appmansuffix@),
+.BR X (@miscmansuffix@)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 19:23:19 +0000