d8ec33fe05
The big change here is MakeCurrent and context tag tracking. We now delegate context tags entirely to the vnd layer, and simply store a pointer to the context state as the tag data. If a context is deleted while it's current, we allocate a fake ID for the context and move the context state there, so the tag data still points to a real context. As a result we can stop trying so hard to detach the client from contexts at disconnect time and just let resource destruction handle it. Since vnd handles all the MakeCurrent protocol now, our request handlers for it can just be return BadImplementation. We also remove a bunch of LEGAL_NEW_RESOURCE, because now by the time we're called vnd has already allocated its tracking resource on that XID. v2: Update to match v2 of the vnd import, and remove more redundant work like request length checks. v3: Add/remove the XID map from the vendor private thunk, not the backend. (Kyle Brenneman) v4: Fix deletion of ghost contexts (Kyle Brenneman) Signed-off-by: Adam Jackson <ajax@redhat.com>
108 lines
3.7 KiB
Makefile
108 lines
3.7 KiB
Makefile
bin_PROGRAMS = Xwayland
|
|
|
|
Xwayland_CFLAGS = \
|
|
-I$(top_srcdir)/glamor \
|
|
-I$(top_srcdir)/dri3 \
|
|
-DHAVE_DIX_CONFIG_H \
|
|
$(XWAYLANDMODULES_CFLAGS) \
|
|
$(DIX_CFLAGS) \
|
|
$(GLAMOR_CFLAGS) \
|
|
$(GBM_CFLAGS)
|
|
|
|
Xwayland_SOURCES = \
|
|
xwayland.c \
|
|
xwayland-input.c \
|
|
xwayland-cursor.c \
|
|
xwayland-shm.c \
|
|
xwayland-output.c \
|
|
xwayland-cvt.c \
|
|
xwayland-vidmode.c \
|
|
xwayland.h \
|
|
$(top_srcdir)/Xi/stubs.c \
|
|
$(top_srcdir)/mi/miinitext.c
|
|
|
|
Xwayland_LDADD = \
|
|
$(glamor_lib) \
|
|
$(XWAYLAND_LIBS) \
|
|
$(top_builddir)/glx/libglxvnd.la \
|
|
$(XWAYLAND_SYS_LIBS) \
|
|
$(top_builddir)/Xext/libXvidmode.la \
|
|
$(XSERVER_SYS_LIBS)
|
|
Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
|
|
|
Xwayland_built_sources =
|
|
|
|
if GLAMOR_EGL
|
|
Xwayland_SOURCES += \
|
|
xwayland-glamor.c
|
|
if XV
|
|
Xwayland_SOURCES += \
|
|
xwayland-glamor-xv.c
|
|
endif
|
|
|
|
glamor_built_sources = \
|
|
drm-client-protocol.h \
|
|
drm-protocol.c
|
|
|
|
Xwayland_built_sources += $(glamor_built_sources)
|
|
|
|
glamor_lib = $(top_builddir)/glamor/libglamor.la
|
|
|
|
Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL
|
|
Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS)
|
|
endif
|
|
|
|
Xwayland_built_sources += \
|
|
relative-pointer-unstable-v1-client-protocol.h \
|
|
relative-pointer-unstable-v1-protocol.c \
|
|
pointer-constraints-unstable-v1-client-protocol.h \
|
|
pointer-constraints-unstable-v1-protocol.c \
|
|
tablet-unstable-v2-client-protocol.h \
|
|
tablet-unstable-v2-protocol.c \
|
|
xwayland-keyboard-grab-unstable-v1-protocol.c \
|
|
xwayland-keyboard-grab-unstable-v1-client-protocol.h \
|
|
xdg-output-unstable-v1-protocol.c \
|
|
xdg-output-unstable-v1-client-protocol.h
|
|
|
|
|
|
nodist_Xwayland_SOURCES = $(Xwayland_built_sources)
|
|
CLEANFILES = $(Xwayland_built_sources)
|
|
|
|
EXTRA_DIST = drm.xml
|
|
|
|
|
|
$(Xwayland_SOURCES): $(Xwayland_built_sources)
|
|
|
|
relink:
|
|
$(AM_V_at)rm -f Xwayland$(EXEEXT) && $(MAKE) Xwayland$(EXEEXT)
|
|
|
|
relative-pointer-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/relative-pointer/relative-pointer-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
relative-pointer-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/relative-pointer/relative-pointer-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
|
|
|
pointer-constraints-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
pointer-constraints-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
|
|
|
tablet-unstable-v2-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
tablet-unstable-v2-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
|
|
|
xwayland-keyboard-grab-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
xwayland-keyboard-grab-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
|
xdg-output-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xdg-output/xdg-output-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
xdg-output-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xdg-output/xdg-output-unstable-v1.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|
|
|
|
%-protocol.c : %.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
|
|
|
|
%-client-protocol.h : %.xml
|
|
$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
|