2396aec684
Add protocol for sub-surfaces, wl_subcompositor as the global interface, and wl_subsurface as the per-surface interface extension. This patch is meant to be reverted, once sub-surfaces are moved into Wayland core. Changes in v2: - Rewrite wl_subcompositor.get_subsurface description, and move mapping and commit details into wl_subsurface description. Check the wording in wl_subsurface.set_position description. - Add wl_subsurface.set_commit_mode request, and document it, with the commit_mode enum. Add bad_value error code for wl_subsurface. - Moved the protocol into Weston repository so we can land it upstream sooner for public exposure. It is to be moved into Wayland core later. - Add destroy requests to both wl_subcompositor and wl_subsurface, and document them. Experience has showed, that interfaces should always have a destructor unless there is a good and future-proof reason to not have it. Changes in v3: - Specify, that wl_subsurface will become inert, if the corresponding wl_surface is destroyed, instead of requiring a certain destruction order. - Replaced wl_subsurface.set_commit_mode with wl_subsurface.set_sync and wl_subsurface.set_desync. Parent-cached commit mode is now called synchronized, and independent mode is desynchronized. Removed commit_mode enum, and bad_value error. - Added support for nested sub-surfaces. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
127 lines
2.9 KiB
Makefile
127 lines
2.9 KiB
Makefile
TESTS = $(module_tests) $(weston_tests)
|
|
|
|
module_tests = \
|
|
surface-test.la \
|
|
surface-global-test.la
|
|
|
|
weston_tests = \
|
|
keyboard-test \
|
|
event-test \
|
|
button-test \
|
|
text-test \
|
|
$(xwayland_test)
|
|
|
|
AM_TESTS_ENVIRONMENT = \
|
|
abs_builddir='$(abs_builddir)'; export abs_builddir;
|
|
|
|
LOG_COMPILER = $(srcdir)/weston-tests-env
|
|
|
|
clean-local:
|
|
-rm -rf logs
|
|
|
|
# To remove when automake 1.11 support is dropped
|
|
export abs_builddir
|
|
|
|
noinst_LTLIBRARIES = \
|
|
$(weston_test)
|
|
|
|
noinst_PROGRAMS = \
|
|
$(setbacklight) \
|
|
matrix-test
|
|
|
|
check_LTLIBRARIES = \
|
|
$(module_tests)
|
|
|
|
check_PROGRAMS = \
|
|
$(weston_tests)
|
|
|
|
AM_CFLAGS = $(GCC_CFLAGS)
|
|
AM_CPPFLAGS = \
|
|
-I$(top_srcdir)/src \
|
|
-I$(top_srcdir)/shared \
|
|
-I$(top_builddir)/src \
|
|
-DUNIT_TEST \
|
|
$(COMPOSITOR_CFLAGS)
|
|
AM_LDFLAGS = -module -avoid-version -rpath $(libdir)
|
|
|
|
surface_global_test_la_SOURCES = surface-global-test.c
|
|
surface_test_la_SOURCES = surface-test.c
|
|
|
|
weston_test = weston-test.la
|
|
weston_test_la_LIBADD = $(COMPOSITOR_LIBS) \
|
|
../shared/libshared.la
|
|
weston_test_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS)
|
|
weston_test_la_SOURCES = \
|
|
weston-test.c \
|
|
wayland-test-protocol.c \
|
|
wayland-test-server-protocol.h
|
|
|
|
weston_test_runner_src = \
|
|
weston-test-runner.c \
|
|
weston-test-runner.h
|
|
weston_test_client_src = \
|
|
weston-test-client-helper.c \
|
|
weston-test-client-helper.h \
|
|
wayland-test-protocol.c \
|
|
wayland-test-client-protocol.h \
|
|
subsurface-protocol.c \
|
|
subsurface-client-protocol.h \
|
|
$(weston_test_runner_src)
|
|
weston_test_client_libs = \
|
|
$(SIMPLE_CLIENT_LIBS) \
|
|
../shared/libshared.la
|
|
|
|
keyboard_test_SOURCES = keyboard-test.c $(weston_test_client_src)
|
|
keyboard_test_LDADD = $(weston_test_client_libs)
|
|
|
|
event_test_SOURCES = event-test.c $(weston_test_client_src)
|
|
event_test_LDADD = $(weston_test_client_libs)
|
|
|
|
button_test_SOURCES = button-test.c $(weston_test_client_src)
|
|
button_test_LDADD = $(weston_test_client_libs)
|
|
|
|
text_test_SOURCES = \
|
|
text-test.c \
|
|
../clients/text-protocol.c \
|
|
$(weston_test_client_src)
|
|
text_test_LDADD = $(weston_test_client_libs)
|
|
|
|
xwayland_test_SOURCES = xwayland-test.c $(weston_test_client_src)
|
|
|
|
xwayland_test_LDADD = $(weston_test_client_libs) $(XWAYLAND_TEST_LIBS)
|
|
|
|
if ENABLE_XWAYLAND_TEST
|
|
xwayland_test = xwayland_test
|
|
endif
|
|
|
|
matrix_test_SOURCES = \
|
|
matrix-test.c \
|
|
$(top_srcdir)/shared/matrix.c \
|
|
$(top_srcdir)/shared/matrix.h
|
|
matrix_test_LDADD = -lm -lrt
|
|
|
|
setbacklight_SOURCES = \
|
|
setbacklight.c \
|
|
$(top_srcdir)/src/libbacklight.c \
|
|
$(top_srcdir)/src/libbacklight.h
|
|
|
|
setbacklight_CFLAGS = $(AM_CFLAGS) $(SETBACKLIGHT_CFLAGS)
|
|
setbacklight_LDADD = $(SETBACKLIGHT_LIBS)
|
|
|
|
if BUILD_SETBACKLIGHT
|
|
setbacklight = setbacklight
|
|
endif
|
|
|
|
EXTRA_DIST = weston-tests-env
|
|
|
|
BUILT_SOURCES = \
|
|
subsurface-protocol.c \
|
|
subsurface-client-protocol.h \
|
|
wayland-test-protocol.c \
|
|
wayland-test-server-protocol.h \
|
|
wayland-test-client-protocol.h
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
@wayland_scanner_rules@
|