16d9da0886
Choose the display name used to connect to internal clients and exported into environment of processes started from the traymenu so that it uses a transport we know is working This should mean the server can start correctly with -multiwindow and/or -clipboard and any two of -nolisten inet6, -nolisten inet and -nolisten unix (the server will correctly refuse to start if all 3 are used, as it must be listening on at least one socket) v2: Place prototype for winGetDisplayName() in windisplay.h, and include it where needed. v3: Include xwin-config.h, so that _XSERVER64 is defined, just in case anything relies on that. v4: Replace grovelling around in the server's list of listeners with new Xtrans TransIsListening() interface, added in Xtrans 1.3.3 See also [1] [1] https://sourceware.org/bugzilla/show_bug.cgi?id=10725 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
215 lines
4.0 KiB
Makefile
215 lines
4.0 KiB
Makefile
bin_PROGRAMS = XWin
|
|
|
|
if XWIN_CLIPBOARD
|
|
SRCS_CLIPBOARD = \
|
|
winclipboardinit.c \
|
|
winclipboardtextconv.c \
|
|
winclipboardthread.c \
|
|
winclipboardwndproc.c \
|
|
winclipboardwrappers.c \
|
|
winclipboardxevents.c
|
|
DEFS_CLIPBOARD = -DXWIN_CLIPBOARD
|
|
endif
|
|
|
|
if XWIN_GLX_WINDOWS
|
|
GLX_DIR = glx
|
|
DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS
|
|
XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la
|
|
XWIN_GLX_SYS_LIBS = -lopengl32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOW
|
|
SRCS_MULTIWINDOW = \
|
|
winmultiwindowshape.c \
|
|
winmultiwindowwindow.c \
|
|
winmultiwindowwm.c \
|
|
winmultiwindowwndproc.c \
|
|
propertystore.h \
|
|
winSetAppUserModelID.c
|
|
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
|
|
MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOWEXTWM
|
|
SRCS_MULTIWINDOWEXTWM = \
|
|
winwin32rootless.c \
|
|
winwin32rootlesswindow.c \
|
|
winwin32rootlesswndproc.c \
|
|
winwindowswm.c
|
|
DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
|
|
MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
|
|
endif
|
|
|
|
if XWIN_NATIVEGDI
|
|
SRCS_NATIVEGDI = \
|
|
winclip.c \
|
|
winfillsp.c \
|
|
winfont.c \
|
|
wingc.c \
|
|
wingetsp.c \
|
|
winnativegdi.c \
|
|
winpixmap.c \
|
|
winpolyline.c \
|
|
winrop.c \
|
|
winsetsp.c
|
|
DEFS_NATIVEGDI = -DXWIN_NATIVEGDI
|
|
endif
|
|
|
|
if XWIN_PRIMARYFB
|
|
SRCS_PRIMARYFB = \
|
|
winpfbdd.c
|
|
DEFS_PRIMARYFB = -DXWIN_PRIMARYFB
|
|
endif
|
|
|
|
if XWIN_RANDR
|
|
SRCS_RANDR = \
|
|
winrandr.c
|
|
DEFS_RANDR = -DXWIN_RANDR
|
|
endif
|
|
|
|
if XWIN_XV
|
|
SRCS_XV = \
|
|
winvideo.c
|
|
DEFS_XV = -DXWIN_XV
|
|
endif
|
|
|
|
SRCS = InitInput.c \
|
|
InitOutput.c \
|
|
winallpriv.c \
|
|
winauth.c \
|
|
winblock.c \
|
|
wincmap.c \
|
|
winconfig.c \
|
|
wincreatewnd.c \
|
|
wincursor.c \
|
|
windialogs.c \
|
|
winengine.c \
|
|
winerror.c \
|
|
winglobals.c \
|
|
winkeybd.c \
|
|
winkeyhook.c \
|
|
winmisc.c \
|
|
winmonitors.c \
|
|
winmouse.c \
|
|
winmsg.c \
|
|
winmsgwindow.c \
|
|
winmultiwindowclass.c \
|
|
winmultiwindowicons.c \
|
|
winprefs.c \
|
|
winprefsyacc.y \
|
|
winprefslex.l \
|
|
winprocarg.c \
|
|
winscrinit.c \
|
|
winshaddd.c \
|
|
winshadddnl.c \
|
|
winshadgdi.c \
|
|
wintaskbar.c \
|
|
wintrayicon.c \
|
|
winvalargs.c \
|
|
winwakeup.c \
|
|
winwindow.c \
|
|
winwndproc.c \
|
|
ddraw.h \
|
|
winclipboard.h \
|
|
winconfig.h \
|
|
win.h \
|
|
winglobals.h \
|
|
winkeybd.h \
|
|
winkeynames.h \
|
|
winlayouts.h \
|
|
winmessages.h \
|
|
winmonitors.h \
|
|
winmsg.h \
|
|
winms.h \
|
|
winmultiwindowclass.h \
|
|
winmultiwindowicons.h \
|
|
winprefs.h \
|
|
winresource.h \
|
|
winwindow.h \
|
|
windisplay.c \
|
|
windisplay.h \
|
|
XWin.rc \
|
|
$(top_srcdir)/mi/miinitext.c \
|
|
$(SRCS_CLIPBOARD) \
|
|
$(SRCS_MULTIWINDOW) \
|
|
$(SRCS_MULTIWINDOWEXTWM) \
|
|
$(SRCS_NATIVEGDI) \
|
|
$(SRCS_PRIMARYFB) \
|
|
$(SRCS_RANDR) \
|
|
$(SRCS_XV)
|
|
|
|
DEFS = $(DEFS_CLIPBOARD) \
|
|
$(DEFS_GLX_WINDOWS) \
|
|
$(DEFS_MULTIWINDOW) \
|
|
$(DEFS_MULTIWINDOWEXTWM) \
|
|
$(DEFS_NATIVEGDI) \
|
|
$(DEFS_PRIMARYFB) \
|
|
$(DEFS_RANDR) \
|
|
$(DEFS_XV)
|
|
|
|
XWin_SOURCES = $(SRCS)
|
|
|
|
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
|
|
|
XWIN_SYS_LIBS += -ldxguid
|
|
|
|
XWIN_LIBS += \
|
|
$(top_builddir)/pseudoramiX/libPseudoramiX.la \
|
|
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
|
$(top_builddir)/Xi/libXistubs.la
|
|
|
|
XWin_DEPENDENCIES = \
|
|
$(MULTIWINDOWEXTWM_LIBS) \
|
|
$(XWIN_GLX_LIBS) \
|
|
$(XWIN_LIBS) \
|
|
$(XSERVER_LIBS)
|
|
|
|
XWin_LDADD = \
|
|
$(MULTIWINDOWEXTWM_LIBS) \
|
|
$(XWIN_GLX_LIBS) \
|
|
$(XWIN_LIBS) \
|
|
$(XSERVER_LIBS) \
|
|
$(XWIN_GLX_SYS_LIBS) \
|
|
$(XSERVER_SYS_LIBS) \
|
|
$(XWIN_SYS_LIBS) \
|
|
$(MULTIWINDOW_SYS_LIBS)
|
|
|
|
XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG)
|
|
|
|
|
|
.rc.o:
|
|
$(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
|
|
|
|
XWin.o: XWin.rc XWin.exe.manifest X.ico
|
|
|
|
winprefsyacc.h: winprefsyacc.c
|
|
winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h
|
|
|
|
BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
AM_YFLAGS = -d
|
|
AM_LFLAGS = -i
|
|
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
|
|
$(XWINMODULES_CFLAGS) \
|
|
-I$(top_srcdir) \
|
|
-Wno-bad-function-cast
|
|
|
|
xwinconfigdir = $(sysconfdir)/X11
|
|
xwinconfig_DATA = system.XWinrc
|
|
|
|
install-exec-hook:
|
|
(cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) XWin$(EXEEXT) X)
|
|
|
|
EXTRA_DIST = \
|
|
$(xwinconfig_DATA) \
|
|
X.ico \
|
|
XWin.rc \
|
|
XWin.exe.manifest
|
|
|
|
relink:
|
|
$(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT)
|
|
|
|
SUBDIRS = man $(GLX_DIR) .
|
|
DIST_SUBDIRS = man glx .
|