682ccac90b
Currently, WM_ENDSESSION just calls GiveUp() to set the DE_TERMINATE flag. But for the X server to exit cleanly, we also need the X server dispatch loop to be unblocked so it can notice that DE_TERMINATE has been set and exit, removing it's lock file and any unix domain socket. It appears that the system will terminate the process when the last UI thread in that process returns from processing WM_ENDSESSION for the last top-level window. Since WM_ENDSESSION appears to sent by the system via SendMessage() (synchronously) and the wndproc is called to process it in the message thread for that window (the X server thread), we can't easily terminate the X server dispatch loop from inside the WM_ENDSESSION message processing. So, create a messaging window, a hidden, top-level window, with a separate thread to catch this message, and process it by calling GiveUp() and then blocking on a mutex until the X server dispatch loop exits. Also, notice when this is a shutdown cancel WM_ENDSESSION message and take no action. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
196 lines
3.9 KiB
Makefile
196 lines
3.9 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_LINK_FLAGS = -lopengl32
|
|
endif
|
|
|
|
if XWIN_MULTIWINDOW
|
|
SRCS_MULTIWINDOW = \
|
|
winmultiwindowshape.c \
|
|
winmultiwindowwindow.c \
|
|
winmultiwindowwm.c \
|
|
winmultiwindowwndproc.c \
|
|
propertystore.h \
|
|
winSetAppUserModelID.c
|
|
DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
|
|
MULTIWINDOW_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 \
|
|
XWin.rc \
|
|
$(top_srcdir)/Xext/dpmsstubs.c \
|
|
$(top_srcdir)/Xi/stubs.c \
|
|
$(top_srcdir)/mi/miinitext.c \
|
|
$(top_srcdir)/fb/fbcmap_mi.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)
|
|
|
|
INCLUDES = -I$(top_srcdir)/miext/rootless
|
|
|
|
XWIN_SYS_LIBS += -ldxguid
|
|
|
|
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS)
|
|
XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
|
XWin_LDFLAGS = -mwindows -static
|
|
|
|
.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 .
|